openstack/deb-python-rfc3986
Code Issues Proposed changes

Rename URIReference#resolve to resolve_with

Browse Source
This commit is contained in:
Ian Cordasco
2014-07-26 16:13:44 -05:00
parent f2d6a94af5
commit 2a7be2b457
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rfc3986/uri.py
View File

@@ -279,9 +279,12 @@ class URIReference(namedtuple('URIReference', URI_COMPONENTS)):
"""
return tuple(self.normalize()) == tuple(other_ref.normalize())
def resolve(self, base_uri, strict=False):
def resolve_with(self, base_uri, strict=False):
"""Use an absolute URI Reference to resolve this relative reference.
Assuming this is a relative reference that you would like to resolve,
use the provided base URI to resolve it.
See http://tools.ietf.org/html/rfc3986#section-5 for more information.
:param base_uri: Either a string or URIReference. It must be an

18
tests/test_uri.py
View File

@@ -442,7 +442,7 @@ class TestURIReferencesResolve:
def test_with_basic_and_relative_uris(self, basic_uri, relative_uri):
R = URIReference.from_string(relative_uri)
B = URIReference.from_string(basic_uri)
T = R.resolve(basic_uri)
T = R.resolve_with(basic_uri)
assert T.scheme == B.scheme
assert T.host == R.host
assert T.path == R.path
@@ -451,7 +451,7 @@ class TestURIReferencesResolve:
absolute_path_uri):
R = URIReference.from_string(absolute_path_uri)
B = URIReference.from_string(basic_uri).normalize()
T = R.resolve(B)
T = R.resolve_with(B)
assert T.scheme == B.scheme
assert T.host == B.host
assert T.path == R.path
@@ -459,7 +459,7 @@ class TestURIReferencesResolve:
def test_with_basic_uri_and_relative_path(self, basic_uri):
R = URIReference.from_string('foo/bar/bogus')
B = URIReference.from_string(basic_uri).normalize()
T = R.resolve(B)
T = R.resolve_with(B)
assert T.scheme == B.scheme
assert T.host == B.host
assert T.path == '/' + R.path
@@ -467,7 +467,7 @@ class TestURIReferencesResolve:
def test_basic_uri_with_path_and_relative_path(self, basic_uri_with_path):
R = URIReference.from_string('foo/bar/bogus')
B = URIReference.from_string(basic_uri_with_path).normalize()
T = R.resolve(B)
T = R.resolve_with(B)
assert T.scheme == B.scheme
assert T.host == B.host
@@ -478,30 +478,30 @@ class TestURIReferencesResolve:
R = URIReference.from_string('foo/bar/bogus')
B = URIReference.from_string(uri_with_everything)
with pytest.raises(ResolutionError):
R.resolve(B)
R.resolve_with(B)
def test_basic_uri_resolves_itself(self, basic_uri):
R = URIReference.from_string(basic_uri)
B = URIReference.from_string(basic_uri)
T = R.resolve(B)
T = R.resolve_with(B)
assert T == B
def test_differing_schemes(self, basic_uri):
R = URIReference.from_string('https://example.com/path')
B = URIReference.from_string(basic_uri)
T = R.resolve(B)
T = R.resolve_with(B)
assert T.scheme == R.scheme
def test_resolve_pathless_fragment(self, basic_uri):
R = URIReference.from_string('#fragment')
B = URIReference.from_string(basic_uri)
T = R.resolve(B)
T = R.resolve_with(B)
assert T.path is None
assert T.fragment == 'fragment'
def test_resolve_pathless_query(self, basic_uri):
R = URIReference.from_string('?query')
B = URIReference.from_string(basic_uri)
T = R.resolve(B)
T = R.resolve_with(B)
assert T.path is None
assert T.query == 'query'