Merge pull request #21895 from rallytime/pylint_dev

Python 3 compat fix for pylint
This commit is contained in:
jfindlay 2015-03-23 11:37:05 -06:00
commit 4316d61d36

View File

@ -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,unused-import
ensure_in_syspath('../../')
# Import salt libs