summaryrefslogtreecommitdiffstats
path: root/Lib/urllib
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/urllib')
-rw-r--r--Lib/urllib/parse.py2
-rw-r--r--Lib/urllib/request.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py
index 765f1c8..b437d6f 100644
--- a/Lib/urllib/parse.py
+++ b/Lib/urllib/parse.py
@@ -700,7 +700,7 @@ def splituser(host):
_userprog = re.compile('^(.*)@(.*)$')
match = _userprog.match(host)
- if match: return map(unquote, match.group(1, 2))
+ if match: return match.group(1, 2)
return None, host
_passwdprog = None
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
index 464f847..5a67c0b 100644
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -1275,8 +1275,8 @@ class FTPHandler(BaseHandler):
else:
passwd = None
host = unquote(host)
- user = unquote(user or '')
- passwd = unquote(passwd or '')
+ user = user or ''
+ passwd = passwd or ''
try:
host = socket.gethostbyname(host)