openstack/deb-python-rfc3986
Code Issues Proposed changes

use .replace() for modifications

Browse Source
This commit is contained in:
Thomas Weißschuh
2014-09-26 23:27:51 +00:00
parent 76c6de7d7c
commit 5a604ce0a8
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rfc3986/uri.py
View File

@@ -308,14 +308,14 @@ class URIReference(namedtuple('URIReference', URI_COMPONENTS)):
resolving = self
if not strict and resolving.scheme == base_uri.scheme:
resolving = resolving._replace(scheme=None)
resolving = resolving.replace(scheme=None)
# http://tools.ietf.org/html/rfc3986#page-32
if resolving.scheme is not None:
target = resolving._replace(path=normalize_path(resolving.path))
target = resolving.replace(path=normalize_path(resolving.path))
else:
if resolving.authority is not None:
target = resolving._replace(
target = resolving.replace(
scheme=base_uri.scheme,
path=normalize_path(resolving.path)
)
@@ -325,7 +325,7 @@ class URIReference(namedtuple('URIReference', URI_COMPONENTS)):
query = resolving.query
else:
query = base_uri.query
target = resolving._replace(
target = resolving.replace(
scheme=base_uri.scheme,
authority=base_uri.authority,
path=base_uri.path,
@@ -338,7 +338,7 @@ class URIReference(namedtuple('URIReference', URI_COMPONENTS)):
path = normalize_path(
merge_paths(base_uri, resolving.path)
)
target = resolving._replace(
target = resolving.replace(
scheme=base_uri.scheme,
authority=base_uri.authority,
path=path,
@@ -366,6 +366,9 @@ class URIReference(namedtuple('URIReference', URI_COMPONENTS)):
result_list.extend(['#', self.fragment])
return ''.join(result_list)
def replace(self, **kwargs):
return self._replace(**kwargs)
def valid_ipv4_host_address(host):
# If the host exists, and it might be IPv4, check each byte in the