openstack
/
swift-bench
Code Issues Proposed changes

Use Python 3.x compatible except construct 

except x,y: was deprected and is removed in Python 3.x.
Use "except x as y:" instead which works in any Python
version >= 2.6.

Change-Id: I7008c74b807340f3457d3a0c8bd0b83f23169d14
This commit is contained in:
Dirk Mueller 2013-08-28 21:16:08 +02:00
parent e72cde0582
commit 7c5e91e77f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
swift/common/bench.py
View File

@ -52,7 +52,7 @@ def delete_containers(logger, conf):
def _deleter(url, token, container):
try:
client.delete_container(url, token, container)
except client.ClientException, e:
except client.ClientException as e:
if e.http_status != HTTP_CONFLICT:
logger.warn("Unable to delete container '%s'. "
"Got http status '%d'."
@ -413,7 +413,7 @@ class BenchDELETE(Bench):
direct_client.direct_delete_object(node, partition,
self.account,
container_name, name)
except client.ClientException, e:
except client.ClientException as e:
self.logger.debug(str(e))
self.failures += 1
self.complete += 1
@ -442,7 +442,7 @@ class BenchGET(Bench):
direct_client.direct_get_object(node, partition,
self.account,
container_name, name)
except client.ClientException, e:
except client.ClientException as e:
self.logger.debug(str(e))
self.failures += 1
self.complete += 1
@ -486,7 +486,7 @@ class BenchPUT(Bench):
container_name, name,
source,
content_length=len(source))
except client.ClientException, e:
except client.ClientException as e:
self.logger.debug(str(e))
self.failures += 1
else: