From b13cfa6c59699e9d4c35270de92014982e92cd7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?zhangshaozhi=20=5B=E5=BC=A0=E5=B0=91=E6=99=BA=5D?=
 <zhangshaozhi@xiaomi.com>
Date: Mon, 14 Aug 2017 10:57:24 +0800
Subject: [PATCH] fix(all):Except python2.x and python3.x compatible

---
 fds/fds_client_example.py | 2 +-
 fds/fds_cmd.py            | 4 ++--
 fds/galaxy_fds_client.py  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fds/fds_client_example.py b/fds/fds_client_example.py
index ef619fa..0ae6deb 100644
--- a/fds/fds_client_example.py
+++ b/fds/fds_client_example.py
@@ -116,7 +116,7 @@
 # Delete the bucket
 try:
   fds_client.delete_bucket(bucket_name)
-except GalaxyFDSClientException, e:
+except GalaxyFDSClientException as e:
   print e.message
 
 fds_client.delete_object(bucket_name, object_name)
diff --git a/fds/fds_cmd.py b/fds/fds_cmd.py
index efface6..fdcc2eb 100755
--- a/fds/fds_cmd.py
+++ b/fds/fds_cmd.py
@@ -292,7 +292,7 @@ def multipart_upload(bucket_name, object_name, metadata, stream):
                                          metadata=metadata,
                                          upload_part_result_list=json.dumps(upload_part_result))
     logger.info("Upload complete")
-  except Exception, e:
+  except Exception as e:
     try:
       logger.error("Upload id %s will be abort" % upload_token.upload_id)
       fds_client.abort_multipart_upload(bucket_name, object_name, upload_token.upload_id)
@@ -705,7 +705,7 @@ def main():
       else:
         parser.print_help()
 
-  except Exception, e:
+  except Exception as e:
     sys.stderr.write(e.message)
     sys.stderr.flush()
     if debug_enabled:
diff --git a/fds/galaxy_fds_client.py b/fds/galaxy_fds_client.py
index 431c8dd..3f430ce 100644
--- a/fds/galaxy_fds_client.py
+++ b/fds/galaxy_fds_client.py
@@ -763,7 +763,7 @@ def generate_presigned_uri(self, base_uri, bucket_name, object_name,
              (base_uri, quote(bucket_name), quote(object_name), \
               Common.GALAXY_ACCESS_KEY_ID, self._auth._app_key, \
               Common.EXPIRES, str(int(expiration)), Common.SIGNATURE, signature)
-    except Exception, e:
+    except Exception as e:
       message = 'Wrong expiration given. ' \
                 'Milliseconds since January 1, 1970 should be used. ' + str(e)
       raise GalaxyFDSClientException(message)