diff --git a/pavelib/paver_tests/test_assets.py b/pavelib/paver_tests/test_assets.py index 2df98064b6..2eab46d4bf 100644 --- a/pavelib/paver_tests/test_assets.py +++ b/pavelib/paver_tests/test_assets.py @@ -1,5 +1,6 @@ """Unit tests for the Paver asset tasks.""" +from __future__ import absolute_import import os from unittest import TestCase diff --git a/pavelib/paver_tests/test_extract_and_generate.py b/pavelib/paver_tests/test_extract_and_generate.py index 2ab64036aa..dd5ce43dd0 100644 --- a/pavelib/paver_tests/test_extract_and_generate.py +++ b/pavelib/paver_tests/test_extract_and_generate.py @@ -1,6 +1,7 @@ """ This test tests that i18n extraction (`paver i18n_extract -v`) works properly. """ +from __future__ import absolute_import import os import random import re @@ -13,6 +14,7 @@ from unittest import TestCase from i18n import config, dummy, extract, generate from polib import pofile from pytz import UTC +from six.moves import range class TestGenerate(TestCase): diff --git a/pavelib/paver_tests/test_i18n.py b/pavelib/paver_tests/test_i18n.py index d5991c1a77..fe7cbf6e2f 100644 --- a/pavelib/paver_tests/test_i18n.py +++ b/pavelib/paver_tests/test_i18n.py @@ -2,6 +2,7 @@ Tests for pavelib/i18n.py. """ +from __future__ import absolute_import import os import textwrap import unittest diff --git a/pavelib/paver_tests/test_js_test.py b/pavelib/paver_tests/test_js_test.py index 1188e043b2..109e91ce93 100644 --- a/pavelib/paver_tests/test_js_test.py +++ b/pavelib/paver_tests/test_js_test.py @@ -1,5 +1,6 @@ """Unit tests for the Paver JavaScript testing tasks.""" +from __future__ import absolute_import import ddt from mock import patch from paver.easy import call_task diff --git a/pavelib/paver_tests/test_paver_bok_choy_cmds.py b/pavelib/paver_tests/test_paver_bok_choy_cmds.py index 6477d5fde9..f1f4ffe8f7 100644 --- a/pavelib/paver_tests/test_paver_bok_choy_cmds.py +++ b/pavelib/paver_tests/test_paver_bok_choy_cmds.py @@ -2,6 +2,7 @@ Tests for the bok-choy paver commands themselves. Run just this test with: paver test_lib -t pavelib/paver_tests/test_paver_bok_choy_cmds.py """ +from __future__ import absolute_import import os import unittest from test.test_support import EnvironmentVarGuard diff --git a/pavelib/paver_tests/test_paver_get_quality_reports.py b/pavelib/paver_tests/test_paver_get_quality_reports.py index 2b8ef5fc49..632031e661 100644 --- a/pavelib/paver_tests/test_paver_get_quality_reports.py +++ b/pavelib/paver_tests/test_paver_get_quality_reports.py @@ -1,6 +1,7 @@ """ Tests to ensure only the report files we want are returned as part of run_quality. """ +from __future__ import absolute_import import unittest from mock import patch diff --git a/pavelib/paver_tests/test_paver_pytest_cmds.py b/pavelib/paver_tests/test_paver_pytest_cmds.py index c803c31ca1..23ca95fd49 100644 --- a/pavelib/paver_tests/test_paver_pytest_cmds.py +++ b/pavelib/paver_tests/test_paver_pytest_cmds.py @@ -3,6 +3,7 @@ Tests for the pytest paver commands themselves. Run just this test with: paver test_lib -t pavelib/paver_tests/test_paver_pytest_cmds.py """ +from __future__ import absolute_import import unittest import os import ddt diff --git a/pavelib/paver_tests/test_paver_quality.py b/pavelib/paver_tests/test_paver_quality.py index 7aef238c04..1db4a456cf 100644 --- a/pavelib/paver_tests/test_paver_quality.py +++ b/pavelib/paver_tests/test_paver_quality.py @@ -2,6 +2,7 @@ Tests for paver quality tasks """ from __future__ import print_function +from __future__ import absolute_import import os import shutil import tempfile diff --git a/pavelib/paver_tests/test_pii_check.py b/pavelib/paver_tests/test_pii_check.py index 95a64646ad..d85edbf8e5 100644 --- a/pavelib/paver_tests/test_pii_check.py +++ b/pavelib/paver_tests/test_pii_check.py @@ -1,6 +1,7 @@ """ Tests for Paver's PII checker task. """ +from __future__ import absolute_import import io import six from mock import patch diff --git a/pavelib/paver_tests/test_servers.py b/pavelib/paver_tests/test_servers.py index e562ecd26b..447cd8af05 100644 --- a/pavelib/paver_tests/test_servers.py +++ b/pavelib/paver_tests/test_servers.py @@ -1,5 +1,6 @@ """Unit tests for the Paver server tasks.""" +from __future__ import absolute_import import ddt from paver.easy import call_task diff --git a/pavelib/paver_tests/test_stylelint.py b/pavelib/paver_tests/test_stylelint.py index 6385134dbb..f8dbd4d7ec 100644 --- a/pavelib/paver_tests/test_stylelint.py +++ b/pavelib/paver_tests/test_stylelint.py @@ -1,6 +1,7 @@ """ Tests for Paver's Stylelint tasks. """ +from __future__ import absolute_import import ddt from mock import MagicMock, patch from paver.easy import call_task diff --git a/pavelib/paver_tests/test_utils.py b/pavelib/paver_tests/test_utils.py index 28b331ee89..814a9b4af7 100644 --- a/pavelib/paver_tests/test_utils.py +++ b/pavelib/paver_tests/test_utils.py @@ -2,6 +2,7 @@ Tests for pavelib/utils/test/utils """ +from __future__ import absolute_import import unittest from mock import patch diff --git a/pavelib/paver_tests/test_xsscommitlint.py b/pavelib/paver_tests/test_xsscommitlint.py index f95714863b..fcdfe3f0ba 100644 --- a/pavelib/paver_tests/test_xsscommitlint.py +++ b/pavelib/paver_tests/test_xsscommitlint.py @@ -1,6 +1,7 @@ """ Tests for paver xsscommitlint quality tasks """ +from __future__ import absolute_import from mock import patch from paver.easy import call_task diff --git a/pavelib/paver_tests/test_xsslint.py b/pavelib/paver_tests/test_xsslint.py index 2f88a1ee3e..3a6d7d8bbb 100644 --- a/pavelib/paver_tests/test_xsslint.py +++ b/pavelib/paver_tests/test_xsslint.py @@ -1,6 +1,7 @@ """ Tests for paver xsslint quality tasks """ +from __future__ import absolute_import from mock import patch from paver.easy import call_task diff --git a/pavelib/paver_tests/utils.py b/pavelib/paver_tests/utils.py index fd67b4c0d3..c9ef27cf0c 100644 --- a/pavelib/paver_tests/utils.py +++ b/pavelib/paver_tests/utils.py @@ -1,11 +1,13 @@ """Unit tests for the Paver server tasks.""" +from __future__ import absolute_import import os from unittest import TestCase from uuid import uuid4 from paver import tasks from paver.easy import BuildFailure +import six class PaverTestCase(TestCase): @@ -60,7 +62,7 @@ class MockEnvironment(tasks.Environment): else: output = message if not output.startswith("--->"): - self.messages.append(unicode(output)) + self.messages.append(six.text_type(output)) def fail_on_eslint(*args, **kwargs): diff --git a/pavelib/utils/db_utils.py b/pavelib/utils/db_utils.py index a6f877aaaa..280e398890 100644 --- a/pavelib/utils/db_utils.py +++ b/pavelib/utils/db_utils.py @@ -2,6 +2,7 @@ Utility methods for bokchoy database manipulation. """ from __future__ import print_function +from __future__ import absolute_import import os import tarfile diff --git a/pavelib/utils/timer.py b/pavelib/utils/timer.py index 08e21acc1e..d74ed393c4 100644 --- a/pavelib/utils/timer.py +++ b/pavelib/utils/timer.py @@ -2,6 +2,7 @@ Tools for timing paver tasks """ +from __future__ import absolute_import import json import logging import os