From e5e287cbb482c276ecd7655aba036bbfafb88a80 Mon Sep 17 00:00:00 2001 From: rallytime Date: Mon, 23 Mar 2015 10:03:56 -0600 Subject: [PATCH 1/2] Pythong 3 compat fix for pylint --- tests/unit/modules/archive_test.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/unit/modules/archive_test.py b/tests/unit/modules/archive_test.py index b6aab78a25..edbc37a2fa 100644 --- a/tests/unit/modules/archive_test.py +++ b/tests/unit/modules/archive_test.py @@ -13,7 +13,14 @@ from __future__ import absolute_import # Import Salt Testing libs from salttesting import skipIf, TestCase from salttesting.helpers import ensure_in_syspath -from salttesting.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from salttesting.mock import ( + NO_MOCK, + NO_MOCK_REASON, + MagicMock, + patch +) +from salt.ext.six.moves import zip # pylint: disable=import-error,redefined-builtin + ensure_in_syspath('../../') # Import salt libs From 7bfa4ce70d7629178818fa6439d9206635b0e3c6 Mon Sep 17 00:00:00 2001 From: rallytime Date: Mon, 23 Mar 2015 10:47:03 -0600 Subject: [PATCH 2/2] Disable unused-import for py 3 compatibility --- tests/unit/modules/archive_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/modules/archive_test.py b/tests/unit/modules/archive_test.py index edbc37a2fa..0ccd173795 100644 --- a/tests/unit/modules/archive_test.py +++ b/tests/unit/modules/archive_test.py @@ -19,7 +19,7 @@ from salttesting.mock import ( MagicMock, patch ) -from salt.ext.six.moves import zip # pylint: disable=import-error,redefined-builtin +from salt.ext.six.moves import zip # pylint: disable=import-error,redefined-builtin,unused-import ensure_in_syspath('../../')