commit cd51f17c643370e6199216462c1be36f04d57291
author David Pursehouse <david.pursehouse@sonymobile.com> Thu Jun 06 19:06:16 2013 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> Sat Jun 08 14:50:41 2013 +0900
tree 8ab1624ac46d6adbac6ca3c25d3d716aff251776
parent c2791e85f322bb7d5007ee7e673134d5fa2ed662

Fix "'module' object is not callable" error

In a couple of files the urlparse method was not being set up
correctly for python < 3 and this resulted in an error being
thrown when trying to call it.

Change-Id: I4d2040ac77101e4e228ee225862f365ae3d96cec

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 b34787d..92d295d 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