Show More
@@ -281,7 +281,6 b' from __future__ import absolute_import' | |||||
281 |
|
281 | |||
282 | import re |
|
282 | import re | |
283 | import time |
|
283 | import time | |
284 | import xmlrpclib |
|
|||
285 |
|
284 | |||
286 | from mercurial.i18n import _ |
|
285 | from mercurial.i18n import _ | |
287 | from mercurial.node import short |
|
286 | from mercurial.node import short | |
@@ -293,6 +292,7 b' from mercurial import (' | |||||
293 | ) |
|
292 | ) | |
294 |
|
293 | |||
295 | urlparse = util.urlparse |
|
294 | urlparse = util.urlparse | |
|
295 | xmlrpclib = util.xmlrpclib | |||
296 |
|
296 | |||
297 | # Note for extension authors: ONLY specify testedwith = 'internal' for |
|
297 | # Note for extension authors: ONLY specify testedwith = 'internal' for | |
298 | # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should |
|
298 | # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should |
@@ -18,6 +18,13 b' except ImportError:' | |||||
18 | pickle.dumps # silence pyflakes |
|
18 | pickle.dumps # silence pyflakes | |
19 |
|
19 | |||
20 | try: |
|
20 | try: | |
|
21 | import xmlrpclib | |||
|
22 | xmlrpclib.Transport | |||
|
23 | except ImportError: | |||
|
24 | import xmlrpc.client as xmlrpclib | |||
|
25 | xmlrpclib.Transport | |||
|
26 | ||||
|
27 | try: | |||
21 | import urlparse |
|
28 | import urlparse | |
22 | urlparse.urlparse |
|
29 | urlparse.urlparse | |
23 | except ImportError: |
|
30 | except ImportError: |
@@ -54,6 +54,7 b' for attr in (' | |||||
54 | # we do import urlreq, but we do it outside the loop |
|
54 | # we do import urlreq, but we do it outside the loop | |
55 | #'urlreq', |
|
55 | #'urlreq', | |
56 | 'stringio', |
|
56 | 'stringio', | |
|
57 | 'xmlrpclib', | |||
57 | ): |
|
58 | ): | |
58 | globals()[attr] = getattr(pycompat, attr) |
|
59 | globals()[attr] = getattr(pycompat, attr) | |
59 |
|
60 |
@@ -26,7 +26,7 b'' | |||||
26 | doc/hgmanpage.py: invalid syntax: invalid syntax (<unknown>, line *) (glob) |
|
26 | doc/hgmanpage.py: invalid syntax: invalid syntax (<unknown>, line *) (glob) | |
27 | hgext/automv.py: error importing module: <SyntaxError> invalid syntax (commands.py, line *) (line *) (glob) |
|
27 | hgext/automv.py: error importing module: <SyntaxError> invalid syntax (commands.py, line *) (line *) (glob) | |
28 | hgext/blackbox.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
28 | hgext/blackbox.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
29 | hgext/bugzilla.py: error importing module: <ImportError> No module named 'xmlrpclib' (line *) (glob) |
|
29 | hgext/bugzilla.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
30 | hgext/censor.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
30 | hgext/censor.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
31 | hgext/chgserver.py: error importing module: <ImportError> No module named 'SocketServer' (line *) (glob) |
|
31 | hgext/chgserver.py: error importing module: <ImportError> No module named 'SocketServer' (line *) (glob) | |
32 | hgext/children.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
32 | hgext/children.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
General Comments 0
You need to be logged in to leave comments.
Login now