Skip to content

fix(all):Except python2.x and python3.x compatible #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xuesongbj wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −4
Open

fix(all):Except python2.x and python3.x compatible #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fds/fds_client_example.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions fds/fds_cmd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion fds/galaxy_fds_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down