aboutsummaryrefslogtreecommitdiffstats
path: root/djangorestframework/resources.py
diff options
context:
space:
mode:
authormarkotibold2011-06-25 17:31:04 +0200
committermarkotibold2011-06-25 17:31:04 +0200
commit209ee829031ff69ddfe275ee0e41c173f5dec2f4 (patch)
treefc347393d7567217cef459fbf863c2ad6962d414 /djangorestframework/resources.py
parentbae21b14c93e458014107a007e894e93a181bd0e (diff)
parentd3024ff18150e41190da76592d948b724727ca74 (diff)
downloaddjango-rest-framework-209ee829031ff69ddfe275ee0e41c173f5dec2f4.tar.bz2
Merge with 4b1ee62051cce8fa9b83ac740d7262ad4a55494b
Diffstat (limited to 'djangorestframework/resources.py')
-rw-r--r--djangorestframework/resources.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/djangorestframework/resources.py b/djangorestframework/resources.py
index 08f9e0ae..b42bd952 100644
--- a/djangorestframework/resources.py
+++ b/djangorestframework/resources.py
@@ -6,7 +6,7 @@ from django.db.models.fields.related import RelatedField
from django.utils.encoding import smart_unicode
from djangorestframework.response import ErrorResponse
-from djangorestframework.serializer import Serializer
+from djangorestframework.serializer import Serializer, _SkipField
from djangorestframework.utils import as_tuple
import decimal
@@ -342,7 +342,7 @@ class ModelResource(FormResource):
"""
if not hasattr(self, 'view_callable'):
- raise NoReverseMatch
+ raise _SkipField
# dis does teh magicks...
urlconf = get_urlconf()
@@ -371,7 +371,7 @@ class ModelResource(FormResource):
return reverse(self.view_callable[0], kwargs=instance_attrs)
except NoReverseMatch:
pass
- raise NoReverseMatch
+ raise _SkipField
@property