##// END OF EJS Templates
py3: make factotum use absolute_import...
Pulkit Goyal -
r28971:bacca31f default
parent child Browse files
Show More
@@ -45,10 +45,19 b' service entry controls the service name '
45 45
46 46 '''
47 47
48 from __future__ import absolute_import
49
50 import os
48 51 from mercurial.i18n import _
49 from mercurial.url import passwordmgr
50 from mercurial import httpconnection, error
51 import os, urllib2
52 from mercurial import (
53 error,
54 httpconnection,
55 url,
56 util,
57 )
58
59 urlreq = util.urlreq
60 passwordmgr = url.passwordmgr
52 61
53 62 ERRMAX = 128
54 63
@@ -93,7 +102,7 b' def monkeypatch_method(cls):'
93 102
94 103 @monkeypatch_method(passwordmgr)
95 104 def find_user_password(self, realm, authuri):
96 user, passwd = urllib2.HTTPPasswordMgrWithDefaultRealm.find_user_password(
105 user, passwd = urlreq.httppasswordmgrwithdefaultrealm.find_user_password(
97 106 self, realm, authuri)
98 107 if user and passwd:
99 108 self._writedebug(user, passwd)
@@ -3,7 +3,6 b''
3 3 $ cd "$TESTDIR"/..
4 4
5 5 $ hg files 'set:(**.py)' | sed 's|\\|/|g' | xargs python contrib/check-py3-compat.py
6 hgext/factotum.py not using absolute_import
7 6 hgext/fetch.py not using absolute_import
8 7 hgext/fsmonitor/pywatchman/__init__.py not using absolute_import
9 8 hgext/fsmonitor/pywatchman/__init__.py requires print_function
@@ -72,7 +71,7 b''
72 71 hgext/convert/transport.py: error importing module: <ImportError> No module named 'svn.client' (line *) (glob)
73 72 hgext/eol.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
74 73 hgext/extdiff.py: error importing module: <SyntaxError> invalid syntax (archival.py, line *) (line *) (glob)
75 hgext/factotum.py: error importing: <ImportError> No module named 'httplib' (error at url.py:*) (glob)
74 hgext/factotum.py: error importing: <ImportError> No module named 'httplib' (error at __init__.py:*) (glob)
76 75 hgext/fetch.py: error importing module: <SyntaxError> invalid syntax (commands.py, line *) (line *) (glob)
77 76 hgext/fsmonitor/watchmanclient.py: error importing module: <SystemError> Parent module 'hgext.fsmonitor' not loaded, cannot perform relative import (line *) (glob)
78 77 hgext/gpg.py: error importing module: <SyntaxError> invalid syntax (commands.py, line *) (line *) (glob)
General Comments 0
You need to be logged in to leave comments. Login now