Commit 2963bba9 by Toshio Kuratomi

Merge pull request #12740 from mgedmin/py3k

Python 3: don't convert module arguments to bytes
parents ee559e03 225fe855
...@@ -21,6 +21,7 @@ from __future__ import (absolute_import, division) ...@@ -21,6 +21,7 @@ from __future__ import (absolute_import, division)
__metaclass__ = type __metaclass__ = type
import errno import errno
import sys
from six.moves import builtins from six.moves import builtins
...@@ -220,7 +221,8 @@ class TestModuleUtilsBasic(unittest.TestCase): ...@@ -220,7 +221,8 @@ class TestModuleUtilsBasic(unittest.TestCase):
from ansible.module_utils.basic import get_module_path from ansible.module_utils.basic import get_module_path
with patch('os.path.realpath', return_value='/path/to/foo/'): with patch('os.path.realpath', return_value='/path/to/foo/'):
self.assertEqual(get_module_path(), '/path/to/foo') self.assertEqual(get_module_path(), '/path/to/foo')
@unittest.skipIf(sys.version_info[0] >= 3, "Python 3 is not supported on targets (yet)")
def test_module_utils_basic_ansible_module_creation(self): def test_module_utils_basic_ansible_module_creation(self):
from ansible.module_utils import basic from ansible.module_utils import basic
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment