2to3 -f except
diff --git a/tests/test_discovery.py b/tests/test_discovery.py
index a2593e2..032975c 100644
--- a/tests/test_discovery.py
+++ b/tests/test_discovery.py
@@ -368,7 +368,7 @@
zoo = build('zoo', 'v1', http=http, developerKey='foo',
discoveryServiceUrl='http://example.com')
self.fail('Should have raised an exception.')
- except HttpError, e:
+ except HttpError as e:
self.assertEqual(e.uri, 'http://example.com?userIp=10.0.0.1')
def test_userip_missing_is_not_added_to_discovery_uri(self):
@@ -381,7 +381,7 @@
zoo = build('zoo', 'v1', http=http, developerKey=None,
discoveryServiceUrl='http://example.com')
self.fail('Should have raised an exception.')
- except HttpError, e:
+ except HttpError as e:
self.assertEqual(e.uri, 'http://example.com')
@@ -395,28 +395,28 @@
try:
plus.activities().list()
self.fail()
- except TypeError, e:
+ except TypeError as e:
self.assertTrue('Missing' in str(e))
# Missing required parameters even if supplied as None.
try:
plus.activities().list(collection=None, userId=None)
self.fail()
- except TypeError, e:
+ except TypeError as e:
self.assertTrue('Missing' in str(e))
# Parameter doesn't match regex
try:
plus.activities().list(collection='not_a_collection_name', userId='me')
self.fail()
- except TypeError, e:
+ except TypeError as e:
self.assertTrue('not an allowed value' in str(e))
# Unexpected parameter
try:
plus.activities().list(flubber=12)
self.fail()
- except TypeError, e:
+ except TypeError as e:
self.assertTrue('unexpected' in str(e))
def _check_query_types(self, request):
@@ -785,7 +785,7 @@
try:
request.execute(http=http)
self.fail('Should have raised ResumableUploadError.')
- except ResumableUploadError, e:
+ except ResumableUploadError as e:
self.assertEqual(400, e.resp.status)
def test_resumable_media_fail_unknown_response_code_subsequent_request(self):
@@ -885,7 +885,7 @@
try:
body = request.execute(http=http)
- except HttpError, e:
+ except HttpError as e:
self.assertEqual('01234', e.content)
except ImportError:
@@ -1040,7 +1040,7 @@
try:
# Should resume the upload by first querying the status of the upload.
request.next_chunk(http=http)
- except HttpError, e:
+ except HttpError as e:
expected = {
'Content-Range': 'bytes */14',
'content-length': '0'
diff --git a/tests/test_http.py b/tests/test_http.py
index b4bf007..63ccf1e 100644
--- a/tests/test_http.py
+++ b/tests/test_http.py
@@ -796,7 +796,7 @@
try:
batch.execute(http=http)
self.fail('Should raise exception')
- except BatchError, e:
+ except BatchError as e:
boundary, _ = e.content.split(None, 1)
self.assertEqual('--', boundary[:2])
parts = e.content.split(boundary)
diff --git a/tests/test_json_model.py b/tests/test_json_model.py
index fccd549..d4f84d5 100644
--- a/tests/test_json_model.py
+++ b/tests/test_json_model.py
@@ -152,7 +152,7 @@
try:
content = model.response(resp, content)
self.fail('Should have thrown an exception')
- except HttpError, e:
+ except HttpError as e:
self.assertTrue('not authorized' in str(e))
resp['content-type'] = 'application/json'
@@ -160,7 +160,7 @@
try:
content = model.response(resp, content)
self.fail('Should have thrown an exception')
- except HttpError, e:
+ except HttpError as e:
self.assertTrue('not authorized' in str(e))
def test_good_response(self):
diff --git a/tests/test_mocks.py b/tests/test_mocks.py
index 7d1e8e6..60cc108 100644
--- a/tests/test_mocks.py
+++ b/tests/test_mocks.py
@@ -140,7 +140,7 @@
try:
activity = plus.activities().list(collection='public', userId='me').execute()
self.fail('An exception should have been thrown')
- except HttpError, e:
+ except HttpError as e:
self.assertEqual('{}', e.content)
self.assertEqual(500, e.resp.status)
self.assertEqual('Server Error', e.resp.reason)