3699: fix namespace clash: rename module to arv_copy

Prevents confusion with the Python 'copy' module.

No issue # (bug fix)

diff --git a/sdk/python/arvados/commands/copy.py b/sdk/python/arvados/commands/arv_copy.py
similarity index 99%
rename from sdk/python/arvados/commands/copy.py
rename to sdk/python/arvados/commands/arv_copy.py
index 7841f90226b341c81ab86dd3c3b67f239f37d5ca..7da23acb5074a217a8ba70d0000d7e519cf35139 100755 (executable)
--- a/sdk/python/arvados/commands/copy.py
+++ b/sdk/python/arvados/commands/arv_copy.py
@@ -626,7 +626,7 @@ def abort(msg, code=1):
 # Code for reporting on the progress of a collection upload.
 # Stolen from arvados.commands.put.ArvPutCollectionWriter
 # TODO(twp): figure out how to refactor into a shared library
-# (may involve refactoring some arvados.commands.copy.copy_collection
+# (may involve refactoring some arvados.commands.arv_copy.copy_collection
 # code)
 
 def machine_progress(obj_uuid, bytes_written, bytes_expected):

diff --git a/sdk/python/bin/arv-copy b/sdk/python/bin/arv-copy
index 2de0f0cdcfe1677fafb4b68795ba936e602e621f..4ee08dee3b6ea984b4cce00ec24779d8f59cd093 100755 (executable)
--- a/sdk/python/bin/arv-copy
+++ b/sdk/python/bin/arv-copy
@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 
-from arvados.commands.copy import main
+from arvados.commands.arv_copy import main
 main()