commit 854f2b6ef4f9ea1c304b2e77d552b930b28e7053
author David Pursehouse <david.pursehouse@sonymobile.com> Tue Jun 11 13:58:47 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 11 13:58:47 2013 +0000
tree 17c26004548ed39b2cfee350a63fe283148b445a
parent db2ad9dfce438dae14fed0a62b37f0028ee98ad1
parent a892b1006b5b7193262f3783b9678e2c76978a9b

Merge "sync: assign manifest_name earlier"

manifest_xml.py

diff --git a/manifest_xml.py b/manifest_xml.py
index b6f7547..817a1c8 100644
--- a/manifest_xml.py
+++ b/manifest_xml.py
@@ -27,7 +27,7 @@
   import imp
   import urlparse
   urllib = imp.new_module('urllib')
-  urllib.parse = urlparse.urlparse
+  urllib.parse = urlparse
 
 from git_config import GitConfig
 from git_refs import R_HEADS, HEAD

subcmds/sync.py

diff --git a/subcmds/sync.py b/subcmds/sync.py
index ff0cf3a..002d05f 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -34,7 +34,7 @@
   import urlparse
   import xmlrpclib
   urllib = imp.new_module('urllib')
-  urllib.parse = urlparse.urlparse
+  urllib.parse = urlparse
   xmlrpc = imp.new_module('xmlrpc')
   xmlrpc.client = xmlrpclib
 
@@ -511,7 +511,7 @@
                   file=sys.stderr)
           else:
             try:
-              parse_result = urllib.parse(manifest_server)
+              parse_result = urllib.parse.urlparse(manifest_server)
               if parse_result.hostname:
                 username, _account, password = \
                   info.authenticators(parse_result.hostname)