summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Nephin <dnephin@gmail.com>2015-03-03 16:09:42 -0500
committerDaniel Nephin <dnephin@gmail.com>2015-03-03 16:09:42 -0500
commitca59f3fa87cda8b0f101d3997dcbc8711e5a19c2 (patch)
tree390221c609c5bb7cc292f6bf93b3cc6b9164cb85
parentd1e24483aabea8844bf7498b52649498f6b3ff5a (diff)
downloadjsonschema-ca59f3fa87cda8b0f101d3997dcbc8711e5a19c2.tar.gz
Remove DefragResult.
-rw-r--r--jsonschema/compat.py6
-rw-r--r--jsonschema/validators.py8
2 files changed, 5 insertions, 9 deletions
diff --git a/jsonschema/compat.py b/jsonschema/compat.py
index 0afd9ea..b3156f9 100644
--- a/jsonschema/compat.py
+++ b/jsonschema/compat.py
@@ -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
diff --git a/jsonschema/validators.py b/jsonschema/validators.py
index 435b8db..2343908 100644
--- a/jsonschema/validators.py
+++ b/jsonschema/validators.py
@@ -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):
"""