← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~cjwatson/launchpad:py3-syntax-async-virtual-transport into launchpad:master

 

Colin Watson has proposed merging ~cjwatson/launchpad:py3-syntax-async-virtual-transport into launchpad:master.

Commit message:
Fix Python 3 syntax error in AsyncVirtualTransport

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/381332

Tuple parameter unpacking was abolished in Python 3.0 by PEP 3113.  I dealt with most of this in https://code.launchpad.net/~cjwatson/launchpad/pep-3113/+merge/336686, but missed this one.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:py3-syntax-async-virtual-transport into launchpad:master.
diff --git a/lib/lp/codehosting/vfs/transport.py b/lib/lp/codehosting/vfs/transport.py
index f53b49a..f4248f7 100644
--- a/lib/lp/codehosting/vfs/transport.py
+++ b/lib/lp/codehosting/vfs/transport.py
@@ -236,8 +236,8 @@ class AsyncVirtualTransport(Transport):
         deferred = gatherResults([to_deferred, from_deferred])
 
         @no_traceback_failures
-        def check_transports_and_rename(
-            ((to_transport, to_path), (from_transport, from_path))):
+        def check_transports_and_rename(results):
+            (to_transport, to_path), (from_transport, from_path) = results
             if to_transport.base != from_transport.base:
                 return Failure(TransportNotPossible(
                     'cannot move between underlying transports'))