commit 65b162b32fccee038ea331ea47706c4c2ef52692
author Conley Owens <cco3@android.com> Mon Jun 10 14:31:30 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 10 14:31:30 2013 +0000
tree 080bc21551d03b899dadd480c8be8833a82237de
parent 53a6c5d93a8ba708208826dab64c55fe97f06d0b
parent cd51f17c643370e6199216462c1be36f04d57291

Merge "Fix "'module' object is not callable" error"

manifest_xml.py

diff --git a/manifest_xml.py b/manifest_xml.py
index 817a1c8..b6f7547 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
+  urllib.parse = urlparse.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 2d2c8bf..930211c 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
+  urllib.parse = urlparse.urlparse
   xmlrpc = imp.new_module('xmlrpc')
   xmlrpc.client = xmlrpclib