summaryrefslogtreecommitdiffstats
path: root/Lib/urllib/parse.py
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2014-01-18 16:30:33 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2014-01-18 16:30:33 (GMT)
commitff97b08d0022392da23a25aa5ccb04e6a2966e8b (patch)
treee8b304f8bf9b2bb260a783fea484a233cffb4dab /Lib/urllib/parse.py
parente413cde95f79544aefce5576ebb92d18cbf6ff2e (diff)
downloadcpython-ff97b08d0022392da23a25aa5ccb04e6a2966e8b.zip
cpython-ff97b08d0022392da23a25aa5ccb04e6a2966e8b.tar.gz
cpython-ff97b08d0022392da23a25aa5ccb04e6a2966e8b.tar.bz2
Issue #20270: urllib.urlparse now supports empty ports.
Diffstat (limited to 'Lib/urllib/parse.py')
-rw-r--r--Lib/urllib/parse.py31
1 files changed, 17 insertions, 14 deletions
diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py
index 9a2df41..975c6ff 100644
--- a/Lib/urllib/parse.py
+++ b/Lib/urllib/parse.py
@@ -182,10 +182,10 @@ class _NetlocResultMixinStr(_NetlocResultMixinBase, _ResultMixinStr):
_, have_open_br, bracketed = hostinfo.partition('[')
if have_open_br:
hostname, _, port = bracketed.partition(']')
- _, have_port, port = port.partition(':')
+ _, _, port = port.partition(':')
else:
- hostname, have_port, port = hostinfo.partition(':')
- if not have_port:
+ hostname, _, port = hostinfo.partition(':')
+ if not port:
port = None
return hostname, port
@@ -212,10 +212,10 @@ class _NetlocResultMixinBytes(_NetlocResultMixinBase, _ResultMixinBytes):
_, have_open_br, bracketed = hostinfo.partition(b'[')
if have_open_br:
hostname, _, port = bracketed.partition(b']')
- _, have_port, port = port.partition(b':')
+ _, _, port = port.partition(b':')
else:
- hostname, have_port, port = hostinfo.partition(b':')
- if not have_port:
+ hostname, _, port = hostinfo.partition(b':')
+ if not port:
port = None
return hostname, port
@@ -903,10 +903,13 @@ def splitport(host):
global _portprog
if _portprog is None:
import re
- _portprog = re.compile('^(.*):([0-9]+)$')
+ _portprog = re.compile('^(.*):([0-9]*)$')
match = _portprog.match(host)
- if match: return match.group(1, 2)
+ if match:
+ host, port = match.groups()
+ if port:
+ return host, port
return host, None
_nportprog = None
@@ -923,12 +926,12 @@ def splitnport(host, defport=-1):
match = _nportprog.match(host)
if match:
host, port = match.group(1, 2)
- try:
- if not port: raise ValueError("no digits")
- nport = int(port)
- except ValueError:
- nport = None
- return host, nport
+ if port:
+ try:
+ nport = int(port)
+ except ValueError:
+ nport = None
+ return host, nport
return host, defport
_queryprog = None