aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework
diff options
context:
space:
mode:
authorTom Christie2012-10-05 17:02:33 +0100
committerTom Christie2012-10-05 17:02:33 +0100
commitcc21948a69f5cea90ca02042549af29c20e0268a (patch)
tree3c40c6988adb90a488394ce3f6771876d9303c16 /rest_framework
parentae3340bcd4cd8596459cf687c63ec2d8bf73fcd6 (diff)
downloaddjango-rest-framework-cc21948a69f5cea90ca02042549af29c20e0268a.tar.bz2
Fix django 1.3 bug
Diffstat (limited to 'rest_framework')
-rw-r--r--rest_framework/fields.py1
-rw-r--r--rest_framework/generics.py2
2 files changed, 3 insertions, 0 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index cf7e692e..336eac1e 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -341,6 +341,7 @@ class HyperlinkedRelatedField(RelatedField):
def from_native(self, value):
# Convert URL -> model instance pk
+ # TODO: Use values_list
try:
match = resolve(value)
except:
diff --git a/rest_framework/generics.py b/rest_framework/generics.py
index 44f677cc..51874f28 100644
--- a/rest_framework/generics.py
+++ b/rest_framework/generics.py
@@ -79,6 +79,8 @@ class SingleObjectBaseView(SingleObjectMixin, BaseView):
"""
Base class for generic views onto a model instance.
"""
+ pk_url_kwarg = 'pk' # Not provided in Django 1.3
+ slug_url_kwarg = 'slug' # Not provided in Django 1.3
def get_object(self):
"""