From 8f196d4d7c86bfef5232d7e5cc50d64dc313a9ab Mon Sep 17 00:00:00 2001 From: Chris Streeter Date: Mon, 26 Sep 2016 09:49:25 -0700 Subject: [PATCH] Better Python 3 support (#33) * Support Python 3 style exceptions --- python/src/cloudstorage/api_utils.py | 2 +- python/src/cloudstorage/storage_api.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python/src/cloudstorage/api_utils.py b/python/src/cloudstorage/api_utils.py index 4d1716f..33e4b6e 100644 --- a/python/src/cloudstorage/api_utils.py +++ b/python/src/cloudstorage/api_utils.py @@ -170,7 +170,7 @@ def run(self, tasklet, **kwds): 'Tasklet has exceeded request deadline after %s seconds total', time.time() - start_time) raise - except self.retriable_exceptions, e: + except self.retriable_exceptions as e: pass if n == 1: diff --git a/python/src/cloudstorage/storage_api.py b/python/src/cloudstorage/storage_api.py index 2f3c597..7e02f17 100644 --- a/python/src/cloudstorage/storage_api.py +++ b/python/src/cloudstorage/storage_api.py @@ -126,7 +126,7 @@ def do_request_async(self, url, method='GET', headers=None, payload=None, resp_tuple = yield super(_StorageApi, self).do_request_async( url, method=method, headers=headers, payload=payload, deadline=deadline, callback=callback) - except urlfetch.DownloadError, e: + except urlfetch.DownloadError as e: raise errors.TimeoutError( 'Request to Google Cloud Storage timed out.', e)