facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 23:07:18 +03:00
Code Issues Projects Releases Wiki Activity

py3: make factotum use absolute_import

Browse Source 
check-code complains for using urllib2 so that too was fixed.
This commit is contained in:
Pulkit Goyal 2016-04-17 02:29:33 +05:30
parent d623f99ed3
commit e613a4c10d
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hgext/factotum.py
View File

@ -45,10 +45,19 @@ service entry controls the service name used when reading keys.
'''
from __future__ import absolute_import
import os
from mercurial.i18n import _
from mercurial.url import passwordmgr
from mercurial import httpconnection, error
import os, urllib2
from mercurial import (
error,
httpconnection,
url,
util,
)
urlreq = util.urlreq
passwordmgr = url.passwordmgr
ERRMAX = 128
@ -93,7 +102,7 @@ def monkeypatch_method(cls):
@monkeypatch_method(passwordmgr)
def find_user_password(self, realm, authuri):
user, passwd = urllib2.HTTPPasswordMgrWithDefaultRealm.find_user_password(
user, passwd = urlreq.httppasswordmgrwithdefaultrealm.find_user_password(
self, realm, authuri)
if user and passwd:
self._writedebug(user, passwd)

3
tests/test-check-py3-compat.t
View File

@ -3,7 +3,6 @@
$ cd "$TESTDIR"/..
$ hg files 'set:(**.py)' | sed 's|\\|/|g' | xargs python contrib/check-py3-compat.py
hgext/factotum.py not using absolute_import
hgext/fetch.py not using absolute_import
hgext/fsmonitor/pywatchman/__init__.py not using absolute_import
hgext/fsmonitor/pywatchman/__init__.py requires print_function
@ -72,7 +71,7 @@
hgext/convert/transport.py: error importing module: <ImportError> No module named 'svn.client' (line *) (glob)
hgext/eol.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
hgext/extdiff.py: error importing module: <SyntaxError> invalid syntax (archival.py, line *) (line *) (glob)
hgext/factotum.py: error importing: <ImportError> No module named 'httplib' (error at url.py:*) (glob)
hgext/factotum.py: error importing: <ImportError> No module named 'httplib' (error at __init__.py:*) (glob)
hgext/fetch.py: error importing module: <SyntaxError> invalid syntax (commands.py, line *) (line *) (glob)
hgext/fsmonitor/watchmanclient.py: error importing module: <SystemError> Parent module 'hgext.fsmonitor' not loaded, cannot perform relative import (line *) (glob)
hgext/gpg.py: error importing module: <SyntaxError> invalid syntax (commands.py, line *) (line *) (glob)