projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
14885: Reverts back to parse_datetime_as_naive
[arvados.git]
/
sdk
/
python
/
arvados
/
commands
/
arv_copy.py
diff --git
a/sdk/python/arvados/commands/arv_copy.py
b/sdk/python/arvados/commands/arv_copy.py
index c5d74efe550a152a1e1f96e97d440084cbebd63f..8850d0bfd5a82c10633a3b39d0d5958961ead940 100755
(executable)
--- a/
sdk/python/arvados/commands/arv_copy.py
+++ b/
sdk/python/arvados/commands/arv_copy.py
@@
-1,4
+1,6
@@
-#! /usr/bin/env python
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
# arv-copy [--recursive] [--no-recursive] object-uuid src dst
#
# arv-copy [--recursive] [--no-recursive] object-uuid src dst
#
@@
-18,10
+20,10
@@
from __future__ import division
from future import standard_library
from __future__ import division
from future import standard_library
+from future.utils import listvalues
standard_library.install_aliases()
from past.builtins import basestring
from builtins import object
standard_library.install_aliases()
from past.builtins import basestring
from builtins import object
-from past.utils import old_div
import argparse
import contextlib
import getpass
import argparse
import contextlib
import getpass
@@
-158,7
+160,7
@@
def main():
abort("cannot copy object {} of type {}".format(args.object_uuid, t))
# Clean up any outstanding temp git repositories.
abort("cannot copy object {} of type {}".format(args.object_uuid, t))
# Clean up any outstanding temp git repositories.
- for d in list
(local_repo_dir.values()
):
+ for d in list
values(local_repo_dir
):
shutil.rmtree(d, ignore_errors=True)
# If no exception was thrown and the response does not have an
shutil.rmtree(d, ignore_errors=True)
# If no exception was thrown and the response does not have an
@@
-805,7
+807,7
@@
def select_git_url(api, repo_name, retries, allow_insecure_http, allow_insecure_
if git_url.startswith("http:"):
if allow_insecure_http:
if git_url.startswith("http:"):
if allow_insecure_http:
- logger.warn("Using insecure git url %s but will allow this because %s", git_url, allow_insecure_http_opt)
+ logger.warn
ing
("Using insecure git url %s but will allow this because %s", git_url, allow_insecure_http_opt)
else:
raise Exception("Refusing to use insecure git url %s, use %s if you really want this." % (git_url, allow_insecure_http_opt))
else:
raise Exception("Refusing to use insecure git url %s, use %s if you really want this." % (git_url, allow_insecure_http_opt))
@@
-954,7
+956,7
@@
def human_progress(obj_uuid, bytes_written, bytes_expected):
return "\r{}: {}M / {}M {:.1%} ".format(
obj_uuid,
bytes_written >> 20, bytes_expected >> 20,
return "\r{}: {}M / {}M {:.1%} ".format(
obj_uuid,
bytes_written >> 20, bytes_expected >> 20,
-
old_div(float(bytes_written), bytes_expected)
)
+
float(bytes_written) / bytes_expected
)
else:
return "\r{}: {} ".format(obj_uuid, bytes_written)
else:
return "\r{}: {} ".format(obj_uuid, bytes_written)