diff options
| author | Conley Owens <cco3@android.com> | 2013-06-10 14:31:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-06-10 14:31:30 +0000 |
| commit | 65b162b32fccee038ea331ea47706c4c2ef52692 (patch) | |
| tree | 080bc21551d03b899dadd480c8be8833a82237de | |
| parent | 53a6c5d93a8ba708208826dab64c55fe97f06d0b (diff) | |
| parent | cd51f17c643370e6199216462c1be36f04d57291 (diff) | |
| download | git-repo-65b162b32fccee038ea331ea47706c4c2ef52692.tar.gz | |
Merge "Fix "'module' object is not callable" error"
| -rw-r--r-- | manifest_xml.py | 2 | ||||
| -rw-r--r-- | subcmds/sync.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/manifest_xml.py b/manifest_xml.py index 817a1c80..b6f75477 100644 --- a/manifest_xml.py +++ b/manifest_xml.py | |||
| @@ -27,7 +27,7 @@ else: | |||
| 27 | import imp | 27 | import imp |
| 28 | import urlparse | 28 | import urlparse |
| 29 | urllib = imp.new_module('urllib') | 29 | urllib = imp.new_module('urllib') |
| 30 | urllib.parse = urlparse | 30 | urllib.parse = urlparse.urlparse |
| 31 | 31 | ||
| 32 | from git_config import GitConfig | 32 | from git_config import GitConfig |
| 33 | from git_refs import R_HEADS, HEAD | 33 | from git_refs import R_HEADS, HEAD |
diff --git a/subcmds/sync.py b/subcmds/sync.py index 2d2c8bff..930211c1 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py | |||
| @@ -34,7 +34,7 @@ else: | |||
| 34 | import urlparse | 34 | import urlparse |
| 35 | import xmlrpclib | 35 | import xmlrpclib |
| 36 | urllib = imp.new_module('urllib') | 36 | urllib = imp.new_module('urllib') |
| 37 | urllib.parse = urlparse | 37 | urllib.parse = urlparse.urlparse |
| 38 | xmlrpc = imp.new_module('xmlrpc') | 38 | xmlrpc = imp.new_module('xmlrpc') |
| 39 | xmlrpc.client = xmlrpclib | 39 | xmlrpc.client = xmlrpclib |
| 40 | 40 | ||