--- a/mercurial/ui.py Sat Jan 27 13:14:06 2018 +0900
+++ b/mercurial/ui.py Sat Jan 27 13:33:31 2018 +0900
@@ -148,14 +148,10 @@
}
def _maybestrurl(maybebytes):
- if maybebytes is None:
- return None
- return pycompat.strurl(maybebytes)
+ return util.rapply(pycompat.strurl, maybebytes)
def _maybebytesurl(maybestr):
- if maybestr is None:
- return None
- return pycompat.bytesurl(maybestr)
+ return util.rapply(pycompat.bytesurl, maybestr)
class httppasswordmgrdbproxy(object):
"""Delays loading urllib2 until it's needed."""
@@ -168,18 +164,14 @@
return self._mgr
def add_password(self, realm, uris, user, passwd):
- if isinstance(uris, tuple):
- uris = tuple(_maybestrurl(u) for u in uris)
- else:
- uris = _maybestrurl(uris)
return self._get_mgr().add_password(
- _maybestrurl(realm), uris,
+ _maybestrurl(realm), _maybestrurl(uris),
_maybestrurl(user), _maybestrurl(passwd))
def find_user_password(self, realm, uri):
- return tuple(_maybebytesurl(v) for v in
- self._get_mgr().find_user_password(_maybestrurl(realm),
- _maybestrurl(uri)))
+ mgr = self._get_mgr()
+ return _maybebytesurl(mgr.find_user_password(_maybestrurl(realm),
+ _maybestrurl(uri)))
def _catchterm(*args):
raise error.SignalInterrupt