Merge branch 'master' into tox-docs

Author: wsanchez

src/hyperlink/_url.py

@@ -761,7 +761,9 @@ class URL(object):
        query (tuple): The query parameters, as a dictionary or
           as an iterable of key-value pairs.
        fragment (unicode): The fragment part of the URL.
-       rooted (bool): Whether or not the path begins with a slash.
+       rooted (bool): A rooted URL is one which indicates an absolute path.
+          This is True on any URL that includes a host, or any relative URL
+          that starts with a slash.
        userinfo (unicode): The username or colon-separated
           username:password pair.
        uses_netloc (bool): Indicates whether two slashes appear
@@ -823,8 +825,12 @@ def __init__(self, scheme=None, host=None, path=(), query=(), fragment=u'',
         uses_netloc = scheme_uses_netloc(self._scheme, uses_netloc)
         self._uses_netloc = _typecheck("uses_netloc",
                                        uses_netloc, bool, NoneType)
-
-        return
+        # fixup for rooted consistency
+        if self._host:
+            self._rooted = True
+        if (not self._rooted) and self._path and self._path[0] == '':
+            self._rooted = True
+            self._path = self._path[1:]
 
     def get_decoded_url(self, lazy=False):
         try:
@@ -985,7 +991,7 @@ def __eq__(self, other):
         if not isinstance(other, self.__class__):
             return NotImplemented
         for attr in ['scheme', 'userinfo', 'host', 'query',
-                     'fragment', 'port', 'uses_netloc']:
+                     'fragment', 'port', 'uses_netloc', 'rooted']:
             if getattr(self, attr) != getattr(other, attr):
                 return False
         if (

src/hyperlink/test/test_url.py

@@ -1081,6 +1081,42 @@ def test_netloc_slashes(self):
 
         return
 
+    def test_rooted_to_relative(self):
+        # type: () -> None
+        """
+        On host-relative URLs, the C{rooted} flag can be updated to indicate
+        that the path should no longer be treated as absolute.
+        """
+        a = URL(path=['hello'])
+        self.assertEqual(a.to_text(), 'hello')
+        b = a.replace(rooted=True)
+        self.assertEqual(b.to_text(), '/hello')
+        self.assertNotEqual(a, b)
+
+    def test_autorooted(self):
+        # type: () -> None
+        """
+        The C{rooted} flag can be updated in some cases, but it cannot be made
+        to conflict with other facts surrounding the URL; for example, all URLs
+        involving an authority (host) are inherently rooted because it is not
+        syntactically possible to express otherwise; also, once an unrooted URL
+        gains a path that starts with an empty string, that empty string is
+        elided and it becomes rooted, because these cases are syntactically
+        indistinguisable in real URL text.
+        """
+        relative_path_rooted = URL(path=['', 'foo'], rooted=False)
+        self.assertEqual(relative_path_rooted.rooted, True)
+        relative_flag_rooted = URL(path=['foo'], rooted=True)
+        self.assertEqual(relative_flag_rooted.rooted, True)
+        self.assertEqual(relative_path_rooted, relative_flag_rooted)
+
+        attempt_unrooted_absolute = URL(host="foo", path=['bar'], rooted=False)
+        normal_absolute = URL(host="foo", path=["bar"])
+        attempted_rooted_replacement = normal_absolute.replace(rooted=True)
+        self.assertEqual(attempt_unrooted_absolute, normal_absolute)
+        self.assertEqual(normal_absolute.rooted, True)
+        self.assertEqual(attempt_unrooted_absolute.rooted, True)
+
     def test_wrong_constructor(self):
         # type: () -> None
         with self.assertRaises(ValueError):