projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
3706: Consolidate more regular expressions into util package.
[arvados.git]
/
sdk
/
python
/
arvados
/
commands
/
put.py
diff --git
a/sdk/python/arvados/commands/put.py
b/sdk/python/arvados/commands/put.py
index 53d6f565468595c0c6face0ec76cff86f156c1d2..4a926c701c9f45648dc6337fc294391986e03379 100644
(file)
--- a/
sdk/python/arvados/commands/put.py
+++ b/
sdk/python/arvados/commands/put.py
@@
-3,7
+3,6
@@
# TODO:
# --md5sum - display md5 of each file as read from disk
# TODO:
# --md5sum - display md5 of each file as read from disk
-import apiclient.errors
import argparse
import arvados
import base64
import argparse
import arvados
import base64
@@
-18,6
+17,7
@@
import signal
import socket
import sys
import tempfile
import socket
import sys
import tempfile
+from apiclient import errors as apiclient_errors
import arvados.commands._util as arv_cmd
import arvados.commands._util as arv_cmd
@@
-390,7
+390,7
@@
def main(arguments=None, stdout=sys.stdout, stderr=sys.stderr):
try:
project_uuid = desired_project_uuid(api_client, args.project_uuid,
args.retries)
try:
project_uuid = desired_project_uuid(api_client, args.project_uuid,
args.retries)
- except (apiclient
.
errors.Error, ValueError) as error:
+ except (apiclient
_
errors.Error, ValueError) as error:
print >>stderr, error
sys.exit(1)
print >>stderr, error
sys.exit(1)
@@
-468,7
+468,7
@@
def main(arguments=None, stdout=sys.stdout, stderr=sys.stderr):
else:
output = collection['uuid']
else:
output = collection['uuid']
- except apiclient
.
errors.Error as error:
+ except apiclient
_
errors.Error as error:
print >>stderr, (
"arv-put: Error creating Collection on project: {}.".format(
error))
print >>stderr, (
"arv-put: Error creating Collection on project: {}.".format(
error))