From 07f907ec56f04a7c7957933e1ec3b2ea19e8ce12 Mon Sep 17 00:00:00 2001 From: Ayub khan Date: Wed, 10 Jul 2019 15:39:05 +0500 Subject: [PATCH] INCR-388 python3 compatibility --- pavelib/utils/test/suites/bokchoy_suite.py | 31 +++++++++++----------- pavelib/utils/test/suites/js_suite.py | 4 ++- pavelib/utils/test/suites/pytest_suite.py | 5 +++- scripts/show_events.py | 6 ++++- scripts/xsslint/xss_linter.py | 2 ++ scripts/xsslint/xsslint/main.py | 3 +++ scripts/xsslint/xsslint/reporting.py | 4 ++- scripts/xsslint/xsslint/visitors.py | 3 ++- scripts/xsslint_config.py | 5 ++-- 9 files changed, 41 insertions(+), 22 deletions(-) diff --git a/pavelib/utils/test/suites/bokchoy_suite.py b/pavelib/utils/test/suites/bokchoy_suite.py index aec231dc12..065920412a 100644 --- a/pavelib/utils/test/suites/bokchoy_suite.py +++ b/pavelib/utils/test/suites/bokchoy_suite.py @@ -2,26 +2,27 @@ """ Class used for defining and running Bok Choy acceptance test suite """ -from __future__ import print_function +from __future__ import absolute_import, print_function + import os from time import sleep -from common.test.acceptance.fixtures.course import CourseFixture, FixtureError +from paver.easy import call_task, cmdopts, dry, might_call, needs, sh, task -from paver.easy import sh, cmdopts, task, needs, might_call, call_task, dry -from pavelib.utils.test.suites.suite import TestSuite -from pavelib.utils.envs import Env -from pavelib.utils.test.bokchoy_utils import ( - clear_mongo, start_servers, check_services, wait_for_test_servers -) -from pavelib.utils.test.bokchoy_options import ( - BOKCHOY_IMPORTS_DIR, BOKCHOY_IMPORTS_DIR_DEPR, - BOKCHOY_DEFAULT_STORE, BOKCHOY_DEFAULT_STORE_DEPR, - BOKCHOY_FASTTEST -) -from pavelib.utils.test import utils as test_utils -from pavelib.utils.timer import timed +from common.test.acceptance.fixtures.course import CourseFixture, FixtureError from pavelib.database import update_local_bokchoy_db_from_s3 +from pavelib.utils.envs import Env +from pavelib.utils.test import utils as test_utils +from pavelib.utils.test.bokchoy_options import ( + BOKCHOY_DEFAULT_STORE, + BOKCHOY_DEFAULT_STORE_DEPR, + BOKCHOY_FASTTEST, + BOKCHOY_IMPORTS_DIR, + BOKCHOY_IMPORTS_DIR_DEPR +) +from pavelib.utils.test.bokchoy_utils import check_services, clear_mongo, start_servers, wait_for_test_servers +from pavelib.utils.test.suites.suite import TestSuite +from pavelib.utils.timer import timed try: from pygments.console import colorize diff --git a/pavelib/utils/test/suites/js_suite.py b/pavelib/utils/test/suites/js_suite.py index 06ee2b3cf1..4c43150185 100644 --- a/pavelib/utils/test/suites/js_suite.py +++ b/pavelib/utils/test/suites/js_suite.py @@ -2,12 +2,14 @@ Javascript test tasks """ +from __future__ import absolute_import + from paver import tasks from pavelib import assets +from pavelib.utils.envs import Env from pavelib.utils.test import utils as test_utils from pavelib.utils.test.suites.suite import TestSuite -from pavelib.utils.envs import Env __test__ = False # do not collect diff --git a/pavelib/utils/test/suites/pytest_suite.py b/pavelib/utils/test/suites/pytest_suite.py index 53eb0b836a..554de7b5ea 100644 --- a/pavelib/utils/test/suites/pytest_suite.py +++ b/pavelib/utils/test/suites/pytest_suite.py @@ -2,11 +2,14 @@ """ Classes used for defining and running pytest test suites """ +from __future__ import absolute_import + import os from glob import glob + +from pavelib.utils.envs import Env from pavelib.utils.test import utils as test_utils from pavelib.utils.test.suites.suite import TestSuite -from pavelib.utils.envs import Env __test__ = False # do not collect diff --git a/scripts/show_events.py b/scripts/show_events.py index 698215c1c5..e03d42c44c 100644 --- a/scripts/show_events.py +++ b/scripts/show_events.py @@ -1,4 +1,8 @@ -from __future__ import print_function +""" +Show Event outputs. +""" +from __future__ import absolute_import, print_function + import json import sys import traceback diff --git a/scripts/xsslint/xss_linter.py b/scripts/xsslint/xss_linter.py index a35038c3de..a1aced7a14 100755 --- a/scripts/xsslint/xss_linter.py +++ b/scripts/xsslint/xss_linter.py @@ -4,6 +4,8 @@ A linting tool to check for xss vulnerabilities. """ +from __future__ import absolute_import + if __name__ == "__main__": from xsslint.main import main main() diff --git a/scripts/xsslint/xsslint/main.py b/scripts/xsslint/xsslint/main.py index 579b52c845..d8632056da 100644 --- a/scripts/xsslint/xsslint/main.py +++ b/scripts/xsslint/xsslint/main.py @@ -1,10 +1,13 @@ """ The main function for the XSS linter. """ +from __future__ import absolute_import + import argparse import importlib import os import sys +from functools import reduce from xsslint.reporting import SummaryResults from xsslint.rules import RuleSet diff --git a/scripts/xsslint/xsslint/reporting.py b/scripts/xsslint/xsslint/reporting.py index 210b69a62f..adeac80c4f 100644 --- a/scripts/xsslint/xsslint/reporting.py +++ b/scripts/xsslint/xsslint/reporting.py @@ -1,11 +1,13 @@ """ Utility classes for reporting linter results. """ -from __future__ import print_function +from __future__ import absolute_import, print_function import os import re +from six.moves import range + from xsslint.utils import StringLines diff --git a/scripts/xsslint/xsslint/visitors.py b/scripts/xsslint/xsslint/visitors.py index d5b9549be3..3abf85aabb 100644 --- a/scripts/xsslint/xsslint/visitors.py +++ b/scripts/xsslint/xsslint/visitors.py @@ -1,6 +1,8 @@ """ Custom AST NodeVisitor classes uses for Python xss linting. """ +from __future__ import absolute_import + import ast import re @@ -8,7 +10,6 @@ from xsslint.reporting import ExpressionRuleViolation from xsslint.rules import RuleSet from xsslint.utils import Expression, ParseString, StringLines - ruleset = RuleSet( python_concat_html='python-concat-html', python_deprecated_display_name='python-deprecated-display-name', diff --git a/scripts/xsslint_config.py b/scripts/xsslint_config.py index 91bbc11803..8c244dca54 100644 --- a/scripts/xsslint_config.py +++ b/scripts/xsslint_config.py @@ -1,4 +1,6 @@ # xsslint config module for edx-platform +from __future__ import absolute_import + import os import sys @@ -7,8 +9,7 @@ import sys scripts_dir = os.path.dirname(os.path.abspath(__file__)) sys.path.append(os.path.join(scripts_dir, 'xsslint')) -from xsslint.linters import JavaScriptLinter, MakoTemplateLinter, PythonLinter, UnderscoreTemplateLinter - +from xsslint.linters import JavaScriptLinter, MakoTemplateLinter, PythonLinter, UnderscoreTemplateLinter # pylint: disable=import-error,wrong-import-position # Define the directories that should be ignored by the script. SKIP_DIRS = (