From cc21948a69f5cea90ca02042549af29c20e0268a Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Fri, 5 Oct 2012 17:02:33 +0100
Subject: Fix django 1.3 bug

---
 rest_framework/fields.py   | 1 +
 rest_framework/generics.py | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'rest_framework')

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):
         """
-- 
cgit v1.2.3