Merge "Improve Python 3.x compatibility"

tests/test_http.py

@@ -61,7 +61,7 @@ class TestClient(testtools.TestCase):
             # rather than assertRaises() so that we can check the body of
             # the exception.
             self.fail('An exception should have bypassed this line.')
-        except exc.CommunicationError, comm_err:
+        except exc.CommunicationError as comm_err:
             fail_msg = ("Exception message '%s' should contain '%s'" %
                        (comm_err.message, self.endpoint))
             self.assertTrue(self.endpoint in comm_err.message, fail_msg)
@@ -100,7 +100,7 @@ class TestClient(testtools.TestCase):
             client.raw_request('GET', '/v1/images/detail?limit=20')
 
             self.fail('An exception should have bypassed this line.')
-        except exc.CommunicationError, comm_err:
+        except exc.CommunicationError as comm_err:
             fail_msg = ("Exception message '%s' should contain '%s'" %
                         (comm_err.message, endpoint))
             self.assertTrue(endpoint in comm_err.message, fail_msg)

tests/test_utils.py

@@ -27,7 +27,7 @@ class TestUtils(testtools.TestCase):
         try:
             data = ''.join([f for f in utils.integrity_iter('A', None)])
             self.fail('integrity checked passed without checksum.')
-        except IOError, e:
+        except IOError as e:
             self.assertEqual(errno.EPIPE, e.errno)
             msg = 'was 7fc56270e7a70fa81a5935b72eacbe29 expected None'
             self.assertTrue(msg in str(e))
@@ -36,7 +36,7 @@ class TestUtils(testtools.TestCase):
         try:
             data = ''.join([f for f in utils.integrity_iter('BB', 'wrong')])
             self.fail('integrity checked passed with wrong checksum')
-        except IOError, e:
+        except IOError as e:
             self.assertEqual(errno.EPIPE, e.errno)
             msg = 'was 9d3d9048db16a7eee539e93e3618cbe7 expected wrong'
             self.assertTrue('expected wrong' in str(e))

tests/v1/test_images.py

@@ -335,7 +335,7 @@ class ImageManagerTest(testtools.TestCase):
         try:
             data = ''.join([b for b in data])
             self.fail('data did not raise an error.')
-        except IOError, e:
+        except IOError as e:
             self.assertEqual(errno.EPIPE, e.errno)
             msg = 'was fd7c5c4fdaa97163ee4ba8842baa537a expected wrong'
             self.assertTrue(msg in str(e))
@@ -509,7 +509,7 @@ class ImageTest(testtools.TestCase):
         try:
             data = ''.join([b for b in image.data()])
             self.fail('data did not raise an error.')
-        except IOError, e:
+        except IOError as e:
             self.assertEqual(errno.EPIPE, e.errno)
             msg = 'was fd7c5c4fdaa97163ee4ba8842baa537a expected wrong'
             self.assertTrue(msg in str(e))

tests/v2/test_images.py

@@ -289,7 +289,7 @@ class TestController(testtools.TestCase):
         try:
             body = ''.join([b for b in body])
             self.fail('data did not raise an error.')
-        except IOError, e:
+        except IOError as e:
             self.assertEqual(errno.EPIPE, e.errno)
             msg = 'was 9d3d9048db16a7eee539e93e3618cbe7 expected wrong'
             self.assertTrue(msg in str(e))