diff --git a/swift/common/client.py b/swift/common/client.py
index 476378e548..2a06f97333 100644
--- a/swift/common/client.py
+++ b/swift/common/client.py
@@ -358,6 +358,7 @@ def post_account(url, token, headers, http_conn=None):
                               http_reason=resp.reason,
                               http_response_content=body)
 
+
 def get_container(url, token, container, marker=None, limit=None,
                   prefix=None, delimiter=None, http_conn=None,
                   full_listing=False):
diff --git a/swift/common/db.py b/swift/common/db.py
index a028576638..cb973eb290 100644
--- a/swift/common/db.py
+++ b/swift/common/db.py
@@ -274,7 +274,7 @@ class DatabaseBroker(object):
         elif 'file is encrypted or is not a database' in str(exc_value):
             exc_hint = 'corrupted'
         else:
-            raise exc_type, exc_value, exc_traceback
+            raise exc_type(*exc_value.args), None, exc_traceback
         prefix_path = os.path.dirname(self.db_dir)
         partition_path = os.path.dirname(prefix_path)
         dbs_path = os.path.dirname(partition_path)