diff --git a/scripts/xsslint/tests/test_linters.py b/scripts/xsslint/tests/test_linters.py index 069b45656b..ea3a2eb66f 100644 --- a/scripts/xsslint/tests/test_linters.py +++ b/scripts/xsslint/tests/test_linters.py @@ -2,12 +2,13 @@ """ Tests for linters.py """ -from __future__ import print_function +from __future__ import absolute_import, print_function import textwrap from unittest import TestCase from ddt import data, ddt +from six.moves import range, zip from xsslint.linters import JavaScriptLinter, MakoTemplateLinter, PythonLinter, UnderscoreTemplateLinter from xsslint.reporting import FileResults diff --git a/scripts/xsslint/tests/test_main.py b/scripts/xsslint/tests/test_main.py index c0cef69bfe..fd0a0eedca 100644 --- a/scripts/xsslint/tests/test_main.py +++ b/scripts/xsslint/tests/test_main.py @@ -2,15 +2,16 @@ """ Tests for main.py """ +from __future__ import absolute_import + import re -import textwrap from StringIO import StringIO from unittest import TestCase import mock from xsslint.linters import JavaScriptLinter, MakoTemplateLinter, PythonLinter, UnderscoreTemplateLinter -from xsslint.main import _lint, _build_ruleset +from xsslint.main import _build_ruleset, _lint from xsslint.reporting import SummaryResults diff --git a/scripts/xsslint/tests/test_utils.py b/scripts/xsslint/tests/test_utils.py index 9521590296..b9e983cea3 100644 --- a/scripts/xsslint/tests/test_utils.py +++ b/scripts/xsslint/tests/test_utils.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import + from unittest import TestCase from ddt import data, ddt diff --git a/scripts/xsslint/xsslint/default_config.py b/scripts/xsslint/xsslint/default_config.py index 9f6bcec21d..e6926f6939 100644 --- a/scripts/xsslint/xsslint/default_config.py +++ b/scripts/xsslint/xsslint/default_config.py @@ -1,6 +1,7 @@ # Default xsslint config module. -from xsslint.linters import JavaScriptLinter, MakoTemplateLinter, PythonLinter, UnderscoreTemplateLinter +from __future__ import absolute_import +from xsslint.linters import JavaScriptLinter, MakoTemplateLinter, PythonLinter, UnderscoreTemplateLinter # Define the directories that should be ignored by the script. SKIP_DIRS = ( diff --git a/scripts/xsslint/xsslint/linters.py b/scripts/xsslint/xsslint/linters.py index 840b2fce98..fbd7e20905 100644 --- a/scripts/xsslint/xsslint/linters.py +++ b/scripts/xsslint/xsslint/linters.py @@ -1,6 +1,8 @@ """ Linter classes containing logic for checking various filetypes. """ +from __future__ import absolute_import + import ast import os import re diff --git a/scripts/xsslint/xsslint/utils.py b/scripts/xsslint/xsslint/utils.py index 325170e95d..46740a775f 100644 --- a/scripts/xsslint/xsslint/utils.py +++ b/scripts/xsslint/xsslint/utils.py @@ -1,6 +1,8 @@ """ Utility classes/functions for the XSS Linter. """ +from __future__ import absolute_import + import re