added callback to get and put

fabric/connection.py

@@ -439,9 +439,7 @@ def __init__(
         self.forward_agent = forward_agent
 
         if connect_timeout is None:
-            connect_timeout = self.ssh_config.get(
-                "connecttimeout", self.config.timeouts.connect
-            )
+            connect_timeout = self.ssh_config.get("connecttimeout", self.config.timeouts.connect)
         if connect_timeout is not None:
             connect_timeout = int(connect_timeout)
         #: Connection timeout
@@ -856,7 +854,7 @@ def get(self, *args, **kwargs):
 
         .. versionadded:: 2.0
         """
-        return Transfer(self).get(*args, **kwargs)
+        return Transfer(self).get(**kwargs)
 
     def put(self, *args, **kwargs):
         """

fabric/transfer.py

@@ -43,7 +43,7 @@ def is_remote_dir(self, path):
         except IOError:
             return False
 
-    def get(self, remote, local=None, preserve_mode=True):
+    def get(self, remote, local=None, preserve_mode=True, callback=None):
         """
         Copy a file from wrapped connection's host to the local filesystem.
 
@@ -168,9 +168,9 @@ def get(self, remote, local=None, preserve_mode=True):
         #
         # If local appears to be a file-like object, use sftp.getfo, not get
         if is_file_like:
-            self.sftp.getfo(remotepath=remote, fl=local)
+            self.sftp.getfo(remotepath=remote, fl=local, callback=callback)
         else:
-            self.sftp.get(remotepath=remote, localpath=local)
+            self.sftp.get(remotepath=remote, localpath=local, callback=callback)
             # Set mode to same as remote end
             # TODO: Push this down into SFTPClient sometime (requires backwards
             # incompat release.)
@@ -187,7 +187,7 @@ def get(self, remote, local=None, preserve_mode=True):
             connection=self.connection,
         )
 
-    def put(self, local, remote=None, preserve_mode=True):
+    def put(self, local, remote=None, preserve_mode=True, callback=None):
         """
         Upload a file from the local filesystem to the current connection.
 
@@ -303,12 +303,12 @@ def put(self, local, remote=None, preserve_mode=True):
             pointer = local.tell()
             try:
                 local.seek(0)
-                self.sftp.putfo(fl=local, remotepath=remote)
+                self.sftp.putfo(fl=local, remotepath=remote, callback=callback)
             finally:
                 local.seek(pointer)
         else:
             debug("Uploading {!r} to {!r}".format(local, remote))
-            self.sftp.put(localpath=local, remotepath=remote)
+            self.sftp.put(localpath=local, remotepath=remote, callback=callback)
             # Set mode to same as local end
             # TODO: Push this down into SFTPClient sometime (requires backwards
             # incompat release.)

fabric/util.py

@@ -43,3 +43,4 @@ def get_local_user():
 
             username = win32api.GetUserName()
     return username
+

integration/concurrency.py

@@ -83,7 +83,7 @@ def manual_threading_works_okay(self):
         for t in threads:
             t.join(5)  # Kinda slow, but hey, maybe the test runner is hot
         while not queue.empty():
-            cxn, result, expected = queue.get(block=False)
+            cxn, result, expected = queue.get()
             for resultword, expectedword in zip_longest(result, expected):
                 err = u"({2!r}, {3!r}->{4!r}) {0!r} != {1!r}".format(
                     resultword, expectedword, cxn, expected[0], expected[-1]

tests/transfer.py

@@ -103,9 +103,7 @@ def connection_params_as_dir(self, transfer):
                 assert result.local == "/local/host/somefile"
 
             def remote_path_posixpath_bits(self, transfer):
-                result = transfer.get(
-                    "parent/mid/leaf", "foo/{dirname}/bar/{basename}"
-                )
+                result = transfer.get("parent/mid/leaf", "foo/{dirname}/bar/{basename}")
                 # Recall that test harness sets remote apparent cwd as
                 # /remote/, thus dirname is /remote/parent/mid
                 assert result.local == "/local/foo/remote/parent/mid/bar/leaf"