Skip to content

Commit ca59f3f

Browse files
committed
Remove DefragResult.
1 parent d1e2448 commit ca59f3f

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

jsonschema/compat.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
from __future__ import unicode_literals
22

3-
from collections import namedtuple
43
import operator
54
import sys
65

@@ -43,17 +42,14 @@ def urlsplit(url):
4342
return SplitResult(scheme, netloc, path, query, fragment)
4443

4544

46-
DefragResult = namedtuple('DefragResult', 'url fragment')
47-
48-
4945
def urldefrag(url):
5046
if "#" in url:
5147
s, n, p, q, frag = urlsplit(url)
5248
defrag = urlunsplit((s, n, p, q, ''))
5349
else:
5450
defrag = url
5551
frag = ''
56-
return DefragResult(defrag, frag)
52+
return defrag, frag
5753

5854

5955
# flake8: noqa

jsonschema/validators.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -312,16 +312,16 @@ def resolve(self, ref):
312312
return url, self.resolve_cache(url)
313313

314314
def resolve_from_url(self, url):
315-
ref = urldefrag(url)
315+
url, fragment = urldefrag(url)
316316
try:
317-
document = self.store[ref.url]
317+
document = self.store[url]
318318
except KeyError:
319319
try:
320-
document = self.resolve_remote(ref.url)
320+
document = self.resolve_remote(url)
321321
except Exception as exc:
322322
raise RefResolutionError(exc)
323323

324-
return self.resolve_fragment(document, ref.fragment)
324+
return self.resolve_fragment(document, fragment)
325325

326326
def resolve_fragment(self, document, fragment):
327327
"""

0 commit comments

Comments
 (0)