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