openstack/ironic
Code Issues Proposed changes

Merge "Fix pep8 on Python3.5"

Browse Source
This commit is contained in:
Jenkins 2016-08-29 14:07:00 +00:00 committed by Gerrit Code Review
commit 9fc4ede1a2
5 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/tools/ironic/scripts/configure-vm.py
View File

@ -80,7 +80,7 @@ def main():
parser.add_argument('--disk-format', default='qcow2', parser.add_argument('--disk-format', default='qcow2',
help='Disk format to use.') help='Disk format to use.')
args = parser.parse_args() args = parser.parse_args()
with file(templatedir + '/vm.xml', 'rb') as f: with open(templatedir + '/vm.xml', 'rb') as f:
source_template = f.read() source_template = f.read()
params = { params = {
'name': args.name, 'name': args.name,

4
ironic/common/exception.py
View File

@ -77,13 +77,13 @@ class IronicException(Exception):
def __str__(self): def __str__(self):
"""Encode to utf-8 then wsme api can consume it as well.""" """Encode to utf-8 then wsme api can consume it as well."""
if not six.PY3: if not six.PY3:
return unicode(self.args[0]).encode('utf-8') return six.text_type(self.args[0]).encode('utf-8')
return self.args[0] return self.args[0]
def __unicode__(self): def __unicode__(self):
"""Return a unicode representation of the exception message.""" """Return a unicode representation of the exception message."""
return unicode(self.args[0]) return six.text_type(self.args[0])
class NotAuthorized(IronicException): class NotAuthorized(IronicException):

12
ironic/common/utils.py
View File

@ -372,18 +372,6 @@ def read_cached_file(filename, cache_info, reload_func=None):
return cache_info['data'] return cache_info['data']
def file_open(*args, **kwargs):
"""Open file
see built-in file() documentation for more details
Note: The reason this is kept in a separate module is to easily
be able to provide a stub module that doesn't alter system
state at all (for unit tests)
"""
return file(*args, **kwargs)
def _get_hash_object(hash_algo_name): def _get_hash_object(hash_algo_name):
"""Create a hash object based on given algorithm. """Create a hash object based on given algorithm.

5
ironic/tests/unit/api/v1/test_types.py
View File

@ -285,9 +285,8 @@ class TestJsonType(base.TestCase):
def test_apimultitype_tostring(self): def test_apimultitype_tostring(self):
vts = str(types.jsontype) vts = str(types.jsontype)
self.assertIn(str(wtypes.text), vts) self.assertIn(str(wtypes.text), vts)
self.assertIn(str(int), vts) for int_type in six.integer_types:
if six.PY2: self.assertIn(str(int_type), vts)
self.assertIn(str(long), vts)
self.assertIn(str(float), vts) self.assertIn(str(float), vts)
self.assertIn(str(types.BooleanType), vts) self.assertIn(str(types.BooleanType), vts)
self.assertIn(str(list), vts) self.assertIn(str(list), vts)

4
ironic/tests/unit/common/test_exception.py
View File

@ -23,8 +23,6 @@ class TestIronicException(base.TestCase):
expected = b'\xc3\xa9\xe0\xaf\xb2\xe0\xbe\x84' expected = b'\xc3\xa9\xe0\xaf\xb2\xe0\xbe\x84'
if six.PY3: if six.PY3:
expected = expected.decode('utf-8') expected = expected.decode('utf-8')
message = chr(233) + chr(0x0bf2) + chr(3972) message = six.unichr(233) + six.unichr(0x0bf2) + six.unichr(3972)
else:
message = unichr(233) + unichr(0x0bf2) + unichr(3972)
exc = exception.IronicException(message) exc = exception.IronicException(message)
self.assertEqual(expected, exc.__str__()) self.assertEqual(expected, exc.__str__())