Issue #20270: urllib.urlparse now supports empty ports.

diff --cc Lib/test/test_urlparse.py
Simple merge

diff --cc Lib/urllib/parse.py
index 5328b9d3298fda22432d1abb5868c60cd189b575,975c6ffb9c15a30487542d0927d0c63b8527b19f..2ba39917cf16601dc5cf21b4ac7e89e7641ca303
--- 1/Lib/urllib/parse.py
--- 2/Lib/urllib/parse.py
+++ b/Lib/urllib/parse.py
@@@ -898,10 -902,14 +898,13 @@@ def splitport(host)
      """splitport('host:port') --> 'host', 'port'."""
      global _portprog
      if _portprog is None:
-         _portprog = re.compile('^(.*):([0-9]+)$')
 -        import re
+         _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

diff --cc Misc/NEWS
Simple merge