From db2ad9dfce438dae14fed0a62b37f0028ee98ad1 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Tue, 11 Jun 2013 13:42:25 +0530 Subject: [PATCH] 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 | 2 +- subcmds/sync.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest_xml.py b/manifest_xml.py index b6f75477..817a1c80 100644 --- a/manifest_xml.py +++ b/manifest_xml.py @@ -27,7 +27,7 @@ else: 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 diff --git a/subcmds/sync.py b/subcmds/sync.py index 930211c1..c7f02b35 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py @@ -34,7 +34,7 @@ else: 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 @@ later is required to fix a server side protocol bug. 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)