Fixes for Python 3

Nova is working on support for Python 3.4. via
https://blueprints.launchpad.net/nova/+spec/nova-python3

This changeset moves from py33 to py34 in the tox.ini file to be
inline with Nova. It also incorporates changes produced from the
'sixer' tool run with 'all'.

sixer can be found at:
https://pypi.python.org/pypi/sixer

At the present time, the py34 environment does not run
successfully because it pulls in portions of Nova that have not
yet been fully converted to Python 3.

Change-Id: If84df3017a722d0ad3546e81f97e67f1a07a763f
changes/40/188440/1
Kyle L. Henderson 8 years ago
parent 797755c029
commit f68cd4fa2f

@ -91,7 +91,7 @@ class TestLocalDisk(test.TestCase):
None, inst, mock_img, 20)
mock_upload_vdisk.assert_called_with(mock.ANY, mock.ANY, mock.ANY,
mock.ANY, 'b_Inst_Nam_d506', 50,
d_size=21474836480L)
d_size=21474836480)
self.assertEqual('vdisk', vdisk)
@mock.patch('pypowervm.wrappers.storage.VG')

@ -63,7 +63,7 @@ class IterableToFileAdapter(object):
chunk = self.remaining_data
try:
while not chunk:
chunk = self.iterator.next()
chunk = next(self.iterator)
except StopIteration:
return ''
return_value = chunk[0:size]

@ -1,6 +1,6 @@
[tox]
minversion = 1.6
envlist = py33,py27,pep8
envlist = py34,py27,pep8
skipsdist = True
[testenv]

Loading…
Cancel
Save