Python3 fixes

pull/9394/head
Toshio Kuratomi 10 years ago
parent a954220957
commit e78c5f925b

@ -219,5 +219,5 @@ def load_data_from_file(path, vault_password=None):
try: try:
return load_data(data) return load_data(data)
except YAMLError, exc: except YAMLError as exc:
process_yaml_error(exc, data, path, show_content) process_yaml_error(exc, data, path, show_content)

@ -191,7 +191,7 @@ class VaultEditor(object):
raise errors.AnsibleError("%s exists, please use 'edit' instead" % self.filename) raise errors.AnsibleError("%s exists, please use 'edit' instead" % self.filename)
# drop the user into vim on file # drop the user into vim on file
old_umask = os.umask(0077) old_umask = os.umask(0o077)
call(self._editor_shell_command(self.filename)) call(self._editor_shell_command(self.filename))
tmpdata = self.read_data(self.filename) tmpdata = self.read_data(self.filename)
this_vault = VaultLib(self.password) this_vault = VaultLib(self.password)
@ -225,7 +225,7 @@ class VaultEditor(object):
raise errors.AnsibleError(CRYPTO_UPGRADE) raise errors.AnsibleError(CRYPTO_UPGRADE)
# make sure the umask is set to a sane value # make sure the umask is set to a sane value
old_mask = os.umask(0077) old_mask = os.umask(0o077)
# decrypt to tmpfile # decrypt to tmpfile
tmpdata = self.read_data(self.filename) tmpdata = self.read_data(self.filename)

@ -37,7 +37,7 @@ class Base:
# each class knows attributes set upon it, see Task.py for example # each class knows attributes set upon it, see Task.py for example
self._attributes = dict() self._attributes = dict()
for (name, value) in self._get_base_attributes().iteritems(): for (name, value) in iteritems(self._get_base_attributes()):
self._attributes[name] = value.default self._attributes[name] = value.default
def _get_base_attributes(self): def _get_base_attributes(self):
@ -72,7 +72,7 @@ class Base:
ds = self.munge(ds) ds = self.munge(ds)
# walk all attributes in the class # walk all attributes in the class
for (name, attribute) in self._get_base_attributes().iteritems(): for (name, attribute) in iteritems(self._get_base_attributes()):
# copy the value over unless a _load_field method is defined # copy the value over unless a _load_field method is defined
if name in ds: if name in ds:
@ -91,7 +91,7 @@ class Base:
''' validation that is done at parse time, not load time ''' ''' validation that is done at parse time, not load time '''
# walk all fields in the object # walk all fields in the object
for (name, attribute) in self._get_base_attributes().iteritems(): for (name, attribute) in iteritems(self._get_base_attributes()):
# run validator only if present # run validator only if present
method = getattr(self, '_validate_%s' % name, None) method = getattr(self, '_validate_%s' % name, None)

@ -57,7 +57,7 @@ class TestErrors(unittest.TestCase):
m = mock_open() m = mock_open()
m.return_value.readlines.return_value = ['this is line 1\n'] m.return_value.readlines.return_value = ['this is line 1\n']
with patch('__builtin__.open', m): with patch('{0}.open'.format(BUILTINS), m):
# this line will be found in the file # this line will be found in the file
self.obj._data_source = 'foo.yml' self.obj._data_source = 'foo.yml'
self.obj._line_number = 1 self.obj._line_number = 1

@ -14,3 +14,8 @@
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with Ansible. If not, see <http://www.gnu.org/licenses/>. # along with Ansible. If not, see <http://www.gnu.org/licenses/>.
# Make coding more python3-ish
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type

@ -15,10 +15,16 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with Ansible. If not, see <http://www.gnu.org/licenses/>. # along with Ansible. If not, see <http://www.gnu.org/licenses/>.
# Make coding more python3-ish
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
import os import os
import unittest from ansible.compat.tests import unittest
from ansible.compat.tests import BUILTINS
from mock import mock_open, patch, MagicMock from ansible.compat.tests.mock import mock_open, patch, MagicMock
from ansible.plugins import MODULE_CACHE, PATH_CACHE, PLUGIN_PATH_CACHE, _basedirs, push_basedir, PluginLoader from ansible.plugins import MODULE_CACHE, PATH_CACHE, PLUGIN_PATH_CACHE, _basedirs, push_basedir, PluginLoader
@ -54,7 +60,7 @@ class TestErrors(unittest.TestCase):
m = MagicMock() m = MagicMock()
m.return_value.__file__ = '/path/to/my/test.py' m.return_value.__file__ = '/path/to/my/test.py'
pl = PluginLoader('test', 'foo.bar.bam', 'test', 'test_plugin') pl = PluginLoader('test', 'foo.bar.bam', 'test', 'test_plugin')
with patch('__builtin__.__import__', m): with patch('{0}.__import__'.format(BUILTINS), m):
self.assertEqual(pl._get_package_paths(), ['/path/to/my/bar/bam']) self.assertEqual(pl._get_package_paths(), ['/path/to/my/bar/bam'])
def test_plugins__get_paths(self): def test_plugins__get_paths(self):

Loading…
Cancel
Save