Remove DefragResult.
This commit is contained in:
@@ -1,6 +1,5 @@
|
|||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
from collections import namedtuple
|
|
||||||
import operator
|
import operator
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
@@ -43,9 +42,6 @@ def urlsplit(url):
|
|||||||
return SplitResult(scheme, netloc, path, query, fragment)
|
return SplitResult(scheme, netloc, path, query, fragment)
|
||||||
|
|
||||||
|
|
||||||
DefragResult = namedtuple('DefragResult', 'url fragment')
|
|
||||||
|
|
||||||
|
|
||||||
def urldefrag(url):
|
def urldefrag(url):
|
||||||
if "#" in url:
|
if "#" in url:
|
||||||
s, n, p, q, frag = urlsplit(url)
|
s, n, p, q, frag = urlsplit(url)
|
||||||
@@ -53,7 +49,7 @@ def urldefrag(url):
|
|||||||
else:
|
else:
|
||||||
defrag = url
|
defrag = url
|
||||||
frag = ''
|
frag = ''
|
||||||
return DefragResult(defrag, frag)
|
return defrag, frag
|
||||||
|
|
||||||
|
|
||||||
# flake8: noqa
|
# flake8: noqa
|
||||||
|
@@ -312,16 +312,16 @@ class RefResolver(object):
|
|||||||
return url, self.resolve_cache(url)
|
return url, self.resolve_cache(url)
|
||||||
|
|
||||||
def resolve_from_url(self, url):
|
def resolve_from_url(self, url):
|
||||||
ref = urldefrag(url)
|
url, fragment = urldefrag(url)
|
||||||
try:
|
try:
|
||||||
document = self.store[ref.url]
|
document = self.store[url]
|
||||||
except KeyError:
|
except KeyError:
|
||||||
try:
|
try:
|
||||||
document = self.resolve_remote(ref.url)
|
document = self.resolve_remote(url)
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
raise RefResolutionError(exc)
|
raise RefResolutionError(exc)
|
||||||
|
|
||||||
return self.resolve_fragment(document, ref.fragment)
|
return self.resolve_fragment(document, fragment)
|
||||||
|
|
||||||
def resolve_fragment(self, document, fragment):
|
def resolve_fragment(self, document, fragment):
|
||||||
"""
|
"""
|
||||||
|
Reference in New Issue
Block a user