commit db2ad9dfce438dae14fed0a62b37f0028ee98ad1
author Chirayu Desai <cdesai@cyanogenmod.org> Tue Jun 11 13:42:25 2013 +0530
committer Chirayu Desai <cdesai@cyanogenmod.org> Tue Jun 11 08:21:10 2013 +0000
tree 6f2dc2aef2456c75759cfe9c845a9d4064ff8bc3
parent ef668c92c2c87c45df02bf1609a89e4479bbb30c

Fix urllib.parse (urlparse) handling

Revert "Fix "'module' object is not callable" error", and fix it properly.

* The urlparse module is renamed to urllib.parse in Python 3.
* This commit fixes the code to use "urllib.parse.urlparse"
  instead of creating a new module urlib and setting
  urlib.parse to urlparse.urlparse.
* Fixes an AttributeError:
  'function' object has no attribute 'uses_relative'

This reverts commit cd51f17c643370e6199216462c1be36f04d57291.

Change-Id: I48490b20ecd19cf5a6edd835506ea5a467d556ac

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 930211c..c7f02b3 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
 
@@ -509,7 +509,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)