openstack/deb-nova
Code Issues Proposed changes

Improve Python 3.x compatibility

Browse Source 
Mechanical translation of the deprecated
except x,y: construct with except x as y:
The latter works with any Python >= 2.6.
Add Hacking check.

Change-Id: I845829d97d379c1cd9b3a77e7e5786586f263b64
This commit is contained in:
Dirk Mueller
2013-05-18 00:18:18 +02:00
parent 5a510518d9
commit bf68a9592d
25 changed files with 79 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nova/tests/virt/libvirt/test_fakelibvirt.py
View File

@@ -136,7 +136,7 @@ class FakeLibvirtTests(test.TestCase):
conn = self.get_openAuth_curry_func()('qemu:///system')
try:
getattr(conn, xmlfunc_name)("this is not valid </xml>", *args)
except libvirt.libvirtError, e:
except libvirt.libvirtError as e:
self.assertEqual(e.get_error_code(), libvirt.VIR_ERR_XML_DETAIL)
self.assertEqual(e.get_error_domain(), libvirt.VIR_FROM_DOMAIN)
return
@@ -242,7 +242,7 @@ class FakeLibvirtTests(test.TestCase):
dom_id = conn.listDomainsID()[0]
try:
conn.lookupByID(dom_id + 1)
except libvirt.libvirtError, e:
except libvirt.libvirtError as e:
self.assertEqual(e.get_error_code(), libvirt.VIR_ERR_NO_DOMAIN)
self.assertEqual(e.get_error_domain(), libvirt.VIR_FROM_QEMU)
return
@@ -315,7 +315,7 @@ class FakeLibvirtTests(test.TestCase):
nwfilter.undefine()
try:
conn.nwfilterLookupByName('nova-instance-instance-789320334')
except libvirt.libvirtError, e:
except libvirt.libvirtError as e:
self.assertEqual(e.get_error_code(), libvirt.VIR_ERR_NO_NWFILTER)
self.assertEqual(e.get_error_domain(), libvirt.VIR_FROM_NWFILTER)
return