aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Tamlyn2013-02-06 13:10:54 +0000
committerMarc Tamlyn2013-02-06 13:10:54 +0000
commit11610e7c3c4330b863c9da5d843b6d874c2958e9 (patch)
tree386dfe436111b38dfa452c3a696adbeb597f4cf1
parentbd7977eed79bd8fc4d9e73b6d848b0f0cd5a72ec (diff)
downloaddjango-rest-framework-11610e7c3c4330b863c9da5d843b6d874c2958e9.tar.bz2
Try the correct NoReverseMatch location.
-rw-r--r--rest_framework/relations.py4
-rw-r--r--rest_framework/templatetags/rest_framework.py3
2 files changed, 3 insertions, 4 deletions
diff --git a/rest_framework/relations.py b/rest_framework/relations.py
index 48946e21..53fd646d 100644
--- a/rest_framework/relations.py
+++ b/rest_framework/relations.py
@@ -1,6 +1,6 @@
from __future__ import unicode_literals
-from django.core.exceptions import ObjectDoesNotExist, ValidationError, NoReverseMatch
-from django.core.urlresolvers import resolve, get_script_prefix
+from django.core.exceptions import ObjectDoesNotExist, ValidationError
+from django.core.urlresolvers import resolve, get_script_prefix, NoReverseMatch
from django import forms
from django.forms import widgets
from django.forms.models import ModelChoiceIterator
diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py
index 1c962798..c21ddcd7 100644
--- a/rest_framework/templatetags/rest_framework.py
+++ b/rest_framework/templatetags/rest_framework.py
@@ -1,7 +1,6 @@
from __future__ import unicode_literals, absolute_import
from django import template
-from django.core.exceptions import NoReverseMatch
-from django.core.urlresolvers import reverse
+from django.core.urlresolvers import reverse, NoReverseMatch
from django.http import QueryDict
from django.utils.html import escape
from django.utils.safestring import SafeData, mark_safe