Merge lp:~jelmer/brz/empty-port into lp:brz

[Jelmer Vernooij]

Allow port to be empty when parsing URLs.

Allow port to be empty when parsing URLs.

Git allows this, and at least one some Debian Vcs-Git rely on it.

[Martin Packman (gz)]

Makes sense, most parsers will turn this into the port-less form happily it seems.

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/land-brz/446/

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/land-brz/454/

=== modified file 'breezy/tests/test_http.py'
--- breezy/tests/test_http.py	2018-08-31 10:23:32 +0000
+++ breezy/tests/test_http.py	2018-09-13 12:06:57 +0000
@@ -389,7 +389,7 @@
         self._transport('http://example.com/bzr/bzr.dev/')
         self.assertRaises(urlutils.InvalidURL,
                           self._transport,
-                          'http://http://example.com/bzr/bzr.dev/')
+                          'http://example.com:port/bzr/bzr.dev/')
 
     def test_http_root_urls(self):
         """Construction of URLs from server root"""

=== modified file 'breezy/tests/test_urlutils.py'
--- breezy/tests/test_urlutils.py	2018-08-22 02:05:28 +0000
+++ breezy/tests/test_urlutils.py	2018-09-13 12:06:57 +0000
@@ -933,6 +933,15 @@
         self.assertIsNot(url, url3)
         self.assertEqual(url, url3)
 
+    def test_parse_empty_port(self):
+        parsed = urlutils.URL.from_string('http://example.com:/one')
+        self.assertEqual('http', parsed.scheme)
+        self.assertIs(None, parsed.user)
+        self.assertIs(None, parsed.password)
+        self.assertEqual('example.com', parsed.host)
+        self.assertIs(None, parsed.port)
+        self.assertEqual('/one', parsed.path)
+
 
 class TestFileRelpath(TestCase):
 

=== modified file 'breezy/urlutils.py'
--- breezy/urlutils.py	2018-08-22 02:05:28 +0000
+++ breezy/urlutils.py	2018-09-13 12:06:57 +0000
@@ -929,11 +929,14 @@
         if ':' in host and not (host[0] == '[' and host[-1] == ']'):
             # there *is* port
             host, port = host.rsplit(':', 1)
-            try:
-                port = int(port)
-            except ValueError:
-                raise InvalidURL('invalid port number %s in url:\n%s' %
-                                 (port, url))
+            if port:
+                try:
+                    port = int(port)
+                except ValueError:
+                    raise InvalidURL('invalid port number %s in url:\n%s' %
+                                     (port, url))
+            else:
+                port = None
         if host != "" and host[0] == '[' and host[-1] == ']': #IPv6
             host = host[1:-1]