Merge pull request #95 from handrews/no-warnings

Don't use deprecated methods in resolve_with()

Author: sigmavirus24

src/rfc3986/_mixin.py

@@ -56,6 +56,16 @@ def authority_info(self):
     def _match_subauthority(self):
         return misc.SUBAUTHORITY_MATCHER.match(self.authority)
 
+    @property
+    def _validator(self):
+        v = getattr(self, "_cached_validator", None)
+        if v is not None:
+            return v
+        self._cached_validator = validators.Validator().require_presence_of(
+            "scheme"
+        )
+        return self._cached_validator
+
     @property
     def host(self):
         """If present, a string representing the host."""
@@ -262,7 +272,9 @@ def resolve_with(self, base_uri, strict=False):
         if not isinstance(base_uri, URIMixin):
             base_uri = type(self).from_string(base_uri)
 
-        if not base_uri.is_valid(require_scheme=True):
+        try:
+            self._validator.validate(base_uri)
+        except exc.ValidationError:
             raise exc.ResolutionError(base_uri)
 
         # This is optional per

tests/test_uri.py

@@ -376,6 +376,14 @@ def test_resolve_pathless_query(self, basic_uri):
         assert T.path is None
         assert T.query == "query"
 
+    def test_resolve_twice_for_cached_validator(self, basic_uri):
+        R = URIReference.from_string("")
+        B = URIReference.from_string(basic_uri)
+        T1 = R.resolve_with(B)
+        T2 = R.resolve_with(B)
+        assert T1 == T2
+        assert T1 == B
+
 
 def test_empty_querystrings_persist():
     url = "https://httpbin.org/get?"