From 9ae0ca1caeb7d195719b9544da2a3a7c4fc85b26 Mon Sep 17 00:00:00 2001
From: "Michal Dvorak (cen38289)" <michadvorak@csas.cz>
Date: Mon, 3 Dec 2012 17:26:01 +0100
Subject: [PATCH 001/197] #467 Added label and help_text to Field

---
 rest_framework/fields.py      | 23 +++++++++++++----------
 rest_framework/serializers.py |  6 ++++++
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 482a3d485..907bab749 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -28,7 +28,7 @@ def is_simple_callable(obj):
     return (
         (inspect.isfunction(obj) and not inspect.getargspec(obj)[0]) or
         (inspect.ismethod(obj) and len(inspect.getargspec(obj)[0]) <= 1)
-    )
+        )
 
 
 class Field(object):
@@ -38,13 +38,15 @@ class Field(object):
     _use_files = None
     form_field_class = forms.CharField
 
-    def __init__(self, source=None):
+    def __init__(self, source=None, label=None, help_text=None):
         self.parent = None
 
         self.creation_counter = Field.creation_counter
         Field.creation_counter += 1
 
         self.source = source
+        self.label = label
+        self.help_text = help_text
 
     def initialize(self, parent, field_name):
         """
@@ -123,11 +125,11 @@ class WritableField(Field):
     widget = widgets.TextInput
     default = None
 
-    def __init__(self, source=None, read_only=False, required=None,
+    def __init__(self, source=None, label=None, help_text=None,
+                 read_only=False, required=None,
                  validators=[], error_messages=None, widget=None,
                  default=None, blank=None):
-
-        super(WritableField, self).__init__(source=source)
+        super(WritableField, self).__init__(source=source, label=label, help_text=help_text)
 
         self.read_only = read_only
         if required is None:
@@ -215,6 +217,7 @@ class ModelField(WritableField):
     """
     A generic field that can be used against an arbitrary model field.
     """
+
     def __init__(self, *args, **kwargs):
         try:
             self.model_field = kwargs.pop('model_field')
@@ -222,9 +225,9 @@ class ModelField(WritableField):
             raise ValueError("ModelField requires 'model_field' kwarg")
 
         self.min_length = kwargs.pop('min_length',
-                            getattr(self.model_field, 'min_length', None))
+            getattr(self.model_field, 'min_length', None))
         self.max_length = kwargs.pop('max_length',
-                            getattr(self.model_field, 'max_length', None))
+            getattr(self.model_field, 'max_length', None))
 
         super(ModelField, self).__init__(*args, **kwargs)
 
@@ -434,7 +437,7 @@ class PrimaryKeyRelatedField(RelatedField):
             # RelatedObject (reverse relationship)
             obj = getattr(obj, self.source or field_name)
             return self.to_native(obj.pk)
-        # Forward relationship
+            # Forward relationship
         return self.to_native(pk)
 
 
@@ -469,7 +472,7 @@ class ManyPrimaryKeyRelatedField(ManyRelatedField):
             # RelatedManager (reverse relationship)
             queryset = getattr(obj, self.source or field_name)
             return [self.to_native(item.pk) for item in queryset.all()]
-        # Forward relationship
+            # Forward relationship
         return [self.to_native(item.pk) for item in queryset.all()]
 
     def from_native(self, data):
@@ -913,7 +916,7 @@ class DateTimeField(WritableField):
                 # call stack.
                 warnings.warn(u"DateTimeField received a naive datetime (%s)"
                               u" while time zone support is active." % value,
-                              RuntimeWarning)
+                    RuntimeWarning)
                 default_timezone = timezone.get_default_timezone()
                 value = timezone.make_aware(value, default_timezone)
             return value
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 4519ab053..2dab79149 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -428,6 +428,12 @@ class ModelSerializer(Serializer):
         if max_length:
             kwargs['max_length'] = max_length
 
+        if model_field.verbose_name:
+            kwargs['label'] = model_field.verbose_name
+
+        if model_field.help_text:
+            kwargs['help_text'] = model_field.help_text
+
         field_mapping = {
             models.FloatField: FloatField,
             models.IntegerField: IntegerField,

From ad01fa0eae990ca1607d44cbabba5425c9d0b9a4 Mon Sep 17 00:00:00 2001
From: Michal Dvorak <mikee@mdvorak.org>
Date: Mon, 3 Dec 2012 19:07:07 +0100
Subject: [PATCH 002/197] #467 Added unit test

---
 rest_framework/serializers.py      |  8 ++++----
 rest_framework/tests/models.py     |  3 ++-
 rest_framework/tests/serializer.py | 27 +++++++++++++++++++++++++--
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 2dab79149..e4fcbd670 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -428,11 +428,11 @@ class ModelSerializer(Serializer):
         if max_length:
             kwargs['max_length'] = max_length
 
-        if model_field.verbose_name:
-            kwargs['label'] = model_field.verbose_name
+        if model_field.verbose_name is not None:
+            kwargs['label'] = smart_unicode(model_field.verbose_name)
 
-        if model_field.help_text:
-            kwargs['help_text'] = model_field.help_text
+        if model_field.help_text is not None:
+            kwargs['help_text'] = smart_unicode(model_field.help_text)
 
         field_mapping = {
             models.FloatField: FloatField,
diff --git a/rest_framework/tests/models.py b/rest_framework/tests/models.py
index c35861c6c..a13f1ef34 100644
--- a/rest_framework/tests/models.py
+++ b/rest_framework/tests/models.py
@@ -1,6 +1,7 @@
 from django.db import models
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes.generic import GenericForeignKey, GenericRelation
+from django.utils.translation import ugettext_lazy as _
 
 # from django.contrib.auth.models import Group
 
@@ -56,7 +57,7 @@ class Anchor(RESTFrameworkModel):
 
 
 class BasicModel(RESTFrameworkModel):
-    text = models.CharField(max_length=100)
+    text = models.CharField(max_length=100, verbose_name=_("Text"), help_text=_("Text description."))
 
 
 class SlugBasedModel(RESTFrameworkModel):
diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 61a05da18..cc83a7402 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -1,6 +1,6 @@
 import datetime
 from django.test import TestCase
-from rest_framework import serializers
+from rest_framework import serializers, fields
 from rest_framework.tests.models import (ActionItem, Anchor, BasicModel,
     BlankFieldModel, BlogPost, Book, CallableDefaultValueModel, DefaultValueModel,
     ManyToManyModel, Person, ReadOnlyManyToManyModel)
@@ -48,7 +48,7 @@ class BookSerializer(serializers.ModelSerializer):
 
 
 class ActionItemSerializer(serializers.ModelSerializer):
-    
+
     class Meta:
         model = ActionItem
 
@@ -641,3 +641,26 @@ class BlankFieldTests(TestCase):
         """
         serializer = self.not_blank_model_serializer_class(data=self.data)
         self.assertEquals(serializer.is_valid(), False)
+
+
+# Test for issue #467
+class FieldLabelTest(TestCase):
+    def setUp(self):
+        class LabelModelSerializer(serializers.ModelSerializer):
+            # This is check that ctor supports both fields
+            additional = fields.CharField(label='Label', help_text='Help')
+
+            class Meta:
+                model = BasicModel
+
+        self.serializer_class = LabelModelSerializer
+
+    def test_label_from_model(self):
+        """
+        Validates that label and help_text are correctly copied from the model class.
+        """
+        serializer = self.serializer_class()
+        text_field = serializer.fields['text']
+
+        self.assertEquals('Text', text_field.label)
+        self.assertEquals('Text description.', text_field.help_text)

From dea0f9129c770b6a9ccebce7296235b529fa59e7 Mon Sep 17 00:00:00 2001
From: Michal Dvorak <mikee@mdvorak.org>
Date: Mon, 3 Dec 2012 19:10:57 +0100
Subject: [PATCH 003/197] Fixed screwed formatting

---
 rest_framework/fields.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 907bab749..74b4cb7c2 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -28,7 +28,7 @@ def is_simple_callable(obj):
     return (
         (inspect.isfunction(obj) and not inspect.getargspec(obj)[0]) or
         (inspect.ismethod(obj) and len(inspect.getargspec(obj)[0]) <= 1)
-        )
+    )
 
 
 class Field(object):
@@ -217,7 +217,6 @@ class ModelField(WritableField):
     """
     A generic field that can be used against an arbitrary model field.
     """
-
     def __init__(self, *args, **kwargs):
         try:
             self.model_field = kwargs.pop('model_field')
@@ -225,9 +224,9 @@ class ModelField(WritableField):
             raise ValueError("ModelField requires 'model_field' kwarg")
 
         self.min_length = kwargs.pop('min_length',
-            getattr(self.model_field, 'min_length', None))
+                            getattr(self.model_field, 'min_length', None))
         self.max_length = kwargs.pop('max_length',
-            getattr(self.model_field, 'max_length', None))
+                            getattr(self.model_field, 'max_length', None))
 
         super(ModelField, self).__init__(*args, **kwargs)
 
@@ -437,7 +436,7 @@ class PrimaryKeyRelatedField(RelatedField):
             # RelatedObject (reverse relationship)
             obj = getattr(obj, self.source or field_name)
             return self.to_native(obj.pk)
-            # Forward relationship
+        # Forward relationship
         return self.to_native(pk)
 
 
@@ -472,7 +471,7 @@ class ManyPrimaryKeyRelatedField(ManyRelatedField):
             # RelatedManager (reverse relationship)
             queryset = getattr(obj, self.source or field_name)
             return [self.to_native(item.pk) for item in queryset.all()]
-            # Forward relationship
+        # Forward relationship
         return [self.to_native(item.pk) for item in queryset.all()]
 
     def from_native(self, data):
@@ -916,7 +915,7 @@ class DateTimeField(WritableField):
                 # call stack.
                 warnings.warn(u"DateTimeField received a naive datetime (%s)"
                               u" while time zone support is active." % value,
-                    RuntimeWarning)
+                              RuntimeWarning)
                 default_timezone = timezone.get_default_timezone()
                 value = timezone.make_aware(value, default_timezone)
             return value

From a7849157bcfb8eb07b0ac934ae7c49a965bf6875 Mon Sep 17 00:00:00 2001
From: "Michal Dvorak (cen38289)" <michadvorak@csas.cz>
Date: Tue, 4 Dec 2012 10:00:14 +0100
Subject: [PATCH 004/197] Moved ctor test to separate unit test

---
 rest_framework/tests/serializer.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index cc83a7402..76c9c465a 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -647,9 +647,6 @@ class BlankFieldTests(TestCase):
 class FieldLabelTest(TestCase):
     def setUp(self):
         class LabelModelSerializer(serializers.ModelSerializer):
-            # This is check that ctor supports both fields
-            additional = fields.CharField(label='Label', help_text='Help')
-
             class Meta:
                 model = BasicModel
 
@@ -664,3 +661,11 @@ class FieldLabelTest(TestCase):
 
         self.assertEquals('Text', text_field.label)
         self.assertEquals('Text description.', text_field.help_text)
+
+    def test_field_ctor(self):
+        """
+        This is check that ctor supports both label and help_text.
+        """
+        fields.Field(label='Label', help_text='Help')
+        fields.CharField(label='Label', help_text='Help')
+        fields.ManyHyperlinkedRelatedField(view_name='fake', label='Label', help_text='Help')

From 2a82b64963792b353a7a2634c003692bd4957c9f Mon Sep 17 00:00:00 2001
From: "Michal Dvorak (cen38289)" <michadvorak@csas.cz>
Date: Tue, 4 Dec 2012 14:16:45 +0100
Subject: [PATCH 005/197] Moved smart_unicode to Field ctor, to mimic Django
 Forms behavior.

---
 rest_framework/fields.py           |  8 ++++++--
 rest_framework/serializers.py      |  4 ++--
 rest_framework/tests/serializer.py | 10 +++++-----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 74b4cb7c2..f57dc57ff 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -45,8 +45,12 @@ class Field(object):
         Field.creation_counter += 1
 
         self.source = source
-        self.label = label
-        self.help_text = help_text
+
+        if label is not None:
+            self.label = smart_unicode(label)
+
+        if help_text is not None:
+            self.help_text = smart_unicode(help_text)
 
     def initialize(self, parent, field_name):
         """
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index e4fcbd670..37496be35 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -429,10 +429,10 @@ class ModelSerializer(Serializer):
             kwargs['max_length'] = max_length
 
         if model_field.verbose_name is not None:
-            kwargs['label'] = smart_unicode(model_field.verbose_name)
+            kwargs['label'] = model_field.verbose_name
 
         if model_field.help_text is not None:
-            kwargs['help_text'] = smart_unicode(model_field.help_text)
+            kwargs['help_text'] = model_field.help_text
 
         field_mapping = {
             models.FloatField: FloatField,
diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 76c9c465a..44adf92eb 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -659,13 +659,13 @@ class FieldLabelTest(TestCase):
         serializer = self.serializer_class()
         text_field = serializer.fields['text']
 
-        self.assertEquals('Text', text_field.label)
-        self.assertEquals('Text description.', text_field.help_text)
+        self.assertEquals(u'Text', text_field.label)
+        self.assertEquals(u'Text description.', text_field.help_text)
 
     def test_field_ctor(self):
         """
         This is check that ctor supports both label and help_text.
         """
-        fields.Field(label='Label', help_text='Help')
-        fields.CharField(label='Label', help_text='Help')
-        fields.ManyHyperlinkedRelatedField(view_name='fake', label='Label', help_text='Help')
+        self.assertEquals(u'Label', fields.Field(label='Label', help_text='Help').label)
+        self.assertEquals(u'Help', fields.CharField(label='Label', help_text='Help').help_text)
+        self.assertEquals(u'Label', fields.ManyHyperlinkedRelatedField(view_name='fake', label='Label', help_text='Help').label)

From 84be169353f0dd2ceb06fe459b72aa2452fcbeb5 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Fri, 1 Mar 2013 16:13:04 +1300
Subject: [PATCH 006/197] fix function names and dotted lookups for use in
 PrimaryKeyRelatedField.field_to_native (they work in
 RelatedField.field_to_native already)

---
 rest_framework/relations.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/rest_framework/relations.py b/rest_framework/relations.py
index 0c108717f..ef465b3c0 100644
--- a/rest_framework/relations.py
+++ b/rest_framework/relations.py
@@ -215,12 +215,20 @@ class PrimaryKeyRelatedField(RelatedField):
     def field_to_native(self, obj, field_name):
         if self.many:
             # To-many relationship
-            try:
+
+            queryset = None
+            if not self.source:
                 # Prefer obj.serializable_value for performance reasons
-                queryset = obj.serializable_value(self.source or field_name)
-            except AttributeError:
+                try:
+                    queryset = obj.serializable_value(field_name)
+                except AttributeError:
+                    pass
+            if queryset is None:
                 # RelatedManager (reverse relationship)
-                queryset = getattr(obj, self.source or field_name)
+                source = self.source or field_name
+                queryset = obj
+                for component in source.split('.'):
+                    queryset = get_component(queryset, component)
 
             # Forward relationship
             return [self.to_native(item.pk) for item in queryset.all()]

From 0081d744b9f530b2418d1e82d7ad94a2ebc31c9c Mon Sep 17 00:00:00 2001
From: Matteo Suppo <matteo.suppo@gmail.com>
Date: Sat, 23 Mar 2013 14:18:11 +0100
Subject: [PATCH 007/197] Added tests for issue 747 in serializer.py

---
 rest_framework/tests/serializer.py | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 05217f35a..0386ca76e 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -1082,3 +1082,32 @@ class DeserializeListTestCase(TestCase):
         self.assertFalse(serializer.is_valid())
         expected = [{}, {'email': ['This field is required.']}, {}]
         self.assertEqual(serializer.errors, expected)
+
+
+# test for issue 747
+
+class LazyStringModel(object):
+    def __init__(self, lazystring):
+        self.lazystring = lazystring
+
+
+class LazyStringSerializer(serializers.Serializer):
+    lazystring = serializers.Field()
+
+    def restore_object(self, attrs, instance=None):
+        if instance is not None:
+            instance.lazystring = attrs.get('lazystring', instance.lazystring)
+            return instance
+        return Comment(**attrs)
+
+
+class LazyStringsTestCase(TestCase):
+
+    def setUp(self):
+        from django.utils.translation import ugettext_lazy as _
+
+        self.model = LazyStringModel(lazystring=_("lazystring"))
+
+    def test_lazy_strings_are_translated(self):
+        serializer = LazyStringSerializer(self.model)
+        self.assertEqual(type(serializer.data['lazystring']), type("lazystring"))

From b5640bb77843c50f42a649982b9b9592113c6f59 Mon Sep 17 00:00:00 2001
From: Matteo Suppo <matteo.suppo@gmail.com>
Date: Sat, 23 Mar 2013 14:18:55 +0100
Subject: [PATCH 008/197] Forcing translations of lazy translatable strings in
 Field to_native method

---
 rest_framework/fields.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index f3496b53e..09f076ab7 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -18,7 +18,7 @@ from rest_framework import ISO_8601
 from rest_framework.compat import timezone, parse_date, parse_datetime, parse_time
 from rest_framework.compat import BytesIO
 from rest_framework.compat import six
-from rest_framework.compat import smart_text
+from rest_framework.compat import smart_text, force_text
 from rest_framework.settings import api_settings
 
 
@@ -165,7 +165,7 @@ class Field(object):
             return [self.to_native(item) for item in value]
         elif isinstance(value, dict):
             return dict(map(self.to_native, (k, v)) for k, v in value.items())
-        return smart_text(value)
+        return force_text(value)
 
     def attributes(self):
         """

From 3737e17d7c29fbc958d6e56c29a641dd6ec26af8 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Thu, 9 May 2013 13:10:45 +0100
Subject: [PATCH 009/197] Added 'Customizing the generic views' section. 
 Closes #816

---
 docs/api-guide/generic-views.md | 120 +++++++++++++++++++++-----------
 1 file changed, 78 insertions(+), 42 deletions(-)

diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md
index a30bfb21d..80df2f400 100755
--- a/docs/api-guide/generic-views.md
+++ b/docs/api-guide/generic-views.md
@@ -164,6 +164,52 @@ You won't typically need to override the following methods, although you might n
 
 ---
 
+# Mixins
+
+The mixin classes provide the actions that are used to provide the basic view behavior.  Note that the mixin classes provide action methods rather than defining the handler methods such as `.get()` and `.post()` directly.  This allows for more flexible composition of behavior.
+
+## ListModelMixin
+
+Provides a `.list(request, *args, **kwargs)` method, that implements listing a queryset.
+
+If the queryset is populated, this returns a `200 OK` response, with a serialized representation of the queryset as the body of the response.  The response data may optionally be paginated.
+
+If the queryset is empty this returns a `200 OK` response, unless the `.allow_empty` attribute on the view is set to `False`, in which case it will return a `404 Not Found`.
+
+## CreateModelMixin
+
+Provides a `.create(request, *args, **kwargs)` method, that implements creating and saving a new model instance.
+
+If an object is created this returns a `201 Created` response, with a serialized representation of the object as the body of the response.  If the representation contains a key named `url`, then the `Location` header of the response will be populated with that value.
+
+If the request data provided for creating the object was invalid, a `400 Bad Request` response will be returned, with the error details as the body of the response.
+
+## RetrieveModelMixin
+
+Provides a `.retrieve(request, *args, **kwargs)` method, that implements returning an existing model instance in a response.
+
+If an object can be retrieved this returns a `200 OK` response, with a serialized representation of the object as the body of the response.  Otherwise it will return a `404 Not Found`.
+
+## UpdateModelMixin
+
+Provides a `.update(request, *args, **kwargs)` method, that implements updating and saving an existing model instance.
+
+Also provides a `.partial_update(request, *args, **kwargs)` method, which is similar to the `update` method, except that all fields for the update will be optional.  This allows support for HTTP `PATCH` requests.
+
+If an object is updated this returns a `200 OK` response, with a serialized representation of the object as the body of the response.
+
+If an object is created, for example when making a `DELETE` request followed by a `PUT` request to the same URL, this returns a `201 Created` response, with a serialized representation of the object as the body of the response.
+
+If the request data provided for updating the object was invalid, a `400 Bad Request` response will be returned, with the error details as the body of the response.
+
+## DestroyModelMixin
+
+Provides a `.destroy(request, *args, **kwargs)` method, that implements deletion of an existing model instance.
+
+If an object is deleted this returns a `204 No Content` response, otherwise it will return a `404 Not Found`.
+
+---
+
 # Concrete View Classes
 
 The following classes are the concrete generic views.  If you're using generic views this is normally the level you'll be working at unless you need heavily customized behavior.
@@ -242,59 +288,49 @@ Extends: [GenericAPIView], [RetrieveModelMixin], [UpdateModelMixin], [DestroyMod
 
 ---
 
-# Mixins
+# Customizing the generic views
 
-The mixin classes provide the actions that are used to provide the basic view behavior.  Note that the mixin classes provide action methods rather than defining the handler methods such as `.get()` and `.post()` directly.  This allows for more flexible composition of behavior.
+Often you'll want to use the existing generic views, but use some slightly customized behavior.  If you find yourself reusing some bit of customized behavior in multiple places, you might want to refactor the behavior into a mixin class that you can then just apply to any view or viewset as needed.
 
-## ListModelMixin
+## Creating custom mixins
 
-Provides a `.list(request, *args, **kwargs)` method, that implements listing a queryset.
+For example, if you need to lookup objects based on multiple fields in the URL conf, you could create a mixin class like the following:
 
-If the queryset is populated, this returns a `200 OK` response, with a serialized representation of the queryset as the body of the response.  The response data may optionally be paginated.
+    class MultipleFieldLookupMixin(object):
+        """
+        Apply this mixin to any view or viewset to get multiple field filtering
+        based on a `lookup_fields` attribute, instead of the default single field filtering.
+        """
+        def get_object(self):
+            queryset = self.get_queryset()             # Get the base queryset
+            queryset = self.filter_queryset(queryset)  # Apply any filter backends
+            filter = {}
+            for field in self.lookup_fields:
+                filter[field] = self.kwargs[field]
+            return get_object_or_404(queryset, **filter)  # Lookup the object
 
-If the queryset is empty this returns a `200 OK` response, unless the `.allow_empty` attribute on the view is set to `False`, in which case it will return a `404 Not Found`.
+You can then simply apply this mixin to a view or viewset anytime you need to apply the custom behavior.
 
-Should be mixed in with [MultipleObjectAPIView].
+    class RetrieveUserView(MultipleFieldLookupMixin, generics.RetrieveAPIView):
+        queryset = User.objects.all()
+        serializer_class = UserSerializer
+        lookup_fields = ('account', 'username')
 
-## CreateModelMixin
+Using custom mixins is a good option if you have custom behavior that needs to be used 
 
-Provides a `.create(request, *args, **kwargs)` method, that implements creating and saving a new model instance.
+## Creating custom base classes
 
-If an object is created this returns a `201 Created` response, with a serialized representation of the object as the body of the response.  If the representation contains a key named `url`, then the `Location` header of the response will be populated with that value.
+If you are using a mixin across multiple views, you can take this a step further and create your own set of base views that can then be used throughout your project.  For example:
 
-If the request data provided for creating the object was invalid, a `400 Bad Request` response will be returned, with the error details as the body of the response.
+    class BaseRetrieveView(MultipleFieldLookupMixin,
+                           generics.RetrieveAPIView):
+        pass
+    
+    class BaseRetrieveUpdateDestroyView(MultipleFieldLookupMixin,
+                                        generics.RetrieveUpdateDestroyAPIView):
+        pass
 
-Should be mixed in with any [GenericAPIView].
-
-## RetrieveModelMixin
-
-Provides a `.retrieve(request, *args, **kwargs)` method, that implements returning an existing model instance in a response.
-
-If an object can be retrieved this returns a `200 OK` response, with a serialized representation of the object as the body of the response.  Otherwise it will return a `404 Not Found`.
-
-Should be mixed in with [SingleObjectAPIView].
-
-## UpdateModelMixin
-
-Provides a `.update(request, *args, **kwargs)` method, that implements updating and saving an existing model instance.
-
-Also provides a `.partial_update(request, *args, **kwargs)` method, which is similar to the `update` method, except that all fields for the update will be optional.  This allows support for HTTP `PATCH` requests.
-
-If an object is updated this returns a `200 OK` response, with a serialized representation of the object as the body of the response.
-
-If an object is created, for example when making a `DELETE` request followed by a `PUT` request to the same URL, this returns a `201 Created` response, with a serialized representation of the object as the body of the response.
-
-If the request data provided for updating the object was invalid, a `400 Bad Request` response will be returned, with the error details as the body of the response.
-
-Should be mixed in with [SingleObjectAPIView].
-
-## DestroyModelMixin
-
-Provides a `.destroy(request, *args, **kwargs)` method, that implements deletion of an existing model instance.
-
-If an object is deleted this returns a `204 No Content` response, otherwise it will return a `404 Not Found`.
-
-Should be mixed in with [SingleObjectAPIView].
+Using custom base classes is a good option if you have custom behavior that consistently needs to be repeated across a large number of views throughout your project.
 
 [cite]: https://docs.djangoproject.com/en/dev/ref/class-based-views/#base-vs-generic-views
 

From f2466418dd325ed1353d4e0056411c16e96c2073 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Thu, 9 May 2013 13:14:20 +0100
Subject: [PATCH 010/197] Tweak doc text slightly

---
 docs/api-guide/generic-views.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md
index 80df2f400..3651dc40c 100755
--- a/docs/api-guide/generic-views.md
+++ b/docs/api-guide/generic-views.md
@@ -290,7 +290,7 @@ Extends: [GenericAPIView], [RetrieveModelMixin], [UpdateModelMixin], [DestroyMod
 
 # Customizing the generic views
 
-Often you'll want to use the existing generic views, but use some slightly customized behavior.  If you find yourself reusing some bit of customized behavior in multiple places, you might want to refactor the behavior into a mixin class that you can then just apply to any view or viewset as needed.
+Often you'll want to use the existing generic views, but use some slightly customized behavior.  If you find yourself reusing some bit of customized behavior in multiple places, you might want to refactor the behavior into a common class that you can then just apply to any view or viewset as needed.
 
 ## Creating custom mixins
 

From 31f94ab409f1d5f41982a5946b980cf3ad8e3ba9 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Thu, 9 May 2013 13:31:42 +0100
Subject: [PATCH 011/197] Added GenericViewSet and docs tweaking

---
 docs/api-guide/viewsets.md | 25 ++++++++++++++++---------
 rest_framework/viewsets.py |  9 +++++++++
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md
index d98f37d84..e354a43ad 100644
--- a/docs/api-guide/viewsets.md
+++ b/docs/api-guide/viewsets.md
@@ -136,9 +136,15 @@ The `ViewSet` class inherits from `APIView`.  You can use any of the standard at
 
 The `ViewSet` class does not provide any implementations of actions.  In order to use a `ViewSet` class you'll override the class and define the action implementations explicitly.
 
+## GenericViewSet
+
+The `GenericViewSet` class inherits from `GenericAPIView`, and provides the default set of `get_object`, `get_queryset` methods and other generic view base behavior, but does not include any actions by default.
+
+In order to use a `GenericViewSet` class you'll override the class and either mixin the required mixin classes, or define the action implementations explicitly.
+
 ## ModelViewSet
 
-The `ModelViewSet` class inherits from `GenericAPIView` and includes implementations for various actions, by mixing in the behavior of the
+The `ModelViewSet` class inherits from `GenericAPIView` and includes implementations for various actions, by mixing in the behavior of the various mixin classes.
 
 The actions provided by the `ModelViewSet` class are `.list()`, `.retrieve()`,  `.create()`, `.update()`, and `.destroy()`.
 
@@ -188,17 +194,18 @@ Again, as with `ModelViewSet`, you can use any of the standard attributes and me
 
 # Custom ViewSet base classes 
 
-Any standard `View` class can be turned into a `ViewSet` class by mixing in `ViewSetMixin`.  You can use this to define your own base classes.
+You may need to provide custom `ViewSet` classes that do not have the full set of `ModelViewSet` actions, or that customize the behavior in some other way.
 
 ## Example
 
-For example, we can create a base viewset class that provides `retrieve`, `update` and `list` operations:
+To create a base viewset class that provides `create`, `list` and `retrieve` operations, inherit from `GenericViewSet`, and mixin the required actions:
+
+    class CreateListRetrieveViewSet(mixins.CreateMixin,
+                                    mixins.ListMixin,
+                                    mixins.RetrieveMixin,
+                                    viewsets.GenericViewSet):
+        pass
 
-    class RetrieveUpdateListViewSet(mixins.RetrieveModelMixin,
-                                    mixins.UpdateModelMixin,
-                                    mixins.ListModelMixin,
-                                    viewsets.ViewSetMixin,
-                                    generics.GenericAPIView):
         """
         A viewset that provides `retrieve`, `update`, and `list` actions.
         
@@ -207,6 +214,6 @@ For example, we can create a base viewset class that provides `retrieve`, `updat
         """
         pass
 
-By creating your own base `ViewSet` classes, you can provide common behavior that can be reused in multiple views across your API.
+By creating your own base `ViewSet` classes, you can provide common behavior that can be reused in multiple viewsets across your API.
 
 [cite]: http://guides.rubyonrails.org/routing.html
diff --git a/rest_framework/viewsets.py b/rest_framework/viewsets.py
index 0eb3e86dc..7c820091a 100644
--- a/rest_framework/viewsets.py
+++ b/rest_framework/viewsets.py
@@ -108,6 +108,15 @@ class ViewSet(ViewSetMixin, views.APIView):
     pass
 
 
+class GenericViewSet(ViewSetMixin, generics.GenericAPIView):
+    """
+    The GenericViewSet class does not provide any actions by default,
+    but does include the base set of generic view behavior, such as
+    the `get_object` and `get_queryset` methods.
+    """
+    pass
+
+
 class ReadOnlyModelViewSet(mixins.RetrieveModelMixin,
                            mixins.ListModelMixin,
                            ViewSetMixin,

From 939cc5adba6f5a95aac317134eb841838a0bff3f Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Thu, 9 May 2013 13:35:01 +0100
Subject: [PATCH 012/197] Tweak inheritance

---
 rest_framework/viewsets.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/rest_framework/viewsets.py b/rest_framework/viewsets.py
index 7c820091a..d91323f22 100644
--- a/rest_framework/viewsets.py
+++ b/rest_framework/viewsets.py
@@ -119,8 +119,7 @@ class GenericViewSet(ViewSetMixin, generics.GenericAPIView):
 
 class ReadOnlyModelViewSet(mixins.RetrieveModelMixin,
                            mixins.ListModelMixin,
-                           ViewSetMixin,
-                           generics.GenericAPIView):
+                           GenericViewSet):
     """
     A viewset that provides default `list()` and `retrieve()` actions.
     """
@@ -132,8 +131,7 @@ class ModelViewSet(mixins.CreateModelMixin,
                     mixins.UpdateModelMixin,
                     mixins.DestroyModelMixin,
                     mixins.ListModelMixin,
-                    ViewSetMixin,
-                    generics.GenericAPIView):
+                    GenericViewSet):
     """
     A viewset that provides default `create()`, `retrieve()`, `update()`,
     `partial_update()`, `destroy()` and `list()` actions.

From 0176a5391b5d0c5c5dd61133f17b9b68840d6e1a Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Thu, 9 May 2013 17:09:40 +0100
Subject: [PATCH 013/197] Fix HyperlinkedModelSerializer not respecting
 lookup_fields

---
 rest_framework/serializers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index ea5175e28..d7a4c9ef9 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -827,7 +827,7 @@ class HyperlinkedModelSerializerOptions(ModelSerializerOptions):
     def __init__(self, meta):
         super(HyperlinkedModelSerializerOptions, self).__init__(meta)
         self.view_name = getattr(meta, 'view_name', None)
-        self.lookup_field = getattr(meta, 'slug_field', None)
+        self.lookup_field = getattr(meta, 'lookup_field', None)
 
 
 class HyperlinkedModelSerializer(ModelSerializer):

From 5c8356d51d48f758136f5019bfbbef3858c6f5fe Mon Sep 17 00:00:00 2001
From: Hamish Campbell <hn.campbell@gmail.com>
Date: Fri, 10 May 2013 13:28:50 +1200
Subject: [PATCH 014/197] Fix minor code error in Generic Views documentation -
 missing `if` statement.

---
 docs/api-guide/generic-views.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md
index 3651dc40c..1a060a324 100755
--- a/docs/api-guide/generic-views.md
+++ b/docs/api-guide/generic-views.md
@@ -34,7 +34,7 @@ For more complex cases you might also want to override various methods on the vi
             """
             Use smaller pagination for HTML representations.
             """
-            self.request.accepted_renderer.format == 'html':
+            if self.request.accepted_renderer.format == 'html':
                 return 20
             return 100
 

From 2e3032ff8cf1fe172e5ac38dc4320f1191fba340 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Fri, 10 May 2013 14:14:42 +0200
Subject: [PATCH 015/197] Added @hamishcampbell for docs fix #818. Thanks!

---
 docs/topics/credits.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index 13f673c98..9871c64e5 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -120,6 +120,7 @@ The following people have helped make REST framework great.
 * Jerome Chen - [chenjyw]
 * Andrew Hughes - [eyepulp]
 * Daniel Hepper - [dhepper]
+* Hamish Campbell - [hamishcampbell]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -275,3 +276,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [chenjyw]: https://github.com/chenjyw
 [eyepulp]: https://github.com/eyepulp
 [dhepper]: https://github.com/dhepper
+[hamishcampbell]: https://github.com/hamishcampbell

From fd84cf7f10bf703c5daae4a5f6a7dee0c22471dd Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Fri, 10 May 2013 21:56:33 +0100
Subject: [PATCH 016/197] Docs tweaks

---
 docs/topics/2.3-announcement.md           | 4 ++--
 docs/tutorial/2-requests-and-responses.md | 2 +-
 docs/tutorial/6-viewsets-and-routers.md   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/topics/2.3-announcement.md b/docs/topics/2.3-announcement.md
index 6677c800f..4df9c819c 100644
--- a/docs/topics/2.3-announcement.md
+++ b/docs/topics/2.3-announcement.md
@@ -30,8 +30,8 @@ As an example of just how simple REST framework APIs can now be, here's an API w
     
     # Routers provide an easy way of automatically determining the URL conf
     router = routers.DefaultRouter()
-    router.register(r'users', views.UserViewSet)
-    router.register(r'groups', views.GroupViewSet)
+    router.register(r'users', UserViewSet)
+    router.register(r'groups', GroupViewSet)
 
 
     # Wire up our API using automatic URL routing.
diff --git a/docs/tutorial/2-requests-and-responses.md b/docs/tutorial/2-requests-and-responses.md
index 3a002cb00..260c4d832 100644
--- a/docs/tutorial/2-requests-and-responses.md
+++ b/docs/tutorial/2-requests-and-responses.md
@@ -8,7 +8,7 @@ Let's introduce a couple of essential building blocks.
 REST framework introduces a `Request` object that extends the regular `HttpRequest`, and provides more flexible request parsing.  The core functionality of the `Request` object is the `request.DATA` attribute, which is similar to `request.POST`, but more useful for working with Web APIs.
 
     request.POST  # Only handles form data.  Only works for 'POST' method.
-    request.DATA  # Handles arbitrary data.  Works any HTTP request with content.
+    request.DATA  # Handles arbitrary data.  Works for 'POST', 'PUT' and 'PATCH' methods.
 
 ## Response objects
 
diff --git a/docs/tutorial/6-viewsets-and-routers.md b/docs/tutorial/6-viewsets-and-routers.md
index 4b01d3e00..277804e24 100644
--- a/docs/tutorial/6-viewsets-and-routers.md
+++ b/docs/tutorial/6-viewsets-and-routers.md
@@ -119,7 +119,7 @@ Registering the viewsets with the router is similar to providing a urlpattern.
 
 The `DefaultRouter` class we're using also automatically creates the API root view for us, so we can now delete the `api_root` method from our `views` module.
 
-## Trade-offs between views vs viewsets.
+## Trade-offs between views vs viewsets
 
 Using viewsets can be a really useful abstraction.  It helps ensure that URL conventions will be consistent across your API, minimizes the amount of code you need to write, and allows you to concentrate on the interactions and representations your API provides rather than the specifics of the URL conf.
 

From 773a92eab3ac4b635511483ef906b3b8de9dedc9 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Fri, 10 May 2013 21:57:05 +0100
Subject: [PATCH 017/197] Move models into test modules, out of models module

---
 rest_framework/tests/models.py     |  7 -------
 rest_framework/tests/pagination.py | 10 ++++++++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/rest_framework/tests/models.py b/rest_framework/tests/models.py
index f2117538c..40e41a644 100644
--- a/rest_framework/tests/models.py
+++ b/rest_framework/tests/models.py
@@ -58,13 +58,6 @@ class ReadOnlyManyToManyModel(RESTFrameworkModel):
     rel = models.ManyToManyField(Anchor)
 
 
-# Model to test filtering.
-class FilterableItem(RESTFrameworkModel):
-    text = models.CharField(max_length=100)
-    decimal = models.DecimalField(max_digits=4, decimal_places=2)
-    date = models.DateField()
-
-
 # Model for regression test for #285
 
 class Comment(RESTFrameworkModel):
diff --git a/rest_framework/tests/pagination.py b/rest_framework/tests/pagination.py
index 6b8ef02f0..894d53d6a 100644
--- a/rest_framework/tests/pagination.py
+++ b/rest_framework/tests/pagination.py
@@ -1,18 +1,24 @@
 from __future__ import unicode_literals
 import datetime
 from decimal import Decimal
-import django
+from django.db import models
 from django.core.paginator import Paginator
 from django.test import TestCase
 from django.test.client import RequestFactory
 from django.utils import unittest
 from rest_framework import generics, status, pagination, filters, serializers
 from rest_framework.compat import django_filters
-from rest_framework.tests.models import BasicModel, FilterableItem
+from rest_framework.tests.models import BasicModel
 
 factory = RequestFactory()
 
 
+class FilterableItem(models.Model):
+    text = models.CharField(max_length=100)
+    decimal = models.DecimalField(max_digits=4, decimal_places=2)
+    date = models.DateField()
+
+
 class RootView(generics.ListCreateAPIView):
     """
     Example description for OPTIONS.

From 8ce36d2bf1a899683208dc7de425a238ab27d0b3 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Fri, 10 May 2013 21:57:20 +0100
Subject: [PATCH 018/197] SearchFilter and tests

---
 rest_framework/filters.py         |  9 +++-
 rest_framework/tests/filterset.py | 81 ++++++++++++++++++++++++++++++-
 2 files changed, 87 insertions(+), 3 deletions(-)

diff --git a/rest_framework/filters.py b/rest_framework/filters.py
index f2163f6fb..54cbbde31 100644
--- a/rest_framework/filters.py
+++ b/rest_framework/filters.py
@@ -74,6 +74,8 @@ class DjangoFilterBackend(BaseFilterBackend):
 
 
 class SearchFilter(BaseFilterBackend):
+    search_param = 'search'
+
     def construct_search(self, field_name):
         if field_name.startswith('^'):
             return "%s__istartswith" % field_name[1:]
@@ -90,10 +92,13 @@ class SearchFilter(BaseFilterBackend):
         if not search_fields:
             return None
 
+        search_terms = request.QUERY_PARAMS.get(self.search_param)
         orm_lookups = [self.construct_search(str(search_field))
-                       for search_field in self.search_fields]
-        for bit in self.query.split():
+                       for search_field in search_fields]
+
+        for bit in search_terms.split():
             or_queries = [models.Q(**{orm_lookup: bit})
                           for orm_lookup in orm_lookups]
             queryset = queryset.filter(reduce(operator.or_, or_queries))
+
         return queryset
diff --git a/rest_framework/tests/filterset.py b/rest_framework/tests/filterset.py
index 023bd0166..7865fedd7 100644
--- a/rest_framework/tests/filterset.py
+++ b/rest_framework/tests/filterset.py
@@ -1,17 +1,24 @@
 from __future__ import unicode_literals
 import datetime
 from decimal import Decimal
+from django.db import models
 from django.core.urlresolvers import reverse
 from django.test import TestCase
 from django.test.client import RequestFactory
 from django.utils import unittest
 from rest_framework import generics, serializers, status, filters
 from rest_framework.compat import django_filters, patterns, url
-from rest_framework.tests.models import FilterableItem, BasicModel
+from rest_framework.tests.models import BasicModel
 
 factory = RequestFactory()
 
 
+class FilterableItem(models.Model):
+    text = models.CharField(max_length=100)
+    decimal = models.DecimalField(max_digits=4, decimal_places=2)
+    date = models.DateField()
+
+
 if django_filters:
     # Basic filter on a list view.
     class FilterFieldsRootView(generics.ListCreateAPIView):
@@ -256,3 +263,75 @@ class IntegrationTestDetailFiltering(CommonFilteringTestCase):
         response = self.client.get('{url}?decimal={decimal}&date={date}'.format(url=self._get_url(valid_item), decimal=search_decimal, date=search_date))
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.data, valid_item_data)
+
+
+class SearchFilterModel(models.Model):
+    title = models.CharField(max_length=20)
+    text = models.CharField(max_length=100)
+
+
+class SearchFilterTests(TestCase):
+    def setUp(self):
+        # Sequence of title/text is:
+        #
+        # z   abc
+        # zz  bcd
+        # zzz cde
+        # ...
+        for idx in range(10):
+            title = 'z' * (idx + 1)
+            text = (
+                chr(idx + ord('a')) +
+                chr(idx + ord('b')) +
+                chr(idx + ord('c'))
+            )
+            SearchFilterModel(title=title, text=text).save()
+
+    def test_search(self):
+        class SearchListView(generics.ListAPIView):
+            model = SearchFilterModel
+            filter_backends = (filters.SearchFilter,)
+            search_fields = ('title', 'text')
+
+        view = SearchListView.as_view()
+        request = factory.get('?search=b')
+        response = view(request)
+        self.assertEqual(
+            response.data,
+            [
+                {u'id': 1, 'title': u'z', 'text': u'abc'},
+                {u'id': 2, 'title': u'zz', 'text': u'bcd'}
+            ]
+        )
+
+    def test_exact_search(self):
+        class SearchListView(generics.ListAPIView):
+            model = SearchFilterModel
+            filter_backends = (filters.SearchFilter,)
+            search_fields = ('=title', 'text')
+
+        view = SearchListView.as_view()
+        request = factory.get('?search=zzz')
+        response = view(request)
+        self.assertEqual(
+            response.data,
+            [
+                {u'id': 3, 'title': u'zzz', 'text': u'cde'}
+            ]
+        )
+
+    def test_startswith_search(self):
+        class SearchListView(generics.ListAPIView):
+            model = SearchFilterModel
+            filter_backends = (filters.SearchFilter,)
+            search_fields = ('title', '^text')
+
+        view = SearchListView.as_view()
+        request = factory.get('?search=b')
+        response = view(request)
+        self.assertEqual(
+            response.data,
+            [
+                {u'id': 2, 'title': u'zz', 'text': u'bcd'}
+            ]
+        )

From 293dc3e6d8071fb464a63593831309468e457d6b Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Fri, 10 May 2013 22:33:11 +0100
Subject: [PATCH 019/197] Added SearchFilter

---
 docs/api-guide/filtering.md | 94 +++++++++++++++++++++++++++----------
 rest_framework/filters.py   |  7 +--
 2 files changed, 72 insertions(+), 29 deletions(-)

diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md
index 50bc6f054..7d8c39e29 100644
--- a/docs/api-guide/filtering.md
+++ b/docs/api-guide/filtering.md
@@ -77,20 +77,61 @@ We can override `.get_queryset()` to deal with URLs such as `http://example.com/
 
 # Generic Filtering
 
-As well as being able to override the default queryset, REST framework also includes support for generic filtering backends that allow you to easily construct complex filters that can be specified by the client using query parameters.
+As well as being able to override the default queryset, REST framework also includes support for generic filtering backends that allow you to easily construct complex searches and filters.
+
+## Setting filter backends
+
+The default filter backends may be set globally, using the `DEFAULT_FILTER_BACKENDS` setting.  For example.
+
+    REST_FRAMEWORK = {
+        'DEFAULT_FILTER_BACKENDS': ('rest_framework.filters.DjangoFilterBackend',)
+    }
+
+You can also set the authentication policy on a per-view, or per-viewset basis,
+using the `GenericAPIView` class based views.
+
+    class UserListView(generics.ListAPIView):
+        queryset = User.objects.all()
+        serializer = UserSerializer
+        filter_backends = (filters.DjangoFilterBackend,)
+
+## Filtering and object lookups
+
+Note that if a filter backend is configured for a view, then as well as being used to filter list views, it will also be used to filter the querysets used for returning a single object.
+
+For instance, given the previous example, and a product with an id of `4675`, the following URL would either return the corresponding object, or return a 404 response, depending on if the filtering conditions were met by the given product instance:
+
+    http://example.com/api/products/4675/?category=clothing&max_price=10.00
+
+## Overriding the initial queryset
+ 
+Note that you can use both an overridden `.get_queryset()` and generic filtering together, and everything will work as expected.  For example, if `Product` had a many-to-many relationship with `User`, named `purchase`, you might want to write a view like this:
+
+    class PurchasedProductsList(generics.ListAPIView):
+        """
+        Return a list of all the products that the authenticated
+        user has ever purchased, with optional filtering.
+        """
+        model = Product
+        serializer_class = ProductSerializer
+        filter_class = ProductFilter
+        
+        def get_queryset(self):
+            user = self.request.user
+            return user.purchase_set.all()
+
+---
+
+# API Guide
 
 ## DjangoFilterBackend
 
+The `DjangoFilterBackend` class supports highly customizable field filtering, using the [django-filter package][django-filter].  
+
 To use REST framework's `DjangoFilterBackend`, first install `django-filter`.
 
     pip install django-filter
 
-You must also set the filter backend to `DjangoFilterBackend` in your settings:
-
-    REST_FRAMEWORK = {
-        'DEFAULT_FILTER_BACKENDS': ['rest_framework.filters.DjangoFilterBackend']
-    }
-
 
 #### Specifying filter fields
 
@@ -137,30 +178,30 @@ For more details on using filter sets see the [django-filter documentation][djan
 
 ---
 
-## Filtering and object lookups
+## SearchFilter
 
-Note that if a filter backend is configured for a view, then as well as being used to filter list views, it will also be used to filter the querysets used for returning a single object.
+The `SearchFilter` class supports simple single query parameter based searching, and is based on the [Django admin's search functionality][search-django-admin].
 
-For instance, given the previous example, and a product with an id of `4675`, the following URL would either return the corresponding object, or return a 404 response, depending on if the filtering conditions were met by the given product instance:
+The `SearchFilter` class will only be applied if the view has a `search_fields` attribute set.  The `search_fields` attribute should be a list of names of text fields on the model.
 
-    http://example.com/api/products/4675/?category=clothing&max_price=10.00
+    class UserListView(generics.ListAPIView):
+        queryset = User.objects.all()
+        serializer = UserSerializer
+        filter_backends = (filters.SearchFilter,)
+        search_fields = ('username', 'email')
 
-## Overriding the initial queryset
- 
-Note that you can use both an overridden `.get_queryset()` and generic filtering together, and everything will work as expected.  For example, if `Product` had a many-to-many relationship with `User`, named `purchase`, you might want to write a view like this:
+This will allow the client to filter the itemss in the list by making queries such as:
+
+    http://example.com/api/users?search=russell
+
+You can also perform a related lookup on a ForeignKey or ManyToManyField with the lookup API double-underscore notation:
+
+    search_fields = ('username', 'email', 'profile__profession')
+
+By default, searches will use case-insensitive partial matches.  If the search parameter contains multiple whitespace seperated words, then objects will be returned in the list only if all the provided words are matched.
+
+For more details, see the [Django documentation][search-django-admin].
 
-    class PurchasedProductsList(generics.ListAPIView):
-        """
-        Return a list of all the products that the authenticated
-        user has ever purchased, with optional filtering.
-        """
-        model = Product
-        serializer_class = ProductSerializer
-        filter_class = ProductFilter
-        
-        def get_queryset(self):
-            user = self.request.user
-            return user.purchase_set.all()
 ---
 
 # Custom generic filtering
@@ -181,3 +222,4 @@ For example:
 [django-filter]: https://github.com/alex/django-filter
 [django-filter-docs]: https://django-filter.readthedocs.org/en/latest/index.html
 [nullbooleanselect]: https://github.com/django/django/blob/master/django/forms/widgets.py
+[search-django-admin]: https://docs.djangoproject.com/en/dev/ref/contrib/admin/#django.contrib.admin.ModelAdmin.search_fields
diff --git a/rest_framework/filters.py b/rest_framework/filters.py
index 54cbbde31..3edef30d3 100644
--- a/rest_framework/filters.py
+++ b/rest_framework/filters.py
@@ -74,7 +74,8 @@ class DjangoFilterBackend(BaseFilterBackend):
 
 
 class SearchFilter(BaseFilterBackend):
-    search_param = 'search'
+    search_param = 'search'  # The URL query parameter used for the search.
+    delimiter = None  # For example, set to ',' for comma delimited searchs.
 
     def construct_search(self, field_name):
         if field_name.startswith('^'):
@@ -96,8 +97,8 @@ class SearchFilter(BaseFilterBackend):
         orm_lookups = [self.construct_search(str(search_field))
                        for search_field in search_fields]
 
-        for bit in search_terms.split():
-            or_queries = [models.Q(**{orm_lookup: bit})
+        for search_term in search_terms.split(self.delimiter):
+            or_queries = [models.Q(**{orm_lookup: search_term})
                           for orm_lookup in orm_lookups]
             queryset = queryset.filter(reduce(operator.or_, or_queries))
 

From 260a8125c58d76c947f864e738b0a8c35da02d9d Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Fri, 10 May 2013 22:56:23 +0100
Subject: [PATCH 020/197] Improve custom filtering example

---
 docs/api-guide/filtering.md | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md
index 7d8c39e29..b5dfc68ec 100644
--- a/docs/api-guide/filtering.md
+++ b/docs/api-guide/filtering.md
@@ -180,9 +180,9 @@ For more details on using filter sets see the [django-filter documentation][djan
 
 ## SearchFilter
 
-The `SearchFilter` class supports simple single query parameter based searching, and is based on the [Django admin's search functionality][search-django-admin].
+The `SearchFilterBackend` class supports simple single query parameter based searching, and is based on the [Django admin's search functionality][search-django-admin].
 
-The `SearchFilter` class will only be applied if the view has a `search_fields` attribute set.  The `search_fields` attribute should be a list of names of text fields on the model.
+The `SearchFilterBackend` class will only be applied if the view has a `search_fields` attribute set.  The `search_fields` attribute should be a list of names of text fields on the model.
 
     class UserListView(generics.ListAPIView):
         queryset = User.objects.all()
@@ -210,13 +210,20 @@ You can also provide your own generic filtering backend, or write an installable
 
 To do so override `BaseFilterBackend`, and override the `.filter_queryset(self, request, queryset, view)` method.  The method should return a new, filtered queryset.
 
-To install the filter backend, set the `'DEFAULT_FILTER_BACKENDS'` key in your `'REST_FRAMEWORK'` setting, using the dotted import path of the filter backend class.
+As well as allowing clients to perform searches and filtering, generic filter backends can be useful for restricting which objects should be visible to any given request or user.
 
-For example:
+## Example
 
-    REST_FRAMEWORK = {
-        'DEFAULT_FILTER_BACKENDS': ['custom_filters.CustomFilterBackend']
-    }
+For example, you might need to restrict users to only being able to see objects they created.
+
+    class IsOwnerFilterBackend(filters.BaseFilterBackend):
+        """
+        Filter that only allows users to see their own objects.
+        """
+        def filter_queryset(self, request, queryset, view):
+            return queryset.filter(owner=request.user)
+
+We could do the same thing by overriding `get_queryset` on the views, but using a filter backend allows you to more easily add this restriction to multiple views, or to apply it across the entire API.
 
 [cite]: https://docs.djangoproject.com/en/dev/topics/db/queries/#retrieving-specific-objects-with-filters
 [django-filter]: https://github.com/alex/django-filter

From dd51d369c8228f3add37cc639702097b0df9cd90 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Fri, 10 May 2013 23:02:24 +0100
Subject: [PATCH 021/197] Unicode string fix

---
 rest_framework/tests/filterset.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rest_framework/tests/filterset.py b/rest_framework/tests/filterset.py
index 7865fedd7..e5414232f 100644
--- a/rest_framework/tests/filterset.py
+++ b/rest_framework/tests/filterset.py
@@ -299,8 +299,8 @@ class SearchFilterTests(TestCase):
         self.assertEqual(
             response.data,
             [
-                {u'id': 1, 'title': u'z', 'text': u'abc'},
-                {u'id': 2, 'title': u'zz', 'text': u'bcd'}
+                {'id': 1, 'title': 'z', 'text': 'abc'},
+                {'id': 2, 'title': 'zz', 'text': 'bcd'}
             ]
         )
 
@@ -316,7 +316,7 @@ class SearchFilterTests(TestCase):
         self.assertEqual(
             response.data,
             [
-                {u'id': 3, 'title': u'zzz', 'text': u'cde'}
+                {'id': 3, 'title': 'zzz', 'text': 'cde'}
             ]
         )
 
@@ -332,6 +332,6 @@ class SearchFilterTests(TestCase):
         self.assertEqual(
             response.data,
             [
-                {u'id': 2, 'title': u'zz', 'text': u'bcd'}
+                {'id': 2, 'title': 'zz', 'text': 'bcd'}
             ]
         )

From fd4a66cfc7888775d20b18665d63156cf3dae13a Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Fri, 10 May 2013 23:06:42 +0100
Subject: [PATCH 022/197] Fix py3k compat with functools.reduce

---
 rest_framework/filters.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rest_framework/filters.py b/rest_framework/filters.py
index 3edef30d3..57f0f7c83 100644
--- a/rest_framework/filters.py
+++ b/rest_framework/filters.py
@@ -3,9 +3,9 @@ Provides generic filtering backends that can be used to filter the results
 returned by list views.
 """
 from __future__ import unicode_literals
-
 from django.db import models
 from rest_framework.compat import django_filters
+from functools import reduce
 import operator
 
 FilterSet = django_filters and django_filters.FilterSet or None

From 9d2580dccfe23e113221c7e150bddebb95d98214 Mon Sep 17 00:00:00 2001
From: Marlon Bailey <marlon.bailey@smartbear.com>
Date: Sat, 11 May 2013 22:26:34 -0400
Subject: [PATCH 023/197] added support for multiple @action and @link
 decorators on a viewset, along with a router testcase illustrating the
 failure against the master code base

---
 rest_framework/routers.py       |  6 ++---
 rest_framework/tests/routers.py | 46 +++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 rest_framework/tests/routers.py

diff --git a/rest_framework/routers.py b/rest_framework/routers.py
index 0707635a4..ebdf2b2ab 100644
--- a/rest_framework/routers.py
+++ b/rest_framework/routers.py
@@ -127,18 +127,18 @@ class SimpleRouter(BaseRouter):
         """
 
         # Determine any `@action` or `@link` decorated methods on the viewset
-        dynamic_routes = {}
+        dynamic_routes = []
         for methodname in dir(viewset):
             attr = getattr(viewset, methodname)
             httpmethod = getattr(attr, 'bind_to_method', None)
             if httpmethod:
-                dynamic_routes[httpmethod] = methodname
+                dynamic_routes.append((httpmethod, methodname))
 
         ret = []
         for route in self.routes:
             if route.mapping == {'{httpmethod}': '{methodname}'}:
                 # Dynamic routes (@link or @action decorator)
-                for httpmethod, methodname in dynamic_routes.items():
+                for httpmethod, methodname in dynamic_routes:
                     initkwargs = route.initkwargs.copy()
                     initkwargs.update(getattr(viewset, methodname).kwargs)
                     ret.append(Route(
diff --git a/rest_framework/tests/routers.py b/rest_framework/tests/routers.py
new file mode 100644
index 000000000..138d13d79
--- /dev/null
+++ b/rest_framework/tests/routers.py
@@ -0,0 +1,46 @@
+from __future__ import unicode_literals
+from django.test import TestCase
+from django.test.client import RequestFactory
+from rest_framework import status
+from rest_framework.response import Response
+from rest_framework import viewsets
+from rest_framework.decorators import link, action
+from rest_framework.routers import SimpleRouter
+import copy
+
+factory = RequestFactory()
+
+
+class BasicViewSet(viewsets.ViewSet):
+    def list(self, request, *args, **kwargs):
+        return Response({'method': 'list'})
+
+    @action()
+    def action1(self, request, *args, **kwargs):
+        return Response({'method': 'action1'})
+
+    @action()
+    def action2(self, request, *args, **kwargs):
+        return Response({'method': 'action2'})
+
+    @link()
+    def link1(self, request, *args, **kwargs):
+        return Response({'method': 'link1'})
+
+    @link()
+    def link2(self, request, *args, **kwargs):
+        return Response({'method': 'link2'})
+
+
+class TestSimpleRouter(TestCase):
+    def setUp(self):
+        self.router = SimpleRouter()
+
+    def test_link_and_action_decorator(self):
+        routes = self.router.get_routes(BasicViewSet)
+        # Should be 2 by default, and then four from the @action and @link combined
+        #self.assertEqual(len(routes), 6)
+        #
+        decorator_routes = routes[2:]
+        for i, method in enumerate(['action1', 'action2', 'link1', 'link2']):
+            self.assertEqual(decorator_routes[i].mapping.values()[0], method)

From 5e2d8052d4bf87c81cc9807c96c933ca975cc483 Mon Sep 17 00:00:00 2001
From: Marlon Bailey <marlon.bailey@smartbear.com>
Date: Sun, 12 May 2013 09:22:14 -0400
Subject: [PATCH 024/197] fix test case to work with Python 3 and make it more
 explicit

---
 rest_framework/tests/routers.py | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/rest_framework/tests/routers.py b/rest_framework/tests/routers.py
index 138d13d79..4e4765cb2 100644
--- a/rest_framework/tests/routers.py
+++ b/rest_framework/tests/routers.py
@@ -38,9 +38,18 @@ class TestSimpleRouter(TestCase):
 
     def test_link_and_action_decorator(self):
         routes = self.router.get_routes(BasicViewSet)
-        # Should be 2 by default, and then four from the @action and @link combined
-        #self.assertEqual(len(routes), 6)
-        #
         decorator_routes = routes[2:]
-        for i, method in enumerate(['action1', 'action2', 'link1', 'link2']):
-            self.assertEqual(decorator_routes[i].mapping.values()[0], method)
+        # Make sure all these endpoints exist and none have been clobbered
+        for i, endpoint in enumerate(['action1', 'action2', 'link1', 'link2']):
+            route = decorator_routes[i]
+            # check url listing
+            self.assertEqual(route.url,
+                             '^{{prefix}}/{{lookup}}/{0}/$'.format(endpoint))
+            # check method to function mapping
+            if endpoint.startswith('action'):
+                method_map = 'post'
+            else:
+                method_map = 'get'
+            self.assertEqual(route.mapping[method_map], endpoint)
+
+

From 5074bbe4b21a0fc116e4288743fb78314a76a33b Mon Sep 17 00:00:00 2001
From: James Summerfield <james.summerfield@gmail.com>
Date: Mon, 13 May 2013 07:51:23 +0200
Subject: [PATCH 025/197] Remove trailing unmatched </div> in login_base.html
 template. Reformat indentation and label all closing tags for consistency.

---
 .../templates/rest_framework/login_base.html  | 68 +++++++++----------
 1 file changed, 32 insertions(+), 36 deletions(-)

diff --git a/rest_framework/templates/rest_framework/login_base.html b/rest_framework/templates/rest_framework/login_base.html
index 380d58205..a3e73b6b6 100644
--- a/rest_framework/templates/rest_framework/login_base.html
+++ b/rest_framework/templates/rest_framework/login_base.html
@@ -12,44 +12,40 @@
 
     <body class="container">
 
-<div class="container-fluid" style="margin-top: 30px">
-        <div class="row-fluid">
-         
-        <div class="well" style="width: 320px; margin-left: auto; margin-right: auto">
+        <div class="container-fluid" style="margin-top: 30px">
             <div class="row-fluid">
-                <div>
-                    {% block branding %}<h3 style="margin: 0 0 20px;">Django REST framework</h3>{% endblock %}
-                </div>
-            </div><!-- /row fluid -->
-
-            <div class="row-fluid">
-                <div>
-                    <form action="{% url 'rest_framework:login' %}" class=" form-inline" method="post">
-                        {% csrf_token %}
-                        <div id="div_id_username" class="clearfix control-group">
-                            <div class="controls">
-                                <Label class="span4">Username:</label>
-                                <input style="height: 25px" type="text" name="username" maxlength="100" autocapitalize="off" autocorrect="off" class="textinput textInput" id="id_username">
-                            </div>
+                <div class="well" style="width: 320px; margin-left: auto; margin-right: auto">
+                    <div class="row-fluid">
+                        <div>
+                            {% block branding %}<h3 style="margin: 0 0 20px;">Django REST framework</h3>{% endblock %}
                         </div>
-                        <div id="div_id_password" class="clearfix control-group">
-                            <div class="controls">
-                                <Label class="span4">Password:</label>
-                                <input style="height: 25px" type="password" name="password" maxlength="100" autocapitalize="off" autocorrect="off" class="textinput textInput" id="id_password">
-                            </div>
+                    </div><!-- /row fluid -->
+        
+                    <div class="row-fluid">
+                        <div>
+                            <form action="{% url 'rest_framework:login' %}" class=" form-inline" method="post">
+                                {% csrf_token %}
+                                <div id="div_id_username" class="clearfix control-group">
+                                    <div class="controls">
+                                        <Label class="span4">Username:</label>
+                                        <input style="height: 25px" type="text" name="username" maxlength="100" autocapitalize="off" autocorrect="off" class="textinput textInput" id="id_username">
+                                    </div>
+                                </div>
+                                <div id="div_id_password" class="clearfix control-group">
+                                    <div class="controls">
+                                        <Label class="span4">Password:</label>
+                                        <input style="height: 25px" type="password" name="password" maxlength="100" autocapitalize="off" autocorrect="off" class="textinput textInput" id="id_password">
+                                    </div>
+                                </div>
+                                <input type="hidden" name="next" value="{{ next }}" />
+                                <div class="form-actions-no-box">
+                                    <input type="submit" name="submit" value="Log in" class="btn btn-primary" id="submit-id-submit">
+                                </div>
+                            </form>
                         </div>
-                        <input type="hidden" name="next" value="{{ next }}" />
-                        <div class="form-actions-no-box">
-                            <input type="submit" name="submit" value="Log in" class="btn btn-primary" id="submit-id-submit">
-                        </div>
-                    </form>
-                </div>
-            </div><!-- /row fluid -->
-        </div><!--/span-->
-
-        </div><!-- /.row-fluid -->
-    </div>
-
-        </div>
+                    </div><!-- /.row-fluid -->
+                </div><!--/.well-->
+            </div><!-- /.row-fluid -->
+        </div><!-- /.container-fluid -->
     </body>
 </html>

From 1154d873e956e89b1b994c3ac803d90cbfcedf59 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 13 May 2013 13:35:16 +0200
Subject: [PATCH 026/197] Added django-viewsets to credits.  Refs #738.

---
 docs/topics/credits.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index 9871c64e5..4eb78d300 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -134,7 +134,7 @@ Continuous integration testing is managed with [Travis CI][travis-ci].
 
 The [live sandbox][sandbox] is hosted on [Heroku].
 
-Various inspiration taken from the [Rails], [Piston], [Tastypie] and [Dagny] projects.
+Various inspiration taken from the [Rails], [Piston], [Tastypie], [Dagny] and [django-viewsets] projects.
 
 Development of REST framework 2.0 was sponsored by [DabApps].
 
@@ -153,6 +153,7 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [piston]: https://bitbucket.org/jespern/django-piston
 [tastypie]: https://github.com/toastdriven/django-tastypie
 [dagny]: https://github.com/zacharyvoase/dagny
+[django-viewsets]: https://github.com/BertrandBordage/django-viewsets
 [dabapps]: http://lab.dabapps.com
 [sandbox]: http://restframework.herokuapp.com/
 [heroku]: http://www.heroku.com/

From 24c9c455feaa47487196a2c9343746d7d5bdd962 Mon Sep 17 00:00:00 2001
From: Brian Zambrano <brianz@gmail.com>
Date: Mon, 13 May 2013 10:51:51 -0700
Subject: [PATCH 027/197] Allow for missing non-required nested objects.

Serializer fields which are themselves serializers should not be required.
Specifically, if a nested object is set to "required=False", it should be
possible to serialize the main object and have the sub-object set to None/null.
---
 rest_framework/fields.py           |  2 +-
 rest_framework/tests/serializer.py | 47 ++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index c83ee5ecf..1f38b7959 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -50,7 +50,7 @@ def get_component(obj, attr_name):
     return that attribute on the object.
     """
     if isinstance(obj, dict):
-        val = obj[attr_name]
+        val = obj.get(attr_name)
     else:
         val = getattr(obj, attr_name)
 
diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 84e1ee4e0..6e7323275 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -43,6 +43,17 @@ class CommentSerializer(serializers.Serializer):
         return instance
 
 
+class NamesSerializer(serializers.Serializer):
+    first = serializers.CharField()
+    last = serializers.CharField(required=False, default='')
+    initials = serializers.CharField(required=False, default='')
+
+
+class PersonIdentifierSerializer(serializers.Serializer):
+    ssn = serializers.CharField()
+    names = NamesSerializer(source='names', required=False)
+
+
 class BookSerializer(serializers.ModelSerializer):
     isbn = serializers.RegexField(regex=r'^[0-9]{13}$', error_messages={'invalid': 'isbn has to be exact 13 numbers'})
 
@@ -141,6 +152,42 @@ class BasicTests(TestCase):
         self.assertFalse(serializer.object is expected)
         self.assertEqual(serializer.data['sub_comment'], 'And Merry Christmas!')
 
+    def test_create_nested(self):
+        """Test a serializer with nested data."""
+        names = {'first': 'John', 'last': 'Doe', 'initials': 'jd'}
+        data = {'ssn': '1234567890', 'names': names}
+        serializer = PersonIdentifierSerializer(data=data)
+
+        self.assertEqual(serializer.is_valid(), True)
+        self.assertEqual(serializer.object, data)
+        self.assertFalse(serializer.object is data)
+        self.assertEqual(serializer.data['names'], names)
+
+    def test_create_partial_nested(self):
+        """Test a serializer with nested data which has missing fields."""
+        names = {'first': 'John'}
+        data = {'ssn': '1234567890', 'names': names}
+        serializer = PersonIdentifierSerializer(data=data)
+
+        expected_names = {'first': 'John', 'last': '', 'initials': ''}
+        data['names'] = expected_names
+
+        self.assertEqual(serializer.is_valid(), True)
+        self.assertEqual(serializer.object, data)
+        self.assertFalse(serializer.object is expected_names)
+        self.assertEqual(serializer.data['names'], expected_names)
+
+    def test_null_nested(self):
+        """Test a serializer with a nonexistent nested field"""
+        data = {'ssn': '1234567890'}
+        serializer = PersonIdentifierSerializer(data=data)
+
+        self.assertEqual(serializer.is_valid(), True)
+        self.assertEqual(serializer.object, data)
+        self.assertFalse(serializer.object is data)
+        expected = {'ssn': '1234567890', 'names': None}
+        self.assertEqual(serializer.data, expected)
+
     def test_update(self):
         serializer = CommentSerializer(self.comment, data=self.data)
         expected = self.comment

From f9aeb6838379c301ebd2019a49b806c13749261a Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Tue, 14 May 2013 09:59:29 +0100
Subject: [PATCH 028/197] Updated release notes

---
 docs/api-guide/filtering.md  | 4 ++--
 docs/topics/release-notes.md | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md
index b5dfc68ec..d67980294 100644
--- a/docs/api-guide/filtering.md
+++ b/docs/api-guide/filtering.md
@@ -182,7 +182,7 @@ For more details on using filter sets see the [django-filter documentation][djan
 
 The `SearchFilterBackend` class supports simple single query parameter based searching, and is based on the [Django admin's search functionality][search-django-admin].
 
-The `SearchFilterBackend` class will only be applied if the view has a `search_fields` attribute set.  The `search_fields` attribute should be a list of names of text fields on the model.
+The `SearchFilterBackend` class will only be applied if the view has a `search_fields` attribute set.  The `search_fields` attribute should be a list of names of text type fields on the model, such as `CharField` or `TextField`.
 
     class UserListView(generics.ListAPIView):
         queryset = User.objects.all()
@@ -223,7 +223,7 @@ For example, you might need to restrict users to only being able to see objects
         def filter_queryset(self, request, queryset, view):
             return queryset.filter(owner=request.user)
 
-We could do the same thing by overriding `get_queryset` on the views, but using a filter backend allows you to more easily add this restriction to multiple views, or to apply it across the entire API.
+We could achieve the same behavior by overriding `get_queryset()` on the views, but using a filter backend allows you to more easily add this restriction to multiple views, or to apply it across the entire API.
 
 [cite]: https://docs.djangoproject.com/en/dev/topics/db/queries/#retrieving-specific-objects-with-filters
 [django-filter]: https://github.com/alex/django-filter
diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 259aafddb..7ec3d79a0 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -40,6 +40,11 @@ You can determine your currently installed version using `pip freeze`:
 
 ## 2.3.x series
 
+### Master
+
+* Added SearchFilter
+* Added GenericViewSet
+
 ### 2.3.2
 
 **Date**: 8th May 2013

From 752c01420f7574cd99e28a17d56df711b675ce71 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Tue, 14 May 2013 10:01:05 +0100
Subject: [PATCH 029/197] Fix Django 1.3 compat with routers

---
 rest_framework/routers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rest_framework/routers.py b/rest_framework/routers.py
index 0707635a4..ed4dc338a 100644
--- a/rest_framework/routers.py
+++ b/rest_framework/routers.py
@@ -16,7 +16,7 @@ For example, you might have a `urls.py` that looks something like this:
 from __future__ import unicode_literals
 
 from collections import namedtuple
-from django.conf.urls import url, patterns
+from rest_framework.compat import patterns, url
 from rest_framework.decorators import api_view
 from rest_framework.response import Response
 from rest_framework.reverse import reverse

From b2bf5f1f886d131957f99308a0da89b24b3352d4 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Tue, 14 May 2013 10:10:44 +0100
Subject: [PATCH 030/197] SearchFilter may be comma and/or whitespace seperated

---
 rest_framework/filters.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/rest_framework/filters.py b/rest_framework/filters.py
index 57f0f7c83..c496ec4b1 100644
--- a/rest_framework/filters.py
+++ b/rest_framework/filters.py
@@ -75,7 +75,14 @@ class DjangoFilterBackend(BaseFilterBackend):
 
 class SearchFilter(BaseFilterBackend):
     search_param = 'search'  # The URL query parameter used for the search.
-    delimiter = None  # For example, set to ',' for comma delimited searchs.
+
+    def get_search_terms(self, request):
+        """
+        Search terms are set by a ?search=... query parameter,
+        and may be comma and/or whitespace delimited.
+        """
+        params = request.QUERY_PARAMS.get(self.search_param)
+        return params.replace(',', ' ').split()
 
     def construct_search(self, field_name):
         if field_name.startswith('^'):
@@ -93,11 +100,10 @@ class SearchFilter(BaseFilterBackend):
         if not search_fields:
             return None
 
-        search_terms = request.QUERY_PARAMS.get(self.search_param)
         orm_lookups = [self.construct_search(str(search_field))
                        for search_field in search_fields]
 
-        for search_term in search_terms.split(self.delimiter):
+        for search_term in self.get_search_terms(request):
             or_queries = [models.Q(**{orm_lookup: search_term})
                           for orm_lookup in orm_lookups]
             queryset = queryset.filter(reduce(operator.or_, or_queries))

From aa0dcd2e4a9df80aa5e0c915a471e97245627a37 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Tue, 14 May 2013 10:16:00 +0100
Subject: [PATCH 031/197] More docs on SearchFilter

---
 docs/api-guide/filtering.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md
index d67980294..94244301c 100644
--- a/docs/api-guide/filtering.md
+++ b/docs/api-guide/filtering.md
@@ -198,7 +198,17 @@ You can also perform a related lookup on a ForeignKey or ManyToManyField with th
 
     search_fields = ('username', 'email', 'profile__profession')
 
-By default, searches will use case-insensitive partial matches.  If the search parameter contains multiple whitespace seperated words, then objects will be returned in the list only if all the provided words are matched.
+By default, searches will use case-insensitive partial matches.  The search parameter may contain multiple search terms, which should be whitespace and/or comma seperated.  If multiple search terms are used then objects will be returned in the list only if all the provided terms are matched.
+
+The search behavior may be restricted by prepending various characters to the `search_fields`.
+
+* '^' Starts-with search.
+* '=' Exact matches.
+* '@' Full-text search.  (Currently only supported Django's MySQL backend.)
+
+For example:
+
+    search_fields = ('=username', '=email')
 
 For more details, see the [Django documentation][search-django-admin].
 

From 08bc97626960f108f01657e4ad12b7fd62e6183d Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Tue, 14 May 2013 10:16:46 +0100
Subject: [PATCH 032/197] Rename filter tests

---
 rest_framework/tests/{filterset.py => filters.py} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename rest_framework/tests/{filterset.py => filters.py} (100%)

diff --git a/rest_framework/tests/filterset.py b/rest_framework/tests/filters.py
similarity index 100%
rename from rest_framework/tests/filterset.py
rename to rest_framework/tests/filters.py

From 6a037f63edf33e7a76f56828cf68bfae4ccb4f80 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Tue, 14 May 2013 11:27:03 +0100
Subject: [PATCH 033/197] Added OrderingFilter

---
 docs/api-guide/filtering.md     |  32 ++++++++-
 rest_framework/filters.py       |  41 ++++++++++-
 rest_framework/tests/filters.py | 116 ++++++++++++++++++++++++++++++++
 3 files changed, 186 insertions(+), 3 deletions(-)

diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md
index 94244301c..7e99832ee 100644
--- a/docs/api-guide/filtering.md
+++ b/docs/api-guide/filtering.md
@@ -190,7 +190,7 @@ The `SearchFilterBackend` class will only be applied if the view has a `search_f
         filter_backends = (filters.SearchFilter,)
         search_fields = ('username', 'email')
 
-This will allow the client to filter the itemss in the list by making queries such as:
+This will allow the client to filter the items in the list by making queries such as:
 
     http://example.com/api/users?search=russell
 
@@ -198,7 +198,7 @@ You can also perform a related lookup on a ForeignKey or ManyToManyField with th
 
     search_fields = ('username', 'email', 'profile__profession')
 
-By default, searches will use case-insensitive partial matches.  The search parameter may contain multiple search terms, which should be whitespace and/or comma seperated.  If multiple search terms are used then objects will be returned in the list only if all the provided terms are matched.
+By default, searches will use case-insensitive partial matches.  The search parameter may contain multiple search terms, which should be whitespace and/or comma separated.  If multiple search terms are used then objects will be returned in the list only if all the provided terms are matched.
 
 The search behavior may be restricted by prepending various characters to the `search_fields`.
 
@@ -214,6 +214,34 @@ For more details, see the [Django documentation][search-django-admin].
 
 ---
 
+## OrderingFilter
+
+The `OrderingFilter` class supports simple query parameter controlled ordering of results.  For example:
+
+    http://example.com/api/users?ordering=username
+
+The client may also specify reverse orderings by prefixing the field name with '-', like so:
+
+    http://example.com/api/users?ordering=-username
+
+Multiple orderings may also be specified:
+
+    http://example.com/api/users?ordering=account,username
+
+If an `ordering` attribute is set on the view, this will be used as the default ordering.
+
+Typicaly you'd instead control this by setting `order_by` on the initial queryset, but using the `ordering` parameter on the view allows you to specify the ordering in a way that it can then be passed automatically as context to a rendered template.  This makes it possible to automatically render column headers differently if they are being used to order the results.
+
+    class UserListView(generics.ListAPIView):
+        queryset = User.objects.all()
+        serializer = UserSerializer
+        filter_backends = (filters.OrderingFilter,)
+        ordering = ('username',) 
+
+The `ordering` attribute may be either a string or a list/tuple of strings.
+
+---
+
 # Custom generic filtering
 
 You can also provide your own generic filtering backend, or write an installable app for other developers to use.
diff --git a/rest_framework/filters.py b/rest_framework/filters.py
index c496ec4b1..308e7da2c 100644
--- a/rest_framework/filters.py
+++ b/rest_framework/filters.py
@@ -4,7 +4,7 @@ returned by list views.
 """
 from __future__ import unicode_literals
 from django.db import models
-from rest_framework.compat import django_filters
+from rest_framework.compat import django_filters, six
 from functools import reduce
 import operator
 
@@ -109,3 +109,42 @@ class SearchFilter(BaseFilterBackend):
             queryset = queryset.filter(reduce(operator.or_, or_queries))
 
         return queryset
+
+
+class OrderingFilter(BaseFilterBackend):
+    ordering_param = 'order'  # The URL query parameter used for the ordering.
+
+    def get_ordering(self, request):
+        """
+        Search terms are set by a ?search=... query parameter,
+        and may be comma and/or whitespace delimited.
+        """
+        params = request.QUERY_PARAMS.get(self.ordering_param)
+        if params:
+            return [param.strip() for param in params.split(',')]
+
+    def get_default_ordering(self, view):
+        ordering = getattr(view, 'ordering', None)
+        if isinstance(ordering, six.string_types):
+            return (ordering,)
+        return ordering
+
+    def remove_invalid_fields(self, queryset, ordering):
+        field_names = [field.name for field in queryset.model._meta.fields]
+        return [term for term in ordering if term.lstrip('-') in field_names]
+
+    def filter_queryset(self, request, queryset, view):
+        ordering = self.get_ordering(request)
+
+        if ordering:
+            # Skip any incorrect parameters
+            ordering = self.remove_invalid_fields(queryset, ordering)
+
+        if not ordering:
+            # Use 'ordering' attribtue by default
+            ordering = self.get_default_ordering(view)
+
+        if ordering:
+            return queryset.order_by(*ordering)
+
+        return queryset
diff --git a/rest_framework/tests/filters.py b/rest_framework/tests/filters.py
index e5414232f..6b604deb1 100644
--- a/rest_framework/tests/filters.py
+++ b/rest_framework/tests/filters.py
@@ -335,3 +335,119 @@ class SearchFilterTests(TestCase):
                 {'id': 2, 'title': 'zz', 'text': 'bcd'}
             ]
         )
+
+
+class OrdringFilterModel(models.Model):
+    title = models.CharField(max_length=20)
+    text = models.CharField(max_length=100)
+
+
+class OrderingFilterTests(TestCase):
+    def setUp(self):
+        # Sequence of title/text is:
+        #
+        # zyx abc
+        # yxw bcd
+        # xwv cde
+        for idx in range(3):
+            title = (
+                chr(ord('z') - idx) +
+                chr(ord('y') - idx) +
+                chr(ord('x') - idx)
+            )
+            text = (
+                chr(idx + ord('a')) +
+                chr(idx + ord('b')) +
+                chr(idx + ord('c'))
+            )
+            OrdringFilterModel(title=title, text=text).save()
+
+    def test_ordering(self):
+        class OrderingListView(generics.ListAPIView):
+            model = OrdringFilterModel
+            filter_backends = (filters.OrderingFilter,)
+            ordering = ('title',)
+
+        view = OrderingListView.as_view()
+        request = factory.get('?order=text')
+        response = view(request)
+        self.assertEqual(
+            response.data,
+            [
+                {'id': 1, 'title': 'zyx', 'text': 'abc'},
+                {'id': 2, 'title': 'yxw', 'text': 'bcd'},
+                {'id': 3, 'title': 'xwv', 'text': 'cde'},
+            ]
+        )
+
+    def test_reverse_ordering(self):
+        class OrderingListView(generics.ListAPIView):
+            model = OrdringFilterModel
+            filter_backends = (filters.OrderingFilter,)
+            ordering = ('title',)
+
+        view = OrderingListView.as_view()
+        request = factory.get('?order=-text')
+        response = view(request)
+        self.assertEqual(
+            response.data,
+            [
+                {'id': 3, 'title': 'xwv', 'text': 'cde'},
+                {'id': 2, 'title': 'yxw', 'text': 'bcd'},
+                {'id': 1, 'title': 'zyx', 'text': 'abc'},
+            ]
+        )
+
+    def test_incorrectfield_ordering(self):
+        class OrderingListView(generics.ListAPIView):
+            model = OrdringFilterModel
+            filter_backends = (filters.OrderingFilter,)
+            ordering = ('title',)
+
+        view = OrderingListView.as_view()
+        request = factory.get('?order=foobar')
+        response = view(request)
+        self.assertEqual(
+            response.data,
+            [
+                {'id': 3, 'title': 'xwv', 'text': 'cde'},
+                {'id': 2, 'title': 'yxw', 'text': 'bcd'},
+                {'id': 1, 'title': 'zyx', 'text': 'abc'},
+            ]
+        )
+
+    def test_default_ordering(self):
+        class OrderingListView(generics.ListAPIView):
+            model = OrdringFilterModel
+            filter_backends = (filters.OrderingFilter,)
+            ordering = ('title',)
+
+        view = OrderingListView.as_view()
+        request = factory.get('')
+        response = view(request)
+        self.assertEqual(
+            response.data,
+            [
+                {'id': 3, 'title': 'xwv', 'text': 'cde'},
+                {'id': 2, 'title': 'yxw', 'text': 'bcd'},
+                {'id': 1, 'title': 'zyx', 'text': 'abc'},
+            ]
+        )
+
+    def test_default_ordering_using_string(self):
+        class OrderingListView(generics.ListAPIView):
+            model = OrdringFilterModel
+            filter_backends = (filters.OrderingFilter,)
+            ordering = 'title'
+
+        view = OrderingListView.as_view()
+        request = factory.get('')
+        response = view(request)
+        self.assertEqual(
+            response.data,
+            [
+                {'id': 3, 'title': 'xwv', 'text': 'cde'},
+                {'id': 2, 'title': 'yxw', 'text': 'bcd'},
+                {'id': 1, 'title': 'zyx', 'text': 'abc'},
+            ]
+        )

From 2cff6e69dbe3828eca56d0ce60ffdfc80fed045c Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Tue, 14 May 2013 11:27:08 +0100
Subject: [PATCH 034/197] Added OrderingFilter

---
 docs/api-guide/filtering.md     | 2 +-
 rest_framework/filters.py       | 2 +-
 rest_framework/tests/filters.py | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md
index 7e99832ee..a710ad7dd 100644
--- a/docs/api-guide/filtering.md
+++ b/docs/api-guide/filtering.md
@@ -216,7 +216,7 @@ For more details, see the [Django documentation][search-django-admin].
 
 ## OrderingFilter
 
-The `OrderingFilter` class supports simple query parameter controlled ordering of results.  For example:
+The `OrderingFilter` class supports simple query parameter controlled ordering of results.  To specify the result order, set a query parameter named `'order'` to the required field name.  For example:
 
     http://example.com/api/users?ordering=username
 
diff --git a/rest_framework/filters.py b/rest_framework/filters.py
index 308e7da2c..6a3e055d4 100644
--- a/rest_framework/filters.py
+++ b/rest_framework/filters.py
@@ -112,7 +112,7 @@ class SearchFilter(BaseFilterBackend):
 
 
 class OrderingFilter(BaseFilterBackend):
-    ordering_param = 'order'  # The URL query parameter used for the ordering.
+    ordering_param = 'ordering'  # The URL query parameter used for the ordering.
 
     def get_ordering(self, request):
         """
diff --git a/rest_framework/tests/filters.py b/rest_framework/tests/filters.py
index 6b604deb1..b20d59805 100644
--- a/rest_framework/tests/filters.py
+++ b/rest_framework/tests/filters.py
@@ -369,7 +369,7 @@ class OrderingFilterTests(TestCase):
             ordering = ('title',)
 
         view = OrderingListView.as_view()
-        request = factory.get('?order=text')
+        request = factory.get('?ordering=text')
         response = view(request)
         self.assertEqual(
             response.data,
@@ -387,7 +387,7 @@ class OrderingFilterTests(TestCase):
             ordering = ('title',)
 
         view = OrderingListView.as_view()
-        request = factory.get('?order=-text')
+        request = factory.get('?ordering=-text')
         response = view(request)
         self.assertEqual(
             response.data,
@@ -405,7 +405,7 @@ class OrderingFilterTests(TestCase):
             ordering = ('title',)
 
         view = OrderingListView.as_view()
-        request = factory.get('?order=foobar')
+        request = factory.get('?ordering=foobar')
         response = view(request)
         self.assertEqual(
             response.data,

From a303d0f38c4758fc3aad412529922203e5785e29 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Tue, 14 May 2013 11:37:59 +0100
Subject: [PATCH 035/197] Fix filter test renaming

---
 rest_framework/tests/filters.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rest_framework/tests/filters.py b/rest_framework/tests/filters.py
index b20d59805..18972c84b 100644
--- a/rest_framework/tests/filters.py
+++ b/rest_framework/tests/filters.py
@@ -222,7 +222,7 @@ class IntegrationTestDetailFiltering(CommonFilteringTestCase):
     """
     Integration tests for filtered detail views.
     """
-    urls = 'rest_framework.tests.filterset'
+    urls = 'rest_framework.tests.filters'
 
     def _get_url(self, item):
         return reverse('detail-view', kwargs=dict(pk=item.pk))

From 727a64f3b91cbb4b86b9a7e1ecb94b964046b155 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Tue, 14 May 2013 11:38:55 +0100
Subject: [PATCH 036/197] Updated release notes

---
 docs/topics/release-notes.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 7ec3d79a0..5777b82db 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -43,7 +43,9 @@ You can determine your currently installed version using `pip freeze`:
 ### Master
 
 * Added SearchFilter
+* Added OrderingFilter
 * Added GenericViewSet
+* Bugfix: Multiple `@action` and `@link` methods now allowed on viewsets. 
 
 ### 2.3.2
 

From 6487fa535b6399920a4a6bc2aba306a8cae8c81c Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Tue, 14 May 2013 11:39:30 +0100
Subject: [PATCH 037/197] Added @avinash240 for bugfix #822

---
 docs/topics/credits.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index 9871c64e5..63132604c 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -121,6 +121,7 @@ The following people have helped make REST framework great.
 * Andrew Hughes - [eyepulp]
 * Daniel Hepper - [dhepper]
 * Hamish Campbell - [hamishcampbell]
+* Marlon Bailey - [avinash240]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -277,3 +278,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [eyepulp]: https://github.com/eyepulp
 [dhepper]: https://github.com/dhepper
 [hamishcampbell]: https://github.com/hamishcampbell
+[avinash240]: https://github.com/avinash240
\ No newline at end of file

From d62414147fa949af4db698afedae7b5506229a9f Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Tue, 14 May 2013 17:53:37 +0100
Subject: [PATCH 038/197] Fix assert messaging on fields/exclude checking.
 Closes #833

---
 rest_framework/serializers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index d7a4c9ef9..ecff2c524 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -200,7 +200,7 @@ class BaseSerializer(WritableField):
 
         # If 'fields' is specified, use those fields, in that order.
         if self.opts.fields:
-            assert isinstance(self.opts.fields, (list, tuple)), '`include` must be a list or tuple'
+            assert isinstance(self.opts.fields, (list, tuple)), '`fields` must be a list or tuple'
             new = SortedDict()
             for key in self.opts.fields:
                 new[key] = ret[key]
@@ -208,7 +208,7 @@ class BaseSerializer(WritableField):
 
         # Remove anything in 'exclude'
         if self.opts.exclude:
-            assert isinstance(self.opts.fields, (list, tuple)), '`exclude` must be a list or tuple'
+            assert isinstance(self.opts.exclude, (list, tuple)), '`exclude` must be a list or tuple'
             for key in self.opts.exclude:
                 ret.pop(key, None)
 

From 599c0eb0db1efc194049ffcec5c5c5b457f63647 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Tue, 14 May 2013 19:38:41 +0200
Subject: [PATCH 039/197] Added @jsummerfield for cleanups in #824. Thanks!

---
 docs/topics/credits.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index 097dec7f0..482f75d21 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -122,6 +122,7 @@ The following people have helped make REST framework great.
 * Daniel Hepper - [dhepper]
 * Hamish Campbell - [hamishcampbell]
 * Marlon Bailey - [avinash240]
+* James Summerfield - [jsummerfield]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -280,3 +281,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [dhepper]: https://github.com/dhepper
 [hamishcampbell]: https://github.com/hamishcampbell
 [avinash240]: https://github.com/avinash240
+[jsummerfield]: https://github.com/jsummerfield

From e939e1755a94b50c87a82c0f777645e28fe91bf0 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Tue, 14 May 2013 21:40:55 +0100
Subject: [PATCH 040/197] Base automatic filterset model on the queryset model.
  Fixes #834.

---
 rest_framework/filters.py       | 19 ++++++-------------
 rest_framework/tests/filters.py | 21 +++++++++++++++++++++
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/rest_framework/filters.py b/rest_framework/filters.py
index 6a3e055d4..34831dd72 100644
--- a/rest_framework/filters.py
+++ b/rest_framework/filters.py
@@ -32,40 +32,33 @@ class DjangoFilterBackend(BaseFilterBackend):
     def __init__(self):
         assert django_filters, 'Using DjangoFilterBackend, but django-filter is not installed'
 
-    def get_filter_class(self, view):
+    def get_filter_class(self, view, queryset=None):
         """
         Return the django-filters `FilterSet` used to filter the queryset.
         """
         filter_class = getattr(view, 'filter_class', None)
         filter_fields = getattr(view, 'filter_fields', None)
-        model_cls = getattr(view, 'model', None)
-        queryset = getattr(view, 'queryset', None)
-        if model_cls is None and queryset is not None:
-            model_cls = queryset.model
 
         if filter_class:
             filter_model = filter_class.Meta.model
 
-            assert issubclass(filter_model, model_cls), \
-                'FilterSet model %s does not match view model %s' % \
-                (filter_model, model_cls)
+            assert issubclass(filter_model, queryset.model), \
+                'FilterSet model %s does not match queryset model %s' % \
+                (filter_model, queryset.model)
 
             return filter_class
 
         if filter_fields:
-            assert model_cls is not None, 'Cannot use DjangoFilterBackend ' \
-                'on a view which does not have a .model or .queryset attribute.'
-
             class AutoFilterSet(self.default_filter_set):
                 class Meta:
-                    model = model_cls
+                    model = queryset.model
                     fields = filter_fields
             return AutoFilterSet
 
         return None
 
     def filter_queryset(self, request, queryset, view):
-        filter_class = self.get_filter_class(view)
+        filter_class = self.get_filter_class(view, queryset)
 
         if filter_class:
             return filter_class(request.QUERY_PARAMS, queryset=queryset).qs
diff --git a/rest_framework/tests/filters.py b/rest_framework/tests/filters.py
index 18972c84b..a58c66ae2 100644
--- a/rest_framework/tests/filters.py
+++ b/rest_framework/tests/filters.py
@@ -70,9 +70,19 @@ if django_filters:
         filter_fields = ['decimal', 'date']
         filter_backend = filters.DjangoFilterBackend
 
+    class GetQuerysetView(generics.ListCreateAPIView):
+        serializer_class = FilterableItemSerializer
+        filter_class = SeveralFieldsFilter
+        filter_backend = filters.DjangoFilterBackend
+
+        def get_queryset(self):
+            return FilterableItem.objects.all()
+
     urlpatterns = patterns('',
         url(r'^(?P<pk>\d+)/$', FilterClassDetailView.as_view(), name='detail-view'),
         url(r'^$', FilterClassRootView.as_view(), name='root-view'),
+        url(r'^get-queryset/$', GetQuerysetView.as_view(),
+            name='get-queryset-view'),
     )
 
 
@@ -147,6 +157,17 @@ class IntegrationTestFiltering(CommonFilteringTestCase):
         expected_data = [f for f in self.data if f['decimal'] == search_decimal]
         self.assertEqual(response.data, expected_data)
 
+    @unittest.skipUnless(django_filters, 'django-filters not installed')
+    def test_filter_with_get_queryset_only(self):
+        """
+        Regression test for #834.
+        """
+        view = GetQuerysetView.as_view()
+        request = factory.get('/get-queryset/')
+        view(request).render()
+        # Used to raise "issubclass() arg 2 must be a class or tuple of classes"
+        # here when neither `model' nor `queryset' was specified.
+
     @unittest.skipUnless(django_filters, 'django-filters not installed')
     def test_get_filtered_class_root_view(self):
         """

From 092d5223eb7ea1bbf9b6bb967200cb3725e02112 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Wed, 15 May 2013 10:29:51 +0100
Subject: [PATCH 041/197] Fix searchfilter issues

---
 rest_framework/filters.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rest_framework/filters.py b/rest_framework/filters.py
index 34831dd72..c058bc715 100644
--- a/rest_framework/filters.py
+++ b/rest_framework/filters.py
@@ -74,7 +74,7 @@ class SearchFilter(BaseFilterBackend):
         Search terms are set by a ?search=... query parameter,
         and may be comma and/or whitespace delimited.
         """
-        params = request.QUERY_PARAMS.get(self.search_param)
+        params = request.QUERY_PARAMS.get(self.search_param, '')
         return params.replace(',', ' ').split()
 
     def construct_search(self, field_name):
@@ -91,7 +91,7 @@ class SearchFilter(BaseFilterBackend):
         search_fields = getattr(view, 'search_fields', None)
 
         if not search_fields:
-            return None
+            return queryset
 
         orm_lookups = [self.construct_search(str(search_field))
                        for search_field in search_fields]

From af88a5b1751da32018e8408eac01a91a5f63f8ce Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Wed, 15 May 2013 14:25:25 +0100
Subject: [PATCH 042/197] Test and fix which closes #652.

---
 rest_framework/serializers.py      |  8 +++++++-
 rest_framework/tests/serializer.py | 18 ++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index ecff2c524..7707de7a7 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -649,8 +649,14 @@ class ModelSerializer(Serializer):
         # Add the `read_only` flag to any fields that have bee specified
         # in the `read_only_fields` option
         for field_name in self.opts.read_only_fields:
+            assert field_name not in self.base_fields.keys(), \
+                "field '%s' on serializer '%s' specfied in " \
+                "`read_only_fields`, but also added " \
+                "as an explict field.  Remove it from `read_only_fields`." % \
+                (field_name, self.__class__.__name__)
             assert field_name in ret, \
-                "read_only_fields on '%s' included invalid item '%s'" % \
+                "Noexistant field '%s' specified in `read_only_fields` " \
+                "on serializer '%s'." % \
                 (self.__class__.__name__, field_name)
             ret[field_name].read_only = True
 
diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 84e1ee4e0..db3881f9a 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -78,6 +78,18 @@ class PersonSerializer(serializers.ModelSerializer):
         read_only_fields = ('age',)
 
 
+class PersonSerializerInvalidReadOnly(serializers.ModelSerializer):
+    """
+    Testing for #652.
+    """
+    info = serializers.Field(source='info')
+
+    class Meta:
+        model = Person
+        fields = ('name', 'age', 'info')
+        read_only_fields = ('age', 'info')
+
+
 class AlbumsSerializer(serializers.ModelSerializer):
 
     class Meta:
@@ -189,6 +201,12 @@ class BasicTests(TestCase):
         # Assert age is unchanged (35)
         self.assertEqual(instance.age, self.person_data['age'])
 
+    def test_invalid_read_only_fields(self):
+        """
+        Regression test for #652.
+        """
+        self.assertRaises(AssertionError, PersonSerializerInvalidReadOnly, [])
+
 
 class DictStyleSerializer(serializers.Serializer):
     """

From 66aa2f7a16c4bdb858b1e207acbf4839e7d8e7d1 Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy <xordoquy@linovia.com>
Date: Thu, 16 May 2013 09:47:22 +0200
Subject: [PATCH 043/197] Small typo in the ViewSet example.

---
 docs/index.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/index.md b/docs/index.md
index cc960a98a..7c38efd34 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -113,8 +113,8 @@ Here's our project's root `urls.py` module:
     
     # Routers provide an easy way of automatically determining the URL conf
     router = routers.DefaultRouter()
-    router.register(r'users', views.UserViewSet)
-    router.register(r'groups', views.GroupViewSet)
+    router.register(r'users', UserViewSet)
+    router.register(r'groups', GroupViewSet)
 
 
     # Wire up our API using automatic URL routing.

From aff88d15f7a483bca2da120339b1b346aa8b1d4c Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Thu, 16 May 2013 15:08:12 +0100
Subject: [PATCH 044/197] Version 2.3.3

---
 docs/topics/release-notes.md  |  5 ++++-
 rest_framework/__init__.py    |  2 +-
 rest_framework/permissions.py |  5 +++++
 rest_framework/routers.py     | 17 ++++++++++-------
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 5777b82db..e7d627211 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -40,12 +40,15 @@ You can determine your currently installed version using `pip freeze`:
 
 ## 2.3.x series
 
-### Master
+### 2.3.2
+
+**Date**: 16th May 2013
 
 * Added SearchFilter
 * Added OrderingFilter
 * Added GenericViewSet
 * Bugfix: Multiple `@action` and `@link` methods now allowed on viewsets. 
+* Bugfix: Fix API Root view issue with DjangoModelPermissions
 
 ### 2.3.2
 
diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py
index b4961e2f2..0b1e67fbc 100644
--- a/rest_framework/__init__.py
+++ b/rest_framework/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '2.3.2'
+__version__ = '2.3.3'
 
 VERSION = __version__  # synonym
 
diff --git a/rest_framework/permissions.py b/rest_framework/permissions.py
index 751f31a7c..45fcfd665 100644
--- a/rest_framework/permissions.py
+++ b/rest_framework/permissions.py
@@ -126,6 +126,11 @@ class DjangoModelPermissions(BasePermission):
         if model_cls is None and queryset is not None:
             model_cls = queryset.model
 
+        # Workaround to ensure DjangoModelPermissions are not applied
+        # to the root view when using DefaultRouter.
+        if model_cls is None and getattr(view, '_ignore_model_permissions'):
+            return True
+
         assert model_cls, ('Cannot apply DjangoModelPermissions on a view that'
                            ' does not have `.model` or `.queryset` property.')
 
diff --git a/rest_framework/routers.py b/rest_framework/routers.py
index 76714fd04..dba104c3f 100644
--- a/rest_framework/routers.py
+++ b/rest_framework/routers.py
@@ -16,6 +16,7 @@ For example, you might have a `urls.py` that looks something like this:
 from __future__ import unicode_literals
 
 from collections import namedtuple
+from rest_framework import views
 from rest_framework.compat import patterns, url
 from rest_framework.decorators import api_view
 from rest_framework.response import Response
@@ -217,14 +218,16 @@ class DefaultRouter(SimpleRouter):
         for prefix, viewset, basename in self.registry:
             api_root_dict[prefix] = list_name.format(basename=basename)
 
-        @api_view(('GET',))
-        def api_root(request, format=None):
-            ret = {}
-            for key, url_name in api_root_dict.items():
-                ret[key] = reverse(url_name, request=request, format=format)
-            return Response(ret)
+        class APIRoot(views.APIView):
+            _ignore_model_permissions = True
 
-        return api_root
+            def get(self, request, format=None):
+                ret = {}
+                for key, url_name in api_root_dict.items():
+                    ret[key] = reverse(url_name, request=request, format=format)
+                return Response(ret)
+
+        return APIRoot.as_view()
 
     def get_urls(self):
         """

From abe207b869c771187523efd3d189ffc0beba51c3 Mon Sep 17 00:00:00 2001
From: Andy Freeland <andy.freeland@redjack.com>
Date: Thu, 16 May 2013 11:24:11 -0400
Subject: [PATCH 045/197] HyperlinkedIdentityField uses `lookup_field` kwarg.

According to the [Serializers API Guide][1], `HyperlinkedIdentityField`
takes `lookup_field` as a kwarg like the other related fields and the
generic views. However, this was not actually implemented.

[1]: http://django-rest-framework.org/api-guide/serializers.html#hyperlinkedmodelserializer
---
 docs/api-guide/relations.md                   |  6 +--
 rest_framework/relations.py                   | 21 +++++++++-
 .../tests/hyperlinkedserializers.py           | 40 +++++++++++++++++++
 3 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md
index 756e1562a..155c89de3 100644
--- a/docs/api-guide/relations.md
+++ b/docs/api-guide/relations.md
@@ -196,15 +196,13 @@ Would serialize to a representation like this:
         'artist': 'Thom Yorke'
         'track_listing': 'http://www.example.com/api/track_list/12/',
     }
- 
+
 This field is always read-only.
 
 **Arguments**:
 
 * `view_name` - The view name that should be used as the target of the relationship.  **required**.
-* `slug_field` - The field on the target that should be used for the lookup. Default is `'slug'`.
-* `pk_url_kwarg` - The named url parameter for the pk field lookup. Default is `pk`.
-* `slug_url_kwarg` - The named url parameter for the slug field lookup. Default is to use the same value as given for `slug_field`.
+* `lookup_field` - The field on the target that should be used for the lookup.  Should correspond to a URL keyword argument on the referenced view. Default is `'pk'`.
 * `format` - If using format suffixes, hyperlinked fields will use the same format suffix for the target unless overridden by using the `format` argument.
 
 ---
diff --git a/rest_framework/relations.py b/rest_framework/relations.py
index fc5054b2b..c4b790d47 100644
--- a/rest_framework/relations.py
+++ b/rest_framework/relations.py
@@ -465,10 +465,13 @@ class HyperlinkedIdentityField(Field):
     """
     Represents the instance, or a property on the instance, using hyperlinking.
     """
+    lookup_field = 'pk'
+    read_only = True
+
+    # These are all pending deprecation
     pk_url_kwarg = 'pk'
     slug_field = 'slug'
     slug_url_kwarg = None  # Defaults to same as `slug_field` unless overridden
-    read_only = True
 
     def __init__(self, *args, **kwargs):
         # TODO: Make view_name mandatory, and have the
@@ -477,6 +480,19 @@ class HyperlinkedIdentityField(Field):
         # Optionally the format of the target hyperlink may be specified
         self.format = kwargs.pop('format', None)
 
+        self.lookup_field = kwargs.pop('lookup_field', self.lookup_field)
+
+        # These are pending deprecation
+        if 'pk_url_kwarg' in kwargs:
+            msg = 'pk_url_kwarg is pending deprecation. Use lookup_field instead.'
+            warnings.warn(msg, PendingDeprecationWarning, stacklevel=2)
+        if 'slug_url_kwarg' in kwargs:
+            msg = 'slug_url_kwarg is pending deprecation. Use lookup_field instead.'
+            warnings.warn(msg, PendingDeprecationWarning, stacklevel=2)
+        if 'slug_field' in kwargs:
+            msg = 'slug_field is pending deprecation. Use lookup_field instead.'
+            warnings.warn(msg, PendingDeprecationWarning, stacklevel=2)
+
         self.slug_field = kwargs.pop('slug_field', self.slug_field)
         default_slug_kwarg = self.slug_url_kwarg or self.slug_field
         self.pk_url_kwarg = kwargs.pop('pk_url_kwarg', self.pk_url_kwarg)
@@ -488,7 +504,8 @@ class HyperlinkedIdentityField(Field):
         request = self.context.get('request', None)
         format = self.context.get('format', None)
         view_name = self.view_name or self.parent.opts.view_name
-        kwargs = {self.pk_url_kwarg: obj.pk}
+        lookup_field = getattr(obj, self.lookup_field)
+        kwargs = {self.lookup_field: lookup_field}
 
         if request is None:
             warnings.warn("Using `HyperlinkedIdentityField` without including the "
diff --git a/rest_framework/tests/hyperlinkedserializers.py b/rest_framework/tests/hyperlinkedserializers.py
index 9a61f299a..8fc6ba773 100644
--- a/rest_framework/tests/hyperlinkedserializers.py
+++ b/rest_framework/tests/hyperlinkedserializers.py
@@ -27,6 +27,14 @@ class PhotoSerializer(serializers.Serializer):
         return Photo(**attrs)
 
 
+class AlbumSerializer(serializers.ModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='album-detail', lookup_field='title')
+
+    class Meta:
+        model = Album
+        fields = ('title', 'url')
+
+
 class BasicList(generics.ListCreateAPIView):
     model = BasicModel
     model_serializer_class = serializers.HyperlinkedModelSerializer
@@ -73,6 +81,8 @@ class PhotoListCreate(generics.ListCreateAPIView):
 
 class AlbumDetail(generics.RetrieveAPIView):
     model = Album
+    serializer_class = AlbumSerializer
+    lookup_field = 'title'
 
 
 class OptionalRelationDetail(generics.RetrieveUpdateDestroyAPIView):
@@ -180,6 +190,36 @@ class TestManyToManyHyperlinkedView(TestCase):
         self.assertEqual(response.data, self.data[0])
 
 
+class TestHyperlinkedIdentityFieldLookup(TestCase):
+    urls = 'rest_framework.tests.hyperlinkedserializers'
+
+    def setUp(self):
+        """
+        Create 3 Album instances.
+        """
+        titles = ['foo', 'bar', 'baz']
+        for title in titles:
+            album = Album(title=title)
+            album.save()
+        self.detail_view = AlbumDetail.as_view()
+        self.data = {
+            'foo': {'title': 'foo', 'url': 'http://testserver/albums/foo/'},
+            'bar': {'title': 'bar', 'url': 'http://testserver/albums/bar/'},
+            'baz': {'title': 'baz', 'url': 'http://testserver/albums/baz/'}
+        }
+
+    def test_lookup_field(self):
+        """
+        GET requests to AlbumDetail view should return serialized Albums
+        with a url field keyed by `title`.
+        """
+        for album in Album.objects.all():
+            request = factory.get('/albums/{0}/'.format(album.title))
+            response = self.detail_view(request, title=album.title)
+            self.assertEqual(response.status_code, status.HTTP_200_OK)
+            self.assertEqual(response.data, self.data[album.title])
+
+
 class TestCreateWithForeignKeys(TestCase):
     urls = 'rest_framework.tests.hyperlinkedserializers'
 

From bc3dfca5e303b6e8bd7455405d0148238178b846 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Thu, 16 May 2013 19:58:17 +0200
Subject: [PATCH 046/197] Added @rouge8 for bugfix #844.  Thank you!

---
 docs/topics/credits.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index 482f75d21..8151b4d3a 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -123,6 +123,7 @@ The following people have helped make REST framework great.
 * Hamish Campbell - [hamishcampbell]
 * Marlon Bailey - [avinash240]
 * James Summerfield - [jsummerfield]
+* Andy Freeland - [rouge8]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -282,3 +283,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [hamishcampbell]: https://github.com/hamishcampbell
 [avinash240]: https://github.com/avinash240
 [jsummerfield]: https://github.com/jsummerfield
+[rouge8]: https://github.com/rouge8

From f1fb434e6da0505b6cd74a3822d278fabde86ff6 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Thu, 16 May 2013 19:59:33 +0200
Subject: [PATCH 047/197] Update release-notes.md

---
 docs/topics/release-notes.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index e7d627211..560dd3050 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -40,6 +40,10 @@ You can determine your currently installed version using `pip freeze`:
 
 ## 2.3.x series
 
+### Master
+
+* Bugfix: HyperlinkedIdentityField now uses `lookup_field` kwarg.
+
 ### 2.3.2
 
 **Date**: 16th May 2013

From 646b3b266d2bbfca23d4b1c0c00072cb56cfe8c1 Mon Sep 17 00:00:00 2001
From: Michael Elovskikh <wronglink@gmail.com>
Date: Thu, 16 May 2013 22:32:32 -0700
Subject: [PATCH 048/197] Updated README.md


From df11198c6cfd543925eabc95d10c596c40ab3ab5 Mon Sep 17 00:00:00 2001
From: Johannes <johtso@gmail.com>
Date: Fri, 17 May 2013 12:27:48 +0200
Subject: [PATCH 049/197] Fix typo + grammar in viewsets docs

---
 docs/api-guide/viewsets.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md
index e354a43ad..cd92dc585 100644
--- a/docs/api-guide/viewsets.md
+++ b/docs/api-guide/viewsets.md
@@ -13,11 +13,11 @@ A `ViewSet` class is simply **a type of class-based View, that does not provide
 
 The method handlers for a `ViewSet` are only bound to the corresponding actions at the point of finalizing the view, using the `.as_view()` method.
 
-Typically, rather than exlicitly registering the views in a viewset in the urlconf, you'll register the viewset with a router class, that automatically determines the urlconf for you.
+Typically, rather than explicitly registering the views in a viewset in the urlconf, you'll register the viewset with a router class, that automatically determines the urlconf for you.
 
 ## Example
 
-Let's define a simple viewset that can be used to listing or retrieving all the users in the system.
+Let's define a simple viewset that can be used to list or retrieve all the users in the system.
 
     class UserViewSet(viewsets.ViewSet):
         """

From 14ded26167b68aaf8316a6bf83b6be3e77c8bbd8 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Fri, 17 May 2013 21:28:33 +0100
Subject: [PATCH 050/197] PendingDeprecation warning to allow_empty

---
 rest_framework/mixins.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py
index ae703771d..55d21a706 100644
--- a/rest_framework/mixins.py
+++ b/rest_framework/mixins.py
@@ -10,6 +10,7 @@ from django.http import Http404
 from rest_framework import status
 from rest_framework.response import Response
 from rest_framework.request import clone_request
+import warnings
 
 
 def _get_validation_exclusions(obj, pk=None, slug_field=None, lookup_field=None):
@@ -77,6 +78,12 @@ class ListModelMixin(object):
         # Default is to allow empty querysets.  This can be altered by setting
         # `.allow_empty = False`, to raise 404 errors on empty querysets.
         if not self.allow_empty and not self.object_list:
+            warnings.warn(
+                'The `allow_empty` parameter is due to be deprecated. '
+                'To use `allow_empty=False` style behavior, You should override '
+                '`get_queryset()` and explicitly raise a 404 on empty querysets.',
+                PendingDeprecationWarning
+            )
             class_name = self.__class__.__name__
             error_msg = self.empty_error % {'class_name': class_name}
             raise Http404(error_msg)

From b6fb377c2b4b747597bc3291dadd52b633b135b4 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Fri, 17 May 2013 21:57:11 +0100
Subject: [PATCH 051/197] Fix PendingDeprecation warnings in tests

---
 rest_framework/tests/filters.py    | 12 ++++++------
 rest_framework/tests/generics.py   | 25 +++++++++----------------
 rest_framework/tests/pagination.py |  4 ++--
 3 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/rest_framework/tests/filters.py b/rest_framework/tests/filters.py
index a58c66ae2..8ae6d5303 100644
--- a/rest_framework/tests/filters.py
+++ b/rest_framework/tests/filters.py
@@ -24,7 +24,7 @@ if django_filters:
     class FilterFieldsRootView(generics.ListCreateAPIView):
         model = FilterableItem
         filter_fields = ['decimal', 'date']
-        filter_backend = filters.DjangoFilterBackend
+        filter_backends = (filters.DjangoFilterBackend,)
 
     # These class are used to test a filter class.
     class SeveralFieldsFilter(django_filters.FilterSet):
@@ -39,7 +39,7 @@ if django_filters:
     class FilterClassRootView(generics.ListCreateAPIView):
         model = FilterableItem
         filter_class = SeveralFieldsFilter
-        filter_backend = filters.DjangoFilterBackend
+        filter_backends = (filters.DjangoFilterBackend,)
 
     # These classes are used to test a misconfigured filter class.
     class MisconfiguredFilter(django_filters.FilterSet):
@@ -52,12 +52,12 @@ if django_filters:
     class IncorrectlyConfiguredRootView(generics.ListCreateAPIView):
         model = FilterableItem
         filter_class = MisconfiguredFilter
-        filter_backend = filters.DjangoFilterBackend
+        filter_backends = (filters.DjangoFilterBackend,)
 
     class FilterClassDetailView(generics.RetrieveAPIView):
         model = FilterableItem
         filter_class = SeveralFieldsFilter
-        filter_backend = filters.DjangoFilterBackend
+        filter_backends = (filters.DjangoFilterBackend,)
 
     # Regression test for #814
     class FilterableItemSerializer(serializers.ModelSerializer):
@@ -68,12 +68,12 @@ if django_filters:
         queryset = FilterableItem.objects.all()
         serializer_class = FilterableItemSerializer
         filter_fields = ['decimal', 'date']
-        filter_backend = filters.DjangoFilterBackend
+        filter_backends = (filters.DjangoFilterBackend,)
 
     class GetQuerysetView(generics.ListCreateAPIView):
         serializer_class = FilterableItemSerializer
         filter_class = SeveralFieldsFilter
-        filter_backend = filters.DjangoFilterBackend
+        filter_backends = (filters.DjangoFilterBackend,)
 
         def get_queryset(self):
             return FilterableItem.objects.all()
diff --git a/rest_framework/tests/generics.py b/rest_framework/tests/generics.py
index eca50d821..2799d1430 100644
--- a/rest_framework/tests/generics.py
+++ b/rest_framework/tests/generics.py
@@ -39,6 +39,7 @@ class SlugBasedInstanceView(InstanceView):
     """
     model = SlugBasedModel
     serializer_class = SlugSerializer
+    lookup_field = 'slug'
 
 
 class TestRootView(TestCase):
@@ -434,22 +435,14 @@ class TestFilterBackendAppliedToViews(TestCase):
             {'id': obj.id, 'text': obj.text}
             for obj in self.objects.all()
         ]
-        self.root_view = RootView.as_view()
-        self.instance_view = InstanceView.as_view()
-        self.original_root_backend = getattr(RootView, 'filter_backend')
-        self.original_instance_backend = getattr(InstanceView, 'filter_backend')
-
-    def tearDown(self):
-        setattr(RootView, 'filter_backend', self.original_root_backend)
-        setattr(InstanceView, 'filter_backend', self.original_instance_backend)
 
     def test_get_root_view_filters_by_name_with_filter_backend(self):
         """
         GET requests to ListCreateAPIView should return filtered list.
         """
-        setattr(RootView, 'filter_backend', InclusiveFilterBackend)
+        root_view = RootView.as_view(filter_backends=(InclusiveFilterBackend,))
         request = factory.get('/')
-        response = self.root_view(request).render()
+        response = root_view(request).render()
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(len(response.data), 1)
         self.assertEqual(response.data, [{'id': 1, 'text': 'foo'}])
@@ -458,9 +451,9 @@ class TestFilterBackendAppliedToViews(TestCase):
         """
         GET requests to ListCreateAPIView should return empty list when all models are filtered out.
         """
-        setattr(RootView, 'filter_backend', ExclusiveFilterBackend)
+        root_view = RootView.as_view(filter_backends=(ExclusiveFilterBackend,))
         request = factory.get('/')
-        response = self.root_view(request).render()
+        response = root_view(request).render()
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.data, [])
 
@@ -468,9 +461,9 @@ class TestFilterBackendAppliedToViews(TestCase):
         """
         GET requests to RetrieveUpdateDestroyAPIView should raise 404 when model filtered out.
         """
-        setattr(InstanceView, 'filter_backend', ExclusiveFilterBackend)
+        instance_view = InstanceView.as_view(filter_backends=(ExclusiveFilterBackend,))
         request = factory.get('/1')
-        response = self.instance_view(request, pk=1).render()
+        response = instance_view(request, pk=1).render()
         self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
         self.assertEqual(response.data, {'detail': 'Not found'})
 
@@ -478,8 +471,8 @@ class TestFilterBackendAppliedToViews(TestCase):
         """
         GET requests to RetrieveUpdateDestroyAPIView should return a single object when not excluded
         """
-        setattr(InstanceView, 'filter_backend', InclusiveFilterBackend)
+        instance_view = InstanceView.as_view(filter_backends=(InclusiveFilterBackend,))
         request = factory.get('/1')
-        response = self.instance_view(request, pk=1).render()
+        response = instance_view(request, pk=1).render()
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.data, {'id': 1, 'text': 'foo'})
diff --git a/rest_framework/tests/pagination.py b/rest_framework/tests/pagination.py
index 894d53d6a..e538a78e5 100644
--- a/rest_framework/tests/pagination.py
+++ b/rest_framework/tests/pagination.py
@@ -130,7 +130,7 @@ class IntegrationTestPaginationAndFiltering(TestCase):
             model = FilterableItem
             paginate_by = 10
             filter_class = DecimalFilter
-            filter_backend = filters.DjangoFilterBackend
+            filter_backends = (filters.DjangoFilterBackend,)
 
         view = FilterFieldsRootView.as_view()
 
@@ -177,7 +177,7 @@ class IntegrationTestPaginationAndFiltering(TestCase):
         class BasicFilterFieldsRootView(generics.ListCreateAPIView):
             model = FilterableItem
             paginate_by = 10
-            filter_backend = DecimalFilterBackend
+            filter_backends = (DecimalFilterBackend,)
 
         view = BasicFilterFieldsRootView.as_view()
 

From 34776da9249a5d73f822b3562bc56a5674b10ac7 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Fri, 17 May 2013 22:09:23 +0100
Subject: [PATCH 052/197] Minor mixin refactoring

---
 rest_framework/mixins.py | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py
index 55d21a706..f3cd5868f 100644
--- a/rest_framework/mixins.py
+++ b/rest_framework/mixins.py
@@ -43,7 +43,6 @@ def _get_validation_exclusions(obj, pk=None, slug_field=None, lookup_field=None)
 class CreateModelMixin(object):
     """
     Create a model instance.
-    Should be mixed in with any `GenericAPIView`.
     """
     def create(self, request, *args, **kwargs):
         serializer = self.get_serializer(data=request.DATA, files=request.FILES)
@@ -68,7 +67,6 @@ class CreateModelMixin(object):
 class ListModelMixin(object):
     """
     List a queryset.
-    Should be mixed in with `MultipleObjectAPIView`.
     """
     empty_error = "Empty list and '%(class_name)s.allow_empty' is False."
 
@@ -101,7 +99,6 @@ class ListModelMixin(object):
 class RetrieveModelMixin(object):
     """
     Retrieve a model instance.
-    Should be mixed in with `SingleObjectAPIView`.
     """
     def retrieve(self, request, *args, **kwargs):
         self.object = self.get_object()
@@ -112,17 +109,22 @@ class RetrieveModelMixin(object):
 class UpdateModelMixin(object):
     """
     Update a model instance.
-    Should be mixed in with `SingleObjectAPIView`.
     """
-    def update(self, request, *args, **kwargs):
-        partial = kwargs.pop('partial', False)
-        self.object = None
+    def get_object_or_none(self):
         try:
-            self.object = self.get_object()
+            return self.get_object()
         except Http404:
             # If this is a PUT-as-create operation, we need to ensure that
             # we have relevant permissions, as if this was a POST request.
-            self.check_permissions(clone_request(request, 'POST'))
+            # This will either raise a PermissionDenied exception,
+            # or simply return None
+            self.check_permissions(clone_request(self.request, 'POST'))
+
+    def update(self, request, *args, **kwargs):
+        partial = kwargs.pop('partial', False)
+        self.object = self.get_object_or_none()
+
+        if self.object is None:
             created = True
             save_kwargs = {'force_insert': True}
             success_status_code = status.HTTP_201_CREATED
@@ -175,7 +177,6 @@ class UpdateModelMixin(object):
 class DestroyModelMixin(object):
     """
     Destroy a model instance.
-    Should be mixed in with `SingleObjectAPIView`.
     """
     def destroy(self, request, *args, **kwargs):
         obj = self.get_object()

From aea040161ae29ec4b5335be5164aa8e5ada506e3 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Sat, 18 May 2013 09:36:09 +0100
Subject: [PATCH 053/197] Forms in Broseable API support dynamic serializers
 based on request method

---
 rest_framework/renderers.py      | 42 +++++++++++++++++++++++++-------
 rest_framework/tests/generics.py | 34 +++++++++++++++++++++++++-
 2 files changed, 66 insertions(+), 10 deletions(-)

diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py
index 1917a0803..8361cd409 100644
--- a/rest_framework/renderers.py
+++ b/rest_framework/renderers.py
@@ -336,7 +336,7 @@ class BrowsableAPIRenderer(BaseRenderer):
             return  # Cannot use form overloading
 
         try:
-            view.check_permissions(clone_request(request, method))
+            view.check_permissions(request)
         except exceptions.APIException:
             return False  # Doesn't have permissions
         return True
@@ -372,6 +372,30 @@ class BrowsableAPIRenderer(BaseRenderer):
 
         return fields
 
+    def _get_form(self, view, method, request):
+        # We need to impersonate a request with the correct method,
+        # so that eg. any dynamic get_serializer_class methods return the
+        # correct form for each method.
+        restore = view.request
+        request = clone_request(request, method)
+        view.request = request
+        try:
+            return self.get_form(view, method, request)
+        finally:
+            view.request = restore
+
+    def _get_raw_data_form(self, view, method, request, media_types):
+        # We need to impersonate a request with the correct method,
+        # so that eg. any dynamic get_serializer_class methods return the
+        # correct form for each method.
+        restore = view.request
+        request = clone_request(request, method)
+        view.request = request
+        try:
+            return self.get_raw_data_form(view, method, request, media_types)
+        finally:
+            view.request = restore
+
     def get_form(self, view, method, request):
         """
         Get a form, possibly bound to either the input or output data.
@@ -465,15 +489,15 @@ class BrowsableAPIRenderer(BaseRenderer):
         renderer = self.get_default_renderer(view)
         content = self.get_content(renderer, data, accepted_media_type, renderer_context)
 
-        put_form = self.get_form(view, 'PUT', request)
-        post_form = self.get_form(view, 'POST', request)
-        patch_form = self.get_form(view, 'PATCH', request)
-        delete_form = self.get_form(view, 'DELETE', request)
-        options_form = self.get_form(view, 'OPTIONS', request)
+        put_form = self._get_form(view, 'PUT', request)
+        post_form = self._get_form(view, 'POST', request)
+        patch_form = self._get_form(view, 'PATCH', request)
+        delete_form = self._get_form(view, 'DELETE', request)
+        options_form = self._get_form(view, 'OPTIONS', request)
 
-        raw_data_put_form = self.get_raw_data_form(view, 'PUT', request, media_types)
-        raw_data_post_form = self.get_raw_data_form(view, 'POST', request, media_types)
-        raw_data_patch_form = self.get_raw_data_form(view, 'PATCH', request, media_types)
+        raw_data_put_form = self._get_raw_data_form(view, 'PUT', request, media_types)
+        raw_data_post_form = self._get_raw_data_form(view, 'POST', request, media_types)
+        raw_data_patch_form = self._get_raw_data_form(view, 'PATCH', request, media_types)
         raw_data_put_or_patch_form = raw_data_put_form or raw_data_patch_form
 
         name = self.get_name(view)
diff --git a/rest_framework/tests/generics.py b/rest_framework/tests/generics.py
index 2799d1430..15d87e866 100644
--- a/rest_framework/tests/generics.py
+++ b/rest_framework/tests/generics.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 from django.db import models
 from django.shortcuts import get_object_or_404
 from django.test import TestCase
-from rest_framework import generics, serializers, status
+from rest_framework import generics, renderers, serializers, status
 from rest_framework.tests.utils import RequestFactory
 from rest_framework.tests.models import BasicModel, Comment, SlugBasedModel
 from rest_framework.compat import six
@@ -476,3 +476,35 @@ class TestFilterBackendAppliedToViews(TestCase):
         response = instance_view(request, pk=1).render()
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.data, {'id': 1, 'text': 'foo'})
+
+
+class TwoFieldModel(models.Model):
+    field_a = models.CharField(max_length=100)
+    field_b = models.CharField(max_length=100)
+
+
+class DynamicSerializerView(generics.ListCreateAPIView):
+    model = TwoFieldModel
+    renderer_classes = (renderers.BrowsableAPIRenderer, renderers.JSONRenderer)
+
+    def get_serializer_class(self):
+        if self.request.method == 'POST':
+            class DynamicSerializer(serializers.ModelSerializer):
+                class Meta:
+                    model = TwoFieldModel
+                    fields = ('field_b',)
+            return DynamicSerializer
+        return super(DynamicSerializerView, self).get_serializer_class()
+
+
+class TestFilterBackendAppliedToViews(TestCase):
+
+    def test_dynamic_serializer_form_in_browsable_api(self):
+        """
+        GET requests to ListCreateAPIView should return filtered list.
+        """
+        view = DynamicSerializerView.as_view()
+        request = factory.get('/')
+        response = view(request).render()
+        self.assertContains(response, 'field_b')
+        self.assertNotContains(response, 'field_a')

From ed0bd195f58ae6c0502f9c54cbd34681875adb14 Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy <xordoquy@linovia.com>
Date: Sat, 18 May 2013 12:07:44 +0200
Subject: [PATCH 054/197] Updated the dependencies version and added the
 ALLOWED_HOSTS for tests.

---
 .travis.yml                         | 17 +++++++++--------
 rest_framework/runtests/settings.py |  2 ++
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 205feef92..3a7c2d7ad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,9 +7,9 @@ python:
   - "3.3"
 
 env:
-  - DJANGO="django==1.5 --use-mirrors"
-  - DJANGO="django==1.4.3 --use-mirrors"
-  - DJANGO="django==1.3.5 --use-mirrors"
+  - DJANGO="django==1.5.1 --use-mirrors"
+  - DJANGO="django==1.4.5 --use-mirrors"
+  - DJANGO="django==1.3.7 --use-mirrors"
 
 install:
   - pip install $DJANGO
@@ -18,7 +18,7 @@ install:
   - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth-plus==2.0 --use-mirrors; fi"
   - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth2-provider==0.2.3 --use-mirrors; fi"
   - "if [[ ${DJANGO::11} == 'django==1.3' ]]; then pip install django-filter==0.5.4 --use-mirrors; fi"
-  - "if [[ ${DJANGO::11} != 'django==1.3' ]]; then pip install django-filter==0.6a1 --use-mirrors; fi"
+  - "if [[ ${DJANGO::11} != 'django==1.3' ]]; then pip install django-filter==0.6 --use-mirrors; fi"
   - export PYTHONPATH=.
 
 script:
@@ -27,10 +27,11 @@ script:
 matrix:
   exclude:
     - python: "3.2"
-      env: DJANGO="django==1.4.3 --use-mirrors"
+      env: DJANGO="django==1.4.5 --use-mirrors"
     - python: "3.2"
-      env: DJANGO="django==1.3.5 --use-mirrors"
+      env: DJANGO="django==1.3.7 --use-mirrors"
     - python: "3.3"
-      env: DJANGO="django==1.4.3 --use-mirrors"
+      env: DJANGO="django==1.4.5 --use-mirrors"
     - python: "3.3"
-      env: DJANGO="django==1.3.5 --use-mirrors"
+      env: DJANGO="django==1.3.7 --use-mirrors"
+
diff --git a/rest_framework/runtests/settings.py b/rest_framework/runtests/settings.py
index 9b519f271..9dd7b545e 100644
--- a/rest_framework/runtests/settings.py
+++ b/rest_framework/runtests/settings.py
@@ -4,6 +4,8 @@ DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 DEBUG_PROPAGATE_EXCEPTIONS = True
 
+ALLOWED_HOSTS = ['*']
+
 ADMINS = (
     # ('Your Name', 'your_email@domain.com'),
 )

From 0cd7c80e6eaf3ca17d0fb8f8878054ce570e3932 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Sat, 18 May 2013 12:16:30 +0200
Subject: [PATCH 055/197] add tests for related field source for RelatedField
 and PrimaryKeyRelatedField. #694

---
 rest_framework/tests/relations.py    | 37 +++++++++++++++++++++++++-
 rest_framework/tests/relations_pk.py | 39 +++++++++++++++++++++++++++-
 rest_framework/tests/serializer.py   | 17 ------------
 3 files changed, 74 insertions(+), 19 deletions(-)

diff --git a/rest_framework/tests/relations.py b/rest_framework/tests/relations.py
index cbf93c65e..f28f0de93 100644
--- a/rest_framework/tests/relations.py
+++ b/rest_framework/tests/relations.py
@@ -5,6 +5,7 @@ from __future__ import unicode_literals
 from django.db import models
 from django.test import TestCase
 from rest_framework import serializers
+from rest_framework.tests.models import BlogPost
 
 
 class NullModel(models.Model):
@@ -33,7 +34,7 @@ class FieldTests(TestCase):
         self.assertRaises(serializers.ValidationError, field.from_native, [])
 
 
-class TestManyRelateMixin(TestCase):
+class TestManyRelatedMixin(TestCase):
     def test_missing_many_to_many_related_field(self):
         '''
         Regression test for #632
@@ -45,3 +46,37 @@ class TestManyRelateMixin(TestCase):
         into = {}
         field.field_from_native({}, None, 'field_name', into)
         self.assertEqual(into['field_name'], [])
+
+
+# Regression tests for #694 (`source` attribute on related fields)
+
+class RelatedFieldSourceTests(TestCase):
+    def test_related_manager_source(self):
+        """
+        Relational fields should be able to use manager-returning methods as their source.
+        """
+        BlogPost.objects.create(title='blah')
+        field = serializers.RelatedField(many=True, source='get_blogposts_manager')
+
+        class ClassWithManagerMethod(object):
+            def get_blogposts_manager(self):
+                return BlogPost.objects
+
+        obj = ClassWithManagerMethod()
+        value = field.field_to_native(obj, 'field_name')
+        self.assertEqual(value, ['BlogPost object'])
+
+    def test_related_queryset_source(self):
+        """
+        Relational fields should be able to use queryset-returning methods as their source.
+        """
+        BlogPost.objects.create(title='blah')
+        field = serializers.RelatedField(many=True, source='get_blogposts_queryset')
+
+        class ClassWithQuerysetMethod(object):
+            def get_blogposts_queryset(self):
+                return BlogPost.objects.all()
+
+        obj = ClassWithQuerysetMethod()
+        value = field.field_to_native(obj, 'field_name')
+        self.assertEqual(value, ['BlogPost object'])
diff --git a/rest_framework/tests/relations_pk.py b/rest_framework/tests/relations_pk.py
index 5ce8b5671..51fe59e90 100644
--- a/rest_framework/tests/relations_pk.py
+++ b/rest_framework/tests/relations_pk.py
@@ -1,7 +1,10 @@
 from __future__ import unicode_literals
 from django.test import TestCase
 from rest_framework import serializers
-from rest_framework.tests.models import ManyToManyTarget, ManyToManySource, ForeignKeyTarget, ForeignKeySource, NullableForeignKeySource, OneToOneTarget, NullableOneToOneSource
+from rest_framework.tests.models import (
+    BlogPost, ManyToManyTarget, ManyToManySource, ForeignKeyTarget, ForeignKeySource,
+    NullableForeignKeySource, OneToOneTarget, NullableOneToOneSource,
+)
 from rest_framework.compat import six
 
 
@@ -421,3 +424,37 @@ class PKNullableOneToOneTests(TestCase):
             {'id': 2, 'name': 'target-2', 'nullable_source': 1},
         ]
         self.assertEqual(serializer.data, expected)
+
+
+# Regression tests for #694 (`source` attribute on related fields)
+
+class PrimaryKeyRelatedFieldSourceTests(TestCase):
+    def test_related_manager_source(self):
+        """
+        Relational fields should be able to use manager-returning methods as their source.
+        """
+        BlogPost.objects.create(title='blah')
+        field = serializers.PrimaryKeyRelatedField(many=True, source='get_blogposts_manager')
+
+        class ClassWithManagerMethod(object):
+            def get_blogposts_manager(self):
+                return BlogPost.objects
+
+        obj = ClassWithManagerMethod()
+        value = field.field_to_native(obj, 'field_name')
+        self.assertEqual(value, [1])
+
+    def test_related_queryset_source(self):
+        """
+        Relational fields should be able to use queryset-returning methods as their source.
+        """
+        BlogPost.objects.create(title='blah')
+        field = serializers.PrimaryKeyRelatedField(many=True, source='get_blogposts_queryset')
+
+        class ClassWithQuerysetMethod(object):
+            def get_blogposts_queryset(self):
+                return BlogPost.objects.all()
+
+        obj = ClassWithQuerysetMethod()
+        value = field.field_to_native(obj, 'field_name')
+        self.assertEqual(value, [1])
diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index db3881f9a..34acbaab4 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -871,23 +871,6 @@ class RelatedTraversalTest(TestCase):
 
         self.assertEqual(serializer.data, expected)
 
-    def test_queryset_nested_traversal(self):
-        """
-        Relational fields should be able to use methods as their source.
-        """
-        BlogPost.objects.create(title='blah')
-
-        class QuerysetMethodSerializer(serializers.Serializer):
-            blogposts = serializers.RelatedField(many=True, source='get_all_blogposts')
-
-        class ClassWithQuerysetMethod(object):
-            def get_all_blogposts(self):
-                return BlogPost.objects
-
-        obj = ClassWithQuerysetMethod()
-        serializer = QuerysetMethodSerializer(obj)
-        self.assertEqual(serializer.data, {'blogposts': ['BlogPost object']})
-
 
 class SerializerMethodFieldTests(TestCase):
     def setUp(self):

From 930bd4d0e1f9a74ee56a57ef36c93b1c1d124f91 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Sat, 18 May 2013 12:23:12 +0200
Subject: [PATCH 056/197] add tests for related field source for
 HyperlinkedRelatedField. #694

---
 rest_framework/tests/relations_hyperlink.py | 48 +++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/rest_framework/tests/relations_hyperlink.py b/rest_framework/tests/relations_hyperlink.py
index b1eed9a76..8fb4687f5 100644
--- a/rest_framework/tests/relations_hyperlink.py
+++ b/rest_framework/tests/relations_hyperlink.py
@@ -4,6 +4,7 @@ from django.test.client import RequestFactory
 from rest_framework import serializers
 from rest_framework.compat import patterns, url
 from rest_framework.tests.models import (
+    BlogPost,
     ManyToManyTarget, ManyToManySource, ForeignKeyTarget, ForeignKeySource,
     NullableForeignKeySource, OneToOneTarget, NullableOneToOneSource
 )
@@ -16,6 +17,7 @@ def dummy_view(request, pk):
     pass
 
 urlpatterns = patterns('',
+    url(r'^dummyurl/(?P<pk>[0-9]+)/$', dummy_view, name='dummy-url'),
     url(r'^manytomanysource/(?P<pk>[0-9]+)/$', dummy_view, name='manytomanysource-detail'),
     url(r'^manytomanytarget/(?P<pk>[0-9]+)/$', dummy_view, name='manytomanytarget-detail'),
     url(r'^foreignkeysource/(?P<pk>[0-9]+)/$', dummy_view, name='foreignkeysource-detail'),
@@ -451,3 +453,49 @@ class HyperlinkedNullableOneToOneTests(TestCase):
             {'url': 'http://testserver/onetoonetarget/2/', 'name': 'target-2', 'nullable_source': None},
         ]
         self.assertEqual(serializer.data, expected)
+
+
+# Regression tests for #694 (`source` attribute on related fields)
+
+class HyperlinkedRelatedFieldSourceTests(TestCase):
+    urls = 'rest_framework.tests.relations_hyperlink'
+
+    def test_related_manager_source(self):
+        """
+        Relational fields should be able to use manager-returning methods as their source.
+        """
+        BlogPost.objects.create(title='blah')
+        field = serializers.HyperlinkedRelatedField(
+            many=True,
+            source='get_blogposts_manager',
+            view_name='dummy-url',
+        )
+        field.context = {'request': request}
+
+        class ClassWithManagerMethod(object):
+            def get_blogposts_manager(self):
+                return BlogPost.objects
+
+        obj = ClassWithManagerMethod()
+        value = field.field_to_native(obj, 'field_name')
+        self.assertEqual(value, ['http://testserver/dummyurl/1/'])
+
+    def test_related_queryset_source(self):
+        """
+        Relational fields should be able to use queryset-returning methods as their source.
+        """
+        BlogPost.objects.create(title='blah')
+        field = serializers.HyperlinkedRelatedField(
+            many=True,
+            source='get_blogposts_queryset',
+            view_name='dummy-url',
+        )
+        field.context = {'request': request}
+
+        class ClassWithQuerysetMethod(object):
+            def get_blogposts_queryset(self):
+                return BlogPost.objects.all()
+
+        obj = ClassWithQuerysetMethod()
+        value = field.field_to_native(obj, 'field_name')
+        self.assertEqual(value, ['http://testserver/dummyurl/1/'])

From 3691cd2ffd26ee639b88aa9f516f211e0558d454 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20T=C3=B6rnqvist?= <mjt+illyria@skyhood.com>
Date: Sat, 18 May 2013 13:26:59 +0300
Subject: [PATCH 057/197] Use smart_text() instead of nonexistant
 smart_unicode()

---
 rest_framework/fields.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 3c4e975ae..e4da14566 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -117,10 +117,10 @@ class Field(object):
         self.source = source
 
         if label is not None:
-            self.label = smart_unicode(label)
+            self.label = smart_text(label)
 
         if help_text is not None:
-            self.help_text = smart_unicode(help_text)
+            self.help_text = smart_text(help_text)
 
     def initialize(self, parent, field_name):
         """

From a73c16b85f79aeb9139734a64623b49bc169fce9 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Sat, 18 May 2013 11:27:48 +0100
Subject: [PATCH 058/197] serializers.Field respects ordering on dicts if it
 exists.  Closes #832

---
 rest_framework/fields.py       |  7 ++++++-
 rest_framework/tests/fields.py | 19 ++++++++++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index c83ee5ecf..49d2a6d5d 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -19,6 +19,7 @@ from django import forms
 from django.forms import widgets
 from django.utils.encoding import is_protected_type
 from django.utils.translation import ugettext_lazy as _
+from django.utils.datastructures import SortedDict
 
 from rest_framework import ISO_8601
 from rest_framework.compat import timezone, parse_date, parse_datetime, parse_time
@@ -170,7 +171,11 @@ class Field(object):
         elif hasattr(value, '__iter__') and not isinstance(value, (dict, six.string_types)):
             return [self.to_native(item) for item in value]
         elif isinstance(value, dict):
-            return dict(map(self.to_native, (k, v)) for k, v in value.items())
+            # Make sure we preserve field ordering, if it exists
+            ret = SortedDict()
+            for key, val in value.items():
+                ret[key] = self.to_native(val)
+            return ret
         return smart_text(value)
 
     def attributes(self):
diff --git a/rest_framework/tests/fields.py b/rest_framework/tests/fields.py
index 3cdfa0f62..5b5ce835a 100644
--- a/rest_framework/tests/fields.py
+++ b/rest_framework/tests/fields.py
@@ -2,13 +2,12 @@
 General serializer field tests.
 """
 from __future__ import unicode_literals
+from django.utils.datastructures import SortedDict
 import datetime
 from decimal import Decimal
-
 from django.db import models
 from django.test import TestCase
 from django.core import validators
-
 from rest_framework import serializers
 from rest_framework.serializers import Serializer
 
@@ -63,6 +62,20 @@ class BasicFieldTests(TestCase):
         serializer = CharPrimaryKeyModelSerializer()
         self.assertEqual(serializer.fields['id'].read_only, False)
 
+    def test_dict_field_ordering(self):
+        """
+        Field should preserve dictionary ordering, if it exists.
+        See: https://github.com/tomchristie/django-rest-framework/issues/832
+        """
+        ret = SortedDict()
+        ret['c'] = 1
+        ret['b'] = 1
+        ret['a'] = 1
+        ret['z'] = 1
+        field = serializers.Field()
+        keys = list(field.to_native(ret).keys())
+        self.assertEqual(keys, ['c', 'b', 'a', 'z'])
+
 
 class DateFieldTest(TestCase):
     """
@@ -645,4 +658,4 @@ class DecimalFieldTest(TestCase):
         s = DecimalSerializer(data={'decimal_field': '12345.6'})
 
         self.assertFalse(s.is_valid())
-        self.assertEqual(s.errors,  {'decimal_field': ['Ensure that there are no more than 4 digits in total.']})
\ No newline at end of file
+        self.assertEqual(s.errors,  {'decimal_field': ['Ensure that there are no more than 4 digits in total.']})

From 764299843cbedce9afd07db7226f639208ff0608 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20T=C3=B6rnqvist?= <mjt+illyria@skyhood.com>
Date: Sat, 18 May 2013 13:30:39 +0300
Subject: [PATCH 059/197] ManyHyperlinkedRelatedField comes form
 rest_framework.relations now

---
 rest_framework/tests/serializer.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index b0c7e5689..fc433a8f2 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 from django.utils.datastructures import MultiValueDict
 from django.test import TestCase
-from rest_framework import serializers, fields
+from rest_framework import serializers, fields, relations
 from rest_framework.tests.models import (HasPositiveIntegerAsChoice, Album, ActionItem, Anchor, BasicModel,
     BlankFieldModel, BlogPost, BlogPostComment, Book, CallableDefaultValueModel, DefaultValueModel,
     ManyToManyModel, Person, ReadOnlyManyToManyModel, Photo)
@@ -1170,5 +1170,5 @@ class FieldLabelTest(TestCase):
         """
         self.assertEquals(u'Label', fields.Field(label='Label', help_text='Help').label)
         self.assertEquals(u'Help', fields.CharField(label='Label', help_text='Help').help_text)
-        self.assertEquals(u'Label', fields.ManyHyperlinkedRelatedField(view_name='fake', label='Label', help_text='Help').label)
+        self.assertEquals(u'Label', relations.ManyHyperlinkedRelatedField(view_name='fake', label='Label', help_text='Help').label)
 

From c992b600f7b0aefb156cddb5e27b438ccc316b39 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Sat, 18 May 2013 12:32:48 +0200
Subject: [PATCH 060/197] add tests for dotted lookup in RelatedField,
 PrimaryKeyRelatedField, and HyperlinkedRelatedField. #694

---
 rest_framework/tests/relations.py           | 18 ++++++++++++++++
 rest_framework/tests/relations_hyperlink.py | 23 +++++++++++++++++++++
 rest_framework/tests/relations_pk.py        | 18 ++++++++++++++++
 3 files changed, 59 insertions(+)

diff --git a/rest_framework/tests/relations.py b/rest_framework/tests/relations.py
index f28f0de93..d19219c90 100644
--- a/rest_framework/tests/relations.py
+++ b/rest_framework/tests/relations.py
@@ -80,3 +80,21 @@ class RelatedFieldSourceTests(TestCase):
         obj = ClassWithQuerysetMethod()
         value = field.field_to_native(obj, 'field_name')
         self.assertEqual(value, ['BlogPost object'])
+
+    def test_dotted_source(self):
+        """
+        Source argument should support dotted.source notation.
+        """
+        BlogPost.objects.create(title='blah')
+        field = serializers.RelatedField(many=True, source='a.b.c')
+
+        class ClassWithQuerysetMethod(object):
+            a = {
+                'b': {
+                    'c': BlogPost.objects.all()
+                }
+            }
+
+        obj = ClassWithQuerysetMethod()
+        value = field.field_to_native(obj, 'field_name')
+        self.assertEqual(value, ['BlogPost object'])
diff --git a/rest_framework/tests/relations_hyperlink.py b/rest_framework/tests/relations_hyperlink.py
index 8fb4687f5..b3efbf524 100644
--- a/rest_framework/tests/relations_hyperlink.py
+++ b/rest_framework/tests/relations_hyperlink.py
@@ -499,3 +499,26 @@ class HyperlinkedRelatedFieldSourceTests(TestCase):
         obj = ClassWithQuerysetMethod()
         value = field.field_to_native(obj, 'field_name')
         self.assertEqual(value, ['http://testserver/dummyurl/1/'])
+
+    def test_dotted_source(self):
+        """
+        Source argument should support dotted.source notation.
+        """
+        BlogPost.objects.create(title='blah')
+        field = serializers.HyperlinkedRelatedField(
+            many=True,
+            source='a.b.c',
+            view_name='dummy-url',
+        )
+        field.context = {'request': request}
+
+        class ClassWithQuerysetMethod(object):
+            a = {
+                'b': {
+                    'c': BlogPost.objects.all()
+                }
+            }
+
+        obj = ClassWithQuerysetMethod()
+        value = field.field_to_native(obj, 'field_name')
+        self.assertEqual(value, ['http://testserver/dummyurl/1/'])
diff --git a/rest_framework/tests/relations_pk.py b/rest_framework/tests/relations_pk.py
index 51fe59e90..0f8c52476 100644
--- a/rest_framework/tests/relations_pk.py
+++ b/rest_framework/tests/relations_pk.py
@@ -458,3 +458,21 @@ class PrimaryKeyRelatedFieldSourceTests(TestCase):
         obj = ClassWithQuerysetMethod()
         value = field.field_to_native(obj, 'field_name')
         self.assertEqual(value, [1])
+
+    def test_dotted_source(self):
+        """
+        Source argument should support dotted.source notation.
+        """
+        BlogPost.objects.create(title='blah')
+        field = serializers.PrimaryKeyRelatedField(many=True, source='a.b.c')
+
+        class ClassWithQuerysetMethod(object):
+            a = {
+                'b': {
+                    'c': BlogPost.objects.all()
+                }
+            }
+
+        obj = ClassWithQuerysetMethod()
+        value = field.field_to_native(obj, 'field_name')
+        self.assertEqual(value, [1])

From de5cc8de423a22009d2a643f6c268805f715b212 Mon Sep 17 00:00:00 2001
From: Pablo Recio <pablo@potatolondon.com>
Date: Sat, 18 May 2013 12:40:25 +0200
Subject: [PATCH 061/197] A model's field is required if is null or blank

---
 rest_framework/serializers.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 7707de7a7..500bb3066 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -705,15 +705,14 @@ class ModelSerializer(Serializer):
         Creates a default instance of a basic non-relational field.
         """
         kwargs = {}
-        has_default = model_field.has_default()
 
-        if model_field.null or model_field.blank or has_default:
+        if model_field.null or model_field.blank:
             kwargs['required'] = False
 
         if isinstance(model_field, models.AutoField) or not model_field.editable:
             kwargs['read_only'] = True
 
-        if has_default:
+        if model_field.has_default():
             kwargs['default'] = model_field.get_default()
 
         if issubclass(model_field.__class__, models.TextField):

From ab8bd566f9db327a4c463317011818d421bbf89c Mon Sep 17 00:00:00 2001
From: Pablo Recio <pablo@potatolondon.com>
Date: Sat, 18 May 2013 12:40:25 +0200
Subject: [PATCH 062/197] Adding `BLANK_CHOICE_DASH` as a choice if the model's
 field isn't required

---
 rest_framework/fields.py           |  3 ++
 rest_framework/tests/fields.py     | 28 ++++++++++++++++++-
 rest_framework/tests/models.py     | 26 +++++++++++++++++
 rest_framework/tests/serializer.py | 45 +++++++++++++++++++++++++++++-
 4 files changed, 100 insertions(+), 2 deletions(-)

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index c83ee5ecf..7fd4c6381 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -15,6 +15,7 @@ import warnings
 from django.core import validators
 from django.core.exceptions import ValidationError
 from django.conf import settings
+from django.db.models.fields import BLANK_CHOICE_DASH
 from django import forms
 from django.forms import widgets
 from django.utils.encoding import is_protected_type
@@ -402,6 +403,8 @@ class ChoiceField(WritableField):
     def __init__(self, choices=(), *args, **kwargs):
         super(ChoiceField, self).__init__(*args, **kwargs)
         self.choices = choices
+        if not self.required:
+            self.choices = BLANK_CHOICE_DASH + self.choices
 
     def _get_choices(self):
         return self._choices
diff --git a/rest_framework/tests/fields.py b/rest_framework/tests/fields.py
index 3cdfa0f62..f313ba60a 100644
--- a/rest_framework/tests/fields.py
+++ b/rest_framework/tests/fields.py
@@ -645,4 +645,30 @@ class DecimalFieldTest(TestCase):
         s = DecimalSerializer(data={'decimal_field': '12345.6'})
 
         self.assertFalse(s.is_valid())
-        self.assertEqual(s.errors,  {'decimal_field': ['Ensure that there are no more than 4 digits in total.']})
\ No newline at end of file
+        self.assertEqual(s.errors,  {'decimal_field': ['Ensure that there are no more than 4 digits in total.']})
+
+
+class ChoiceFieldTests(TestCase):
+    """
+    Tests for the ChoiceField options generator
+    """
+
+    SAMPLE_CHOICES = [
+        ('red', 'Red'),
+        ('green', 'Green'),
+        ('blue', 'Blue'),
+    ]
+
+    def test_choices_required(self):
+        """
+        Make sure proper choices are rendered if field is required
+        """
+        f = serializers.ChoiceField(required=True, choices=self.SAMPLE_CHOICES)
+        self.assertEqual(f.choices, self.SAMPLE_CHOICES)
+
+    def test_choices_not_required(self):
+        """
+        Make sure proper choices (plus blank) are rendered if the field isn't required
+        """
+        f = serializers.ChoiceField(required=False, choices=self.SAMPLE_CHOICES)
+        self.assertEqual(f.choices, models.fields.BLANK_CHOICE_DASH + self.SAMPLE_CHOICES)
diff --git a/rest_framework/tests/models.py b/rest_framework/tests/models.py
index 40e41a644..5d98b04bd 100644
--- a/rest_framework/tests/models.py
+++ b/rest_framework/tests/models.py
@@ -117,6 +117,32 @@ class OptionalRelationModel(RESTFrameworkModel):
     other = models.ForeignKey('OptionalRelationModel', blank=True, null=True)
 
 
+# Model for issue #725
+class SeveralChoicesModel(RESTFrameworkModel):
+    color = models.CharField(
+        max_length=10,
+        choices=[('red', 'Red'), ('green', 'Green'), ('blue', 'Blue')],
+        blank=False
+    )
+    drink = models.CharField(
+        max_length=10,
+        choices=[('beer', 'Beer'), ('wine', 'Wine'), ('cider', 'Cider')],
+        blank=False,
+        default='beer'
+    )
+    os = models.CharField(
+        max_length=10,
+        choices=[('linux', 'Linux'), ('osx', 'OSX'), ('windows', 'Windows')],
+        blank=True
+    )
+    music_genre = models.CharField(
+        max_length=10,
+        choices=[('rock', 'Rock'), ('metal', 'Metal'), ('grunge', 'Grunge')],
+        blank=True,
+        default='metal'
+    )
+
+
 # Model for RegexField
 class Book(RESTFrameworkModel):
     isbn = models.CharField(max_length=13)
diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index db3881f9a..3f39308de 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -1,10 +1,11 @@
 from __future__ import unicode_literals
+from django.db.models.fields import BLANK_CHOICE_DASH
 from django.utils.datastructures import MultiValueDict
 from django.test import TestCase
 from rest_framework import serializers
 from rest_framework.tests.models import (HasPositiveIntegerAsChoice, Album, ActionItem, Anchor, BasicModel,
     BlankFieldModel, BlogPost, BlogPostComment, Book, CallableDefaultValueModel, DefaultValueModel,
-    ManyToManyModel, Person, ReadOnlyManyToManyModel, Photo)
+    ManyToManyModel, Person, ReadOnlyManyToManyModel, Photo, SeveralChoicesModel)
 import datetime
 import pickle
 
@@ -1018,6 +1019,48 @@ class SerializerPickleTests(TestCase):
         repr(pickle.loads(pickle.dumps(data, 0)))
 
 
+# test for issue #725
+class SerializerChoiceFields(TestCase):
+
+    def setUp(self):
+        super(SerializerChoiceFields, self).setUp()
+
+        class SeveralChoicesSerializer(serializers.ModelSerializer):
+            class Meta:
+                model = SeveralChoicesModel
+                fields = ('color', 'drink', 'os', 'music_genre')
+
+        self.several_choices_serializer = SeveralChoicesSerializer
+
+    def test_choices_blank_false_not_default(self):
+        serializer = self.several_choices_serializer()
+        self.assertEqual(
+            serializer.fields['color'].choices,
+            [('red', 'Red'), ('green', 'Green'), ('blue', 'Blue')]
+        )
+
+    def test_choices_blank_false_with_default(self):
+        serializer = self.several_choices_serializer()
+        self.assertEqual(
+            serializer.fields['drink'].choices,
+            [('beer', 'Beer'), ('wine', 'Wine'), ('cider', 'Cider')]
+        )
+
+    def test_choices_blank_true_not_default(self):
+        serializer = self.several_choices_serializer()
+        self.assertEqual(
+            serializer.fields['os'].choices,
+            BLANK_CHOICE_DASH + [('linux', 'Linux'), ('osx', 'OSX'), ('windows', 'Windows')]
+        )
+
+    def test_choices_blank_true_with_default(self):
+        serializer = self.several_choices_serializer()
+        self.assertEqual(
+            serializer.fields['music_genre'].choices,
+            BLANK_CHOICE_DASH + [('rock', 'Rock'), ('metal', 'Metal'), ('grunge', 'Grunge')]
+        )
+
+
 class DepthTest(TestCase):
     def test_implicit_nesting(self):
 

From 8fe43236a22e56d1741b49b92f0c53e01cd9e5f6 Mon Sep 17 00:00:00 2001
From: Pablo Recio <pablo@potatolondon.com>
Date: Sat, 18 May 2013 13:23:38 +0200
Subject: [PATCH 063/197] Moved test model into closer to the testcase

---
 rest_framework/tests/models.py     | 26 --------------------------
 rest_framework/tests/serializer.py | 28 +++++++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/rest_framework/tests/models.py b/rest_framework/tests/models.py
index 5d98b04bd..40e41a644 100644
--- a/rest_framework/tests/models.py
+++ b/rest_framework/tests/models.py
@@ -117,32 +117,6 @@ class OptionalRelationModel(RESTFrameworkModel):
     other = models.ForeignKey('OptionalRelationModel', blank=True, null=True)
 
 
-# Model for issue #725
-class SeveralChoicesModel(RESTFrameworkModel):
-    color = models.CharField(
-        max_length=10,
-        choices=[('red', 'Red'), ('green', 'Green'), ('blue', 'Blue')],
-        blank=False
-    )
-    drink = models.CharField(
-        max_length=10,
-        choices=[('beer', 'Beer'), ('wine', 'Wine'), ('cider', 'Cider')],
-        blank=False,
-        default='beer'
-    )
-    os = models.CharField(
-        max_length=10,
-        choices=[('linux', 'Linux'), ('osx', 'OSX'), ('windows', 'Windows')],
-        blank=True
-    )
-    music_genre = models.CharField(
-        max_length=10,
-        choices=[('rock', 'Rock'), ('metal', 'Metal'), ('grunge', 'Grunge')],
-        blank=True,
-        default='metal'
-    )
-
-
 # Model for RegexField
 class Book(RESTFrameworkModel):
     isbn = models.CharField(max_length=13)
diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 85b952835..c043f4175 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -1,11 +1,12 @@
 from __future__ import unicode_literals
+from django.db import models
 from django.db.models.fields import BLANK_CHOICE_DASH
 from django.utils.datastructures import MultiValueDict
 from django.test import TestCase
 from rest_framework import serializers
 from rest_framework.tests.models import (HasPositiveIntegerAsChoice, Album, ActionItem, Anchor, BasicModel,
     BlankFieldModel, BlogPost, BlogPostComment, Book, CallableDefaultValueModel, DefaultValueModel,
-    ManyToManyModel, Person, ReadOnlyManyToManyModel, Photo, SeveralChoicesModel)
+    ManyToManyModel, Person, ReadOnlyManyToManyModel, Photo)
 import datetime
 import pickle
 
@@ -1003,6 +1004,31 @@ class SerializerPickleTests(TestCase):
 
 
 # test for issue #725
+class SeveralChoicesModel(models.Model):
+    color = models.CharField(
+        max_length=10,
+        choices=[('red', 'Red'), ('green', 'Green'), ('blue', 'Blue')],
+        blank=False
+    )
+    drink = models.CharField(
+        max_length=10,
+        choices=[('beer', 'Beer'), ('wine', 'Wine'), ('cider', 'Cider')],
+        blank=False,
+        default='beer'
+    )
+    os = models.CharField(
+        max_length=10,
+        choices=[('linux', 'Linux'), ('osx', 'OSX'), ('windows', 'Windows')],
+        blank=True
+    )
+    music_genre = models.CharField(
+        max_length=10,
+        choices=[('rock', 'Rock'), ('metal', 'Metal'), ('grunge', 'Grunge')],
+        blank=True,
+        default='metal'
+    )
+
+
 class SerializerChoiceFields(TestCase):
 
     def setUp(self):

From a0e3c44c99a61a6dc878308bdf0890fbb10c41e4 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Sat, 18 May 2013 13:40:20 +0200
Subject: [PATCH 064/197] Added @craigds, @pyriku, @brianz - Yay for sprints!

---
 docs/topics/credits.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index 8151b4d3a..5998b4ca4 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -124,6 +124,9 @@ The following people have helped make REST framework great.
 * Marlon Bailey - [avinash240]
 * James Summerfield - [jsummerfield]
 * Andy Freeland - [rouge8]
+* Craig de Stigter - [craigds]
+* Pablo Recio - [pyriku]
+* Brian Zambrano - [brianz]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -284,3 +287,6 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [avinash240]: https://github.com/avinash240
 [jsummerfield]: https://github.com/jsummerfield
 [rouge8]: https://github.com/rouge8
+[craigds]: https://github.com/craigds
+[pyriku]: https://github.com/pyriku
+[brianz]: https://github.com/brianz

From 611919aa0aee261100a3cbfa9ed9b746d56ce3da Mon Sep 17 00:00:00 2001
From: Mark McArdle <mark.mcardle@sohonet.com>
Date: Sat, 18 May 2013 13:10:05 +0100
Subject: [PATCH 065/197] Initial commit of fix for
 https://github.com/tomchristie/django-rest-framework/issues/775

---
 .../rest_framework/css/bootstrap-tweaks.css   | 159 ++++++++++++++++++
 .../static/rest_framework/css/default.css     | 149 ----------------
 .../templates/rest_framework/base.html        |  13 +-
 .../templates/rest_framework/login_base.html  |   6 +-
 4 files changed, 170 insertions(+), 157 deletions(-)

diff --git a/rest_framework/static/rest_framework/css/bootstrap-tweaks.css b/rest_framework/static/rest_framework/css/bootstrap-tweaks.css
index c650ef2e9..69e1e70d7 100644
--- a/rest_framework/static/rest_framework/css/bootstrap-tweaks.css
+++ b/rest_framework/static/rest_framework/css/bootstrap-tweaks.css
@@ -19,4 +19,163 @@ a single block in the template.
 .navbar-inverse .brand:hover a {
     color: white;
     text-decoration: none;
+}
+
+/* custom navigation styles */
+.wrapper .navbar{
+  width: 100%;
+  position: absolute;
+  left: 0;
+  top: 0;
+}
+
+.navbar .navbar-inner{
+  background: #2C2C2C;
+  color: white;
+  border: none;
+  border-top: 5px solid #A30000;
+  border-radius: 0px;
+}
+
+.navbar .navbar-inner .nav li, .navbar .navbar-inner .nav li a, .navbar .navbar-inner .brand{
+  color: white;
+}
+
+.nav-list > .active > a, .nav-list > .active > a:hover {
+  background: #2c2c2c;
+}
+
+.navbar .navbar-inner .dropdown-menu li a, .navbar .navbar-inner .dropdown-menu li{
+ color: #A30000;
+}
+.navbar .navbar-inner .dropdown-menu li a:hover{
+  background: #eeeeee;
+  color: #c20000;
+}
+
+/*=== dabapps bootstrap styles ====*/
+
+html{
+  width:100%;
+  background: none;
+}
+
+body, .navbar .navbar-inner .container-fluid {
+  max-width: 1150px;
+  margin: 0 auto;
+}
+
+body{
+  background: url("../img/grid.png") repeat-x;
+  background-attachment: fixed;
+}
+
+#content{
+    margin: 0;
+}
+
+/* sticky footer and footer */
+html, body {
+  height: 100%;
+}
+.wrapper {
+  min-height: 100%;
+  height: auto !important;
+  height: 100%;
+  margin: 0 auto -60px;
+}
+
+.form-switcher {
+    margin-bottom: 0;
+}
+
+.well {
+    -webkit-box-shadow: none;
+       -moz-box-shadow: none;
+            box-shadow: none;
+}
+
+.well .form-actions {
+    padding-bottom: 0;
+    margin-bottom: 0;
+}
+
+.well form {
+    margin-bottom: 0;
+}
+
+.nav-tabs {
+    border: 0;
+}
+
+.nav-tabs > li {
+    float: right;
+}
+
+.nav-tabs li a {
+    margin-right: 0;
+}
+
+.nav-tabs > .active > a {
+    background: #f5f5f5;
+}
+
+.nav-tabs > .active > a:hover {
+    background: #f5f5f5;
+}
+
+.tabbable.first-tab-active .tab-content
+{
+    border-top-right-radius: 0;
+}
+
+#footer, #push {
+  height: 60px; /* .push must be the same height as .footer */
+}
+
+#footer{
+    text-align: right;
+}
+
+#footer p {
+  text-align: center;
+  color: gray;
+  border-top: 1px solid #DDD;
+  padding-top: 10px;
+}
+
+#footer a {
+  color: gray;
+  font-weight: bold;
+}
+
+#footer a:hover {
+  color: gray;
+}
+
+.page-header {
+    border-bottom: none;
+    padding-bottom: 0px;
+    margin-bottom: 20px;
+}
+
+/* custom general page styles */
+.hero-unit h2, .hero-unit h1{
+  color: #A30000;
+}
+
+body a, body a{
+  color: #A30000;
+}
+
+body a:hover{
+  color: #c20000;
+}
+
+#content a span{
+    text-decoration: underline;
+ }
+
+.request-info {
+    clear:both;
 }
\ No newline at end of file
diff --git a/rest_framework/static/rest_framework/css/default.css b/rest_framework/static/rest_framework/css/default.css
index d806267bc..0261a3038 100644
--- a/rest_framework/static/rest_framework/css/default.css
+++ b/rest_framework/static/rest_framework/css/default.css
@@ -69,152 +69,3 @@ pre {
     margin-bottom: 20px;
 }
 
-
-/*=== dabapps bootstrap styles ====*/
-
-html{
-  width:100%;
-  background: none;
-}
-
-body, .navbar .navbar-inner .container-fluid {
-  max-width: 1150px;
-  margin: 0 auto;
-}
-
-body{
-  background: url("../img/grid.png") repeat-x;
-  background-attachment: fixed;
-}
-
-#content{
-    margin: 0;
-}
-/* custom navigation styles */
-.wrapper .navbar{
-  width: 100%;
-  position: absolute;
-  left: 0;
-  top: 0;
-}
-
-.navbar .navbar-inner{
-  background: #2C2C2C;
-  color: white;
-  border: none;
-  border-top: 5px solid #A30000;
-  border-radius: 0px;
-}
-
-.navbar .navbar-inner .nav li, .navbar .navbar-inner .nav li a, .navbar .navbar-inner .brand{
-  color: white; 
-}
-
-.nav-list > .active > a, .nav-list > .active > a:hover {
-  background: #2c2c2c;
-}
-
-.navbar .navbar-inner .dropdown-menu li a, .navbar .navbar-inner .dropdown-menu li{
- color: #A30000; 
-}
-.navbar .navbar-inner .dropdown-menu li a:hover{
-  background: #eeeeee;
-  color: #c20000;
-}
-
-/* custom general page styles */
-.hero-unit h2, .hero-unit h1{
-  color: #A30000;
-}
-
-body a, body a{
-  color: #A30000;
-}
-
-body a:hover{
-  color: #c20000;
-}
-
-#content a span{
-    text-decoration: underline;
- }
-
-/* sticky footer and footer */
-html, body {
-  height: 100%;
-}
-.wrapper {
-  min-height: 100%;
-  height: auto !important;
-  height: 100%;
-  margin: 0 auto -60px;
-}
-
-.form-switcher {
-    margin-bottom: 0;
-}
-
-.well {
-    -webkit-box-shadow: none;
-       -moz-box-shadow: none;
-            box-shadow: none;
-}
-
-.well .form-actions {
-    padding-bottom: 0;
-    margin-bottom: 0;
-}
-
-.well form {
-    margin-bottom: 0;
-}
-
-.nav-tabs {
-    border: 0;
-}
-
-.nav-tabs > li {
-    float: right;
-}
-
-.nav-tabs li a {
-    margin-right: 0;
-}
-
-.nav-tabs > .active > a {
-    background: #f5f5f5;
-}
-
-.nav-tabs > .active > a:hover {
-    background: #f5f5f5;
-}
-
-.tabbable.first-tab-active .tab-content
-{
-    border-top-right-radius: 0;
-}
-
-#footer, #push {
-  height: 60px; /* .push must be the same height as .footer */
-}
-
-#footer{
-    text-align: right;
-}
-
-#footer p {
-  text-align: center;
-  color: gray;
-  border-top: 1px solid #DDD;
-  padding-top: 10px;
-}
-
-#footer a {
-  color: gray;
-  font-weight: bold;
-}
-
-#footer a:hover {
-  color: gray;
-}
-
diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html
index 4410f285f..9d939e738 100644
--- a/rest_framework/templates/rest_framework/base.html
+++ b/rest_framework/templates/rest_framework/base.html
@@ -13,8 +13,10 @@
         <title>{% block title %}Django REST framework{% endblock %}</title>
 
         {% block style %}
-        {% block bootstrap_theme %}<link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/bootstrap.min.css" %}"/>{% endblock %}
-        <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/bootstrap-tweaks.css" %}"/>
+        {% block bootstrap_theme %}
+            <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/bootstrap.min.css" %}"/>
+            <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/bootstrap-tweaks.css" %}"/>
+        {% endblock %}
         <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/prettify.css" %}"/>
         <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/default.css" %}"/>
         {% endblock %}
@@ -30,8 +32,8 @@
     <div class="navbar {% block bootstrap_navbar_variant %}navbar-inverse{% endblock %}">
         <div class="navbar-inner">
             <div class="container-fluid">
-                <span class="brand" href="/">
-                    {% block branding %}<a href='http://django-rest-framework.org'>Django REST framework <span class="version">{{ version }}</span></a>{% endblock %}
+                <span href="/">
+                    {% block branding %}<a class='brand' href='http://django-rest-framework.org'>Django REST framework <span class="version">{{ version }}</span></a>{% endblock %}
                 </span>
                 <ul class="nav pull-right">
                     {% block userlinks %}
@@ -109,8 +111,7 @@
         <div class="content-main">
             <div class="page-header"><h1>{{ name }}</h1></div>
             {{ description }}
-
-            <div class="request-info">
+            <div class="request-info" style="clear: both" >
                 <pre class="prettyprint"><b>{{ request.method }}</b> {{ request.get_full_path }}</pre>
             </div>
             <div class="response-info">
diff --git a/rest_framework/templates/rest_framework/login_base.html b/rest_framework/templates/rest_framework/login_base.html
index a3e73b6b6..be9a0072a 100644
--- a/rest_framework/templates/rest_framework/login_base.html
+++ b/rest_framework/templates/rest_framework/login_base.html
@@ -4,8 +4,10 @@
 
     <head>
         {% block style %}
-        {% block bootstrap_theme %}<link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/bootstrap.min.css" %}"/>{% endblock %}
-        <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/bootstrap-tweaks.css" %}"/>
+        {% block bootstrap_theme %}
+            <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/bootstrap.min.css" %}"/>
+            <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/bootstrap-tweaks.css" %}"/>
+        {% endblock %}
         <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/default.css" %}"/>
         {% endblock %}
     </head>

From 770ed3de2ef8339ec0b74f7eb522283718e01a3b Mon Sep 17 00:00:00 2001
From: Ryan Kaskel <dev@ryankaskel.com>
Date: Sat, 18 May 2013 13:11:40 +0100
Subject: [PATCH 066/197] ToMany fields default to read-only if targeting
 ManyToManyField.

---
 docs/api-guide/relations.md          |  9 ++++
 rest_framework/serializers.py        | 17 ++++++++
 rest_framework/tests/relations_pk.py | 63 ++++++++++++++++++++++++++++
 3 files changed, 89 insertions(+)

diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md
index 155c89de3..99fe10834 100644
--- a/docs/api-guide/relations.md
+++ b/docs/api-guide/relations.md
@@ -381,6 +381,15 @@ Note that reverse generic keys, expressed using the `GenericRelation` field, can
 
 For more information see [the Django documentation on generic relations][generic-relations].
 
+## ManyToManyFields with a Through Model
+
+By default, relational fields that target a ``ManyToManyField`` with a
+``through`` model specified are set to read-only.
+
+If you exlicitly specify a relational field pointing to a
+``ManyToManyField`` with a through model, be sure to set ``read_only``
+to ``True``.
+
 ## Advanced Hyperlinked fields
 
 If you have very specific requirements for the style of your hyperlinked relationships you can override `HyperlinkedRelatedField`. 
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 7707de7a7..75f1e1d04 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -587,11 +587,16 @@ class ModelSerializer(Serializer):
         forward_rels += [field for field in opts.many_to_many if field.serialize]
 
         for model_field in forward_rels:
+            has_user_through_model = False
+
             if model_field.rel:
                 to_many = isinstance(model_field,
                                      models.fields.related.ManyToManyField)
                 related_model = model_field.rel.to
 
+                if to_many and not model_field.rel.through._meta.auto_created:
+                    has_user_through_model = True
+
             if model_field.rel and nested:
                 if len(inspect.getargspec(self.get_nested_field).args) == 2:
                     warnings.warn(
@@ -620,6 +625,9 @@ class ModelSerializer(Serializer):
                 field = self.get_field(model_field)
 
             if field:
+                if has_user_through_model:
+                    field.read_only = True
+
                 ret[model_field.name] = field
 
         # Deal with reverse relationships
@@ -637,6 +645,12 @@ class ModelSerializer(Serializer):
                 continue
             related_model = relation.model
             to_many = relation.field.rel.multiple
+            has_user_through_model = False
+            is_m2m = isinstance(relation.field,
+                                models.fields.related.ManyToManyField)
+
+            if is_m2m and not relation.field.rel.through._meta.auto_created:
+                has_user_through_model = True
 
             if nested:
                 field = self.get_nested_field(None, related_model, to_many)
@@ -644,6 +658,9 @@ class ModelSerializer(Serializer):
                 field = self.get_related_field(None, related_model, to_many)
 
             if field:
+                if has_user_through_model:
+                    field.read_only = True
+
                 ret[accessor_name] = field
 
         # Add the `read_only` flag to any fields that have bee specified
diff --git a/rest_framework/tests/relations_pk.py b/rest_framework/tests/relations_pk.py
index 5ce8b5671..02ffd264c 100644
--- a/rest_framework/tests/relations_pk.py
+++ b/rest_framework/tests/relations_pk.py
@@ -1,4 +1,5 @@
 from __future__ import unicode_literals
+from django.db import models
 from django.test import TestCase
 from rest_framework import serializers
 from rest_framework.tests.models import ManyToManyTarget, ManyToManySource, ForeignKeyTarget, ForeignKeySource, NullableForeignKeySource, OneToOneTarget, NullableOneToOneSource
@@ -124,6 +125,7 @@ class PKManyToManyTests(TestCase):
         # Ensure source 4 is added, and everything else is as expected
         queryset = ManyToManySource.objects.all()
         serializer = ManyToManySourceSerializer(queryset, many=True)
+        self.assertFalse(serializer.fields['targets'].read_only)
         expected = [
             {'id': 1, 'name': 'source-1', 'targets': [1]},
             {'id': 2, 'name': 'source-2', 'targets': [1, 2]},
@@ -135,6 +137,7 @@ class PKManyToManyTests(TestCase):
     def test_reverse_many_to_many_create(self):
         data = {'id': 4, 'name': 'target-4', 'sources': [1, 3]}
         serializer = ManyToManyTargetSerializer(data=data)
+        self.assertFalse(serializer.fields['sources'].read_only)
         self.assertTrue(serializer.is_valid())
         obj = serializer.save()
         self.assertEqual(serializer.data, data)
@@ -421,3 +424,63 @@ class PKNullableOneToOneTests(TestCase):
             {'id': 2, 'name': 'target-2', 'nullable_source': 1},
         ]
         self.assertEqual(serializer.data, expected)
+
+
+# The below models and tests ensure that serializer fields corresponding
+# to a ManyToManyField field with a user-specified ``through`` model are
+# set to read only
+
+
+class ManyToManyThroughTarget(models.Model):
+    name = models.CharField(max_length=100)
+
+
+class ManyToManyThrough(models.Model):
+    source = models.ForeignKey('ManyToManyThroughSource')
+    target = models.ForeignKey(ManyToManyThroughTarget)
+
+
+class ManyToManyThroughSource(models.Model):
+    name = models.CharField(max_length=100)
+    targets = models.ManyToManyField(ManyToManyThroughTarget,
+                                     related_name='sources',
+                                     through='ManyToManyThrough')
+
+
+class ManyToManyThroughTargetSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = ManyToManyThroughTarget
+        fields = ('id', 'name', 'sources')
+
+
+class ManyToManyThroughSourceSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = ManyToManyThroughSource
+        fields = ('id', 'name', 'targets')
+
+
+class PKManyToManyThroughTests(TestCase):
+    def setUp(self):
+        self.source = ManyToManyThroughSource.objects.create(
+            name='through-source-1')
+        self.target = ManyToManyThroughTarget.objects.create(
+            name='through-target-1')
+
+    def test_many_to_many_create(self):
+        data = {'id': 2, 'name': 'source-2', 'targets': [self.target.pk]}
+        serializer = ManyToManyThroughSourceSerializer(data=data)
+        self.assertTrue(serializer.fields['targets'].read_only)
+        self.assertTrue(serializer.is_valid())
+        obj = serializer.save()
+        self.assertEqual(obj.name, 'source-2')
+        self.assertEqual(obj.targets.count(), 0)
+
+    def test_many_to_many_reverse_create(self):
+        data = {'id': 2, 'name': 'target-2', 'sources': [self.source.pk]}
+        serializer = ManyToManyThroughTargetSerializer(data=data)
+        self.assertTrue(serializer.fields['sources'].read_only)
+        self.assertTrue(serializer.is_valid())
+        serializer.save()
+        obj = serializer.save()
+        self.assertEqual(obj.name, 'target-2')
+        self.assertEqual(obj.sources.count(), 0)

From 1343398868937ed1e401054a8490bcea57d649d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20T=C3=B6rnqvist?= <mjt+illyria@skyhood.com>
Date: Sat, 18 May 2013 15:15:02 +0300
Subject: [PATCH 067/197] Renderer uses form field's label and help, not
 attribute name

---
 rest_framework/renderers.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py
index 8361cd409..a58025cd1 100644
--- a/rest_framework/renderers.py
+++ b/rest_framework/renderers.py
@@ -366,7 +366,8 @@ class BrowsableAPIRenderer(BaseRenderer):
             if getattr(v, 'default', None) is not None:
                 kwargs['initial'] = v.default
 
-            kwargs['label'] = k
+            kwargs['label'] = v.label
+            kwargs['help_text'] = v.help_text
 
             fields[k] = v.form_field_class(**kwargs)
 

From 72bc5a35569e75468442287e74656e4b18adc163 Mon Sep 17 00:00:00 2001
From: Mark McArdle <mark.mcardle@sohonet.com>
Date: Sat, 18 May 2013 13:19:13 +0100
Subject: [PATCH 068/197] documentation for
 https://github.com/tomchristie/django-rest-framework/issues/775

---
 docs/topics/browsable-api.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/topics/browsable-api.md b/docs/topics/browsable-api.md
index 8ee018249..65f76abcf 100644
--- a/docs/topics/browsable-api.md
+++ b/docs/topics/browsable-api.md
@@ -35,6 +35,17 @@ A suitable replacement theme can be generated using Bootstrap's [Customize Tool]
 
 You can also change the navbar variant, which by default is `navbar-inverse`, using the `bootstrap_navbar_variant` block. The empty `{% block bootstrap_navbar_variant %}{% endblock %}` will use the original Bootstrap navbar style.
 
+Full Example
+
+    {% extends "rest_framework/base.html" %}
+
+    {% block bootstrap_theme %}
+        <link rel="stylesheet" href="/path/to/yourtheme/bootstrap.min.css' type="text/css">
+    {% endblock %}
+
+    {% block bootstrap_navbar_variant %}{% endblock %}
+
+
 For more specific CSS tweaks, use the `style` block instead.
 
 

From 4dbf2d907f9d5e86f7ecddc49a17e45d1f2d9367 Mon Sep 17 00:00:00 2001
From: Oscar Vilaplana <dev@oscarvilaplana.cat>
Date: Sat, 18 May 2013 14:55:55 +0200
Subject: [PATCH 069/197] added comment about error behavior with DEBUG=True

---
 docs/api-guide/renderers.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md
index ed733c653..2a1a6979f 100644
--- a/docs/api-guide/renderers.md
+++ b/docs/api-guide/renderers.md
@@ -272,6 +272,8 @@ Exceptions raised and handled by an HTML renderer will attempt to render using o
 * Load and render a template named `api_exception.html`.
 * Render the HTTP status code and text, for example "404 Not Found".
 
+**Note**: If `DEBUG=True`, Django's standard traceback error page will be displayed instead of rendering the HTTP status code and text.
+
 Templates will render with a `RequestContext` which includes the `status_code` and `details` keys.
 
 ---

From 392c8556aed41df2120623fe1c891610bb111100 Mon Sep 17 00:00:00 2001
From: Pablo Recio <pablo@potatolondon.com>
Date: Sat, 18 May 2013 15:01:58 +0200
Subject: [PATCH 070/197] Display an empty label into related fields if it
 isn't required

---
 rest_framework/relations.py        |  8 ++++-
 rest_framework/tests/serializer.py | 57 ++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/rest_framework/relations.py b/rest_framework/relations.py
index 884b954c4..3aaf66483 100644
--- a/rest_framework/relations.py
+++ b/rest_framework/relations.py
@@ -8,6 +8,7 @@ from __future__ import unicode_literals
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.core.urlresolvers import resolve, get_script_prefix, NoReverseMatch
 from django import forms
+from django.db.models.fields import BLANK_CHOICE_DASH
 from django.forms import widgets
 from django.forms.models import ModelChoiceIterator
 from django.utils.translation import ugettext_lazy as _
@@ -47,7 +48,7 @@ class RelatedField(WritableField):
                           DeprecationWarning, stacklevel=2)
             kwargs['required'] = not kwargs.pop('null')
 
-        self.queryset = kwargs.pop('queryset', None)
+        queryset = kwargs.pop('queryset', None)
         self.many = kwargs.pop('many', self.many)
         if self.many:
             self.widget = self.many_widget
@@ -56,6 +57,11 @@ class RelatedField(WritableField):
         kwargs['read_only'] = kwargs.pop('read_only', self.read_only)
         super(RelatedField, self).__init__(*args, **kwargs)
 
+        if not self.required:
+            self.empty_label = BLANK_CHOICE_DASH[0][1]
+
+        self.queryset = queryset
+
     def initialize(self, parent, field_name):
         super(RelatedField, self).initialize(parent, field_name)
         if self.queryset is None and not self.read_only:
diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index d0a8570ca..69b332094 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -1117,6 +1117,63 @@ class SerializerChoiceFields(TestCase):
         )
 
 
+# Regression tests for #675
+class Ticket(models.Model):
+    assigned = models.ForeignKey(
+        Person, related_name='assigned_tickets')
+    reviewer = models.ForeignKey(
+        Person, blank=True, null=True, related_name='reviewed_tickets')
+
+
+class SerializerRelatedChoicesTest(TestCase):
+
+    def setUp(self):
+        super(SerializerRelatedChoicesTest, self).setUp()
+
+        class RelatedChoicesSerializer(serializers.ModelSerializer):
+            class Meta:
+                model = Ticket
+                fields = ('assigned', 'reviewer')
+
+        self.related_fields_serializer = RelatedChoicesSerializer
+
+    def test_empty_queryset_required(self):
+        serializer = self.related_fields_serializer()
+        self.assertEqual(serializer.fields['assigned'].queryset.count(), 0)
+        self.assertEqual(
+            [x for x in serializer.fields['assigned'].widget.choices],
+            []
+        )
+
+    def test_empty_queryset_not_required(self):
+        serializer = self.related_fields_serializer()
+        self.assertEqual(serializer.fields['reviewer'].queryset.count(), 0)
+        self.assertEqual(
+            [x for x in serializer.fields['reviewer'].widget.choices],
+            [(u'', u'---------')]
+        )
+
+    def test_with_some_persons_required(self):
+        Person.objects.create(name="Lionel Messi")
+        Person.objects.create(name="Xavi Hernandez")
+        serializer = self.related_fields_serializer()
+        self.assertEqual(serializer.fields['assigned'].queryset.count(), 2)
+        self.assertEqual(
+            [x for x in serializer.fields['assigned'].widget.choices],
+            [(1, u'Person object - 1'), (2, u'Person object - 2')]
+        )
+
+    def test_with_some_persons_not_required(self):
+        Person.objects.create(name="Lionel Messi")
+        Person.objects.create(name="Xavi Hernandez")
+        serializer = self.related_fields_serializer()
+        self.assertEqual(serializer.fields['reviewer'].queryset.count(), 2)
+        self.assertEqual(
+            [x for x in serializer.fields['reviewer'].widget.choices],
+            [(u'', u'---------'), (1, u'Person object - 1'), (2, u'Person object - 2')]
+        )
+
+
 class DepthTest(TestCase):
     def test_implicit_nesting(self):
 

From 275bfa2320eeffcfd307daaf7c85faaa0f55a8ee Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Sat, 18 May 2013 14:03:08 +0100
Subject: [PATCH 071/197] Added @grimborg and @ryankask. Go Team. :)

---
 docs/topics/credits.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index 8151b4d3a..62f113c2f 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -124,6 +124,8 @@ The following people have helped make REST framework great.
 * Marlon Bailey - [avinash240]
 * James Summerfield - [jsummerfield]
 * Andy Freeland - [rouge8]
+* Òscar Vilaplana - [grimborg]
+* Ryan Kaskel - [ryankask]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -284,3 +286,5 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [avinash240]: https://github.com/avinash240
 [jsummerfield]: https://github.com/jsummerfield
 [rouge8]: https://github.com/rouge8
+[grimborg]: https://github.com/grimborg
+[ryankask]: https://github.com/ryankask

From a71acc76d8ede28ad9c5f9fd0fc129f6321c9231 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20Gro=C3=9F?= <stephan@minddust.com>
Date: Sat, 18 May 2013 15:12:54 +0200
Subject: [PATCH 072/197] Fix for #710

---
 rest_framework/serializers.py      | 16 ++++++
 rest_framework/tests/serializer.py | 84 +++++++++++++++++++++++++++++-
 2 files changed, 99 insertions(+), 1 deletion(-)

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 500bb3066..1b451f2db 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -723,6 +723,22 @@ class ModelSerializer(Serializer):
             kwargs['choices'] = model_field.flatchoices
             return ChoiceField(**kwargs)
 
+        attribute_dict = {
+            models.CharField: ['max_length'],
+            models.CommaSeparatedIntegerField: ['max_length'],
+            models.DecimalField: ['max_digits', 'decimal_places'],
+            models.EmailField: ['max_length'],
+            models.FileField: ['max_length'],
+            models.ImageField: ['max_length'],
+            models.SlugField: ['max_length'],
+            models.URLField: ['max_length'],
+        }
+
+        if model_field.__class__ in attribute_dict:
+            attributes = attribute_dict[model_field.__class__]
+            for attribute in attributes:
+                kwargs.update({attribute: model_field.__getattribute__(attribute)})
+
         try:
             return self.field_mapping[model_field.__class__](**kwargs)
         except KeyError:
diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index d0a8570ca..73d6a15b3 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -6,7 +6,7 @@ from django.test import TestCase
 from rest_framework import serializers
 from rest_framework.tests.models import (HasPositiveIntegerAsChoice, Album, ActionItem, Anchor, BasicModel,
     BlankFieldModel, BlogPost, BlogPostComment, Book, CallableDefaultValueModel, DefaultValueModel,
-    ManyToManyModel, Person, ReadOnlyManyToManyModel, Photo)
+    ManyToManyModel, Person, ReadOnlyManyToManyModel, Photo, RESTFrameworkModel)
 import datetime
 import pickle
 
@@ -1242,3 +1242,85 @@ class DeserializeListTestCase(TestCase):
         self.assertFalse(serializer.is_valid())
         expected = [{}, {'email': ['This field is required.']}, {}]
         self.assertEqual(serializer.errors, expected)
+
+
+class AttributeMappingOnAutogeneratedFieldsTests(TestCase):
+
+    def setUp(self):
+        class AMOAFModel(RESTFrameworkModel):
+            char_field = models.CharField(max_length=1024, blank=True)
+            comma_separated_integer_field = models.CommaSeparatedIntegerField(max_length=1024, blank=True)
+            decimal_field = models.DecimalField(max_digits=64, decimal_places=32, blank=True)
+            email_field = models.EmailField(max_length=1024, blank=True)
+            file_field = models.FileField(max_length=1024, blank=True)
+            image_field = models.ImageField(max_length=1024, blank=True)
+            slug_field = models.SlugField(max_length=1024, blank=True)
+            url_field = models.URLField(max_length=1024, blank=True)
+
+        class AMOAFSerializer(serializers.ModelSerializer):
+            class Meta:
+                model = AMOAFModel
+
+        self.serializer_class = AMOAFSerializer
+        self.objects = AMOAFModel.objects
+        self.fields_attributes = {
+            'char_field': [
+                ('max_length', 1024),
+            ],
+            'comma_separated_integer_field': [
+                ('max_length', 1024),
+            ],
+            'decimal_field': [
+                ('max_digits', 64),
+                ('decimal_places', 32),
+            ],
+            'email_field': [
+                ('max_length', 1024),
+            ],
+            'file_field': [
+                ('max_length', 1024),
+            ],
+            'image_field': [
+                ('max_length', 1024),
+            ],
+            'slug_field': [
+                ('max_length', 1024),
+            ],
+            'url_field': [
+                ('max_length', 1024),
+            ],
+        }
+
+    def field_test(self, field):
+        serializer = self.serializer_class(data={})
+        self.assertEqual(serializer.is_valid(), True)
+
+        for attribute in self.fields_attributes[field]:
+            self.assertEqual(
+                getattr(serializer.fields[field], attribute[0]),
+                attribute[1]
+            )
+
+    def test_char_field(self):
+        self.field_test('char_field')
+
+    def test_comma_separated_integer_field(self):
+        self.field_test('comma_separated_integer_field')
+
+    def test_decimal_field(self):
+        self.field_test('decimal_field')
+
+    def test_email_field(self):
+        self.field_test('email_field')
+
+    def test_file_field(self):
+        self.field_test('file_field')
+
+    def test_image_field(self):
+        self.field_test('image_field')
+
+    def test_slug_field(self):
+        self.field_test('slug_field')
+
+    def test_url_field(self):
+        self.field_test('url_field')

From 208bd991dacb6c2edc9fc820717354c579c2e6d6 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig.destigter@koordinates.com>
Date: Sat, 18 May 2013 15:23:43 +0200
Subject: [PATCH 073/197] when source='*' on a nested serializer, expand fields
 into outer serializer when writing. fixes #765

---
 rest_framework/serializers.py      | 34 +++++++++++++++++-------------
 rest_framework/tests/serializer.py | 22 +++++++++++++++++++
 2 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 7707de7a7..ef099e579 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -378,23 +378,27 @@ class BaseSerializer(WritableField):
         # Set the serializer object if it exists
         obj = getattr(self.parent.object, field_name) if self.parent.object else None
 
-        if value in (None, ''):
-            into[(self.source or field_name)] = None
+        if self.source == '*':
+            if value:
+                into.update(value)
         else:
-            kwargs = {
-                'instance': obj,
-                'data': value,
-                'context': self.context,
-                'partial': self.partial,
-                'many': self.many
-            }
-            serializer = self.__class__(**kwargs)
-
-            if serializer.is_valid():
-                into[self.source or field_name] = serializer.object
+            if value in (None, ''):
+                into[(self.source or field_name)] = None
             else:
-                # Propagate errors up to our parent
-                raise NestedValidationError(serializer.errors)
+                kwargs = {
+                    'instance': obj,
+                    'data': value,
+                    'context': self.context,
+                    'partial': self.partial,
+                    'many': self.many
+                }
+                serializer = self.__class__(**kwargs)
+
+                if serializer.is_valid():
+                    into[self.source or field_name] = serializer.object
+                else:
+                    # Propagate errors up to our parent
+                    raise NestedValidationError(serializer.errors)
 
     def get_identity(self, data):
         """
diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 34acbaab4..116459e04 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -78,6 +78,17 @@ class PersonSerializer(serializers.ModelSerializer):
         read_only_fields = ('age',)
 
 
+class NestedSerializer(serializers.Serializer):
+    info = serializers.Field()
+
+
+class ModelSerializerWithNestedSerializer(serializers.ModelSerializer):
+    nested = NestedSerializer(source='*')
+
+    class Meta:
+        model = Person
+
+
 class PersonSerializerInvalidReadOnly(serializers.ModelSerializer):
     """
     Testing for #652.
@@ -369,6 +380,17 @@ class ValidationTests(TestCase):
         except:
             self.fail('Wrong exception type thrown.')
 
+    def test_writable_star_source_on_nested_serializer(self):
+        """
+        Assert that a nested serializer instantiated with source='*' correctly
+        expands the data into the outer serializer.
+        """
+        serializer = ModelSerializerWithNestedSerializer(data={
+            'name': 'marko',
+            'nested': {'info': 'hi'}},
+        )
+        self.assertEqual(serializer.is_valid(), True)
+
 
 class CustomValidationTests(TestCase):
     class CommentSerializerWithFieldValidator(CommentSerializer):

From ef383d969c440a20fdf25748de590e07cb1abfda Mon Sep 17 00:00:00 2001
From: Ryan Kaskel <dev@ryankaskel.com>
Date: Sat, 18 May 2013 14:31:29 +0100
Subject: [PATCH 074/197] Clean up test case.

---
 rest_framework/tests/serializer.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index d978dc872..e999b624b 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -1,8 +1,9 @@
 from __future__ import unicode_literals
 from django.db import models
 from django.db.models.fields import BLANK_CHOICE_DASH
-from django.utils.datastructures import MultiValueDict
 from django.test import TestCase
+from django.utils.datastructures import MultiValueDict
+from django.utils.translation import ugettext_lazy as _
 from rest_framework import serializers
 from rest_framework.tests.models import (HasPositiveIntegerAsChoice, Album, ActionItem, Anchor, BasicModel,
     BlankFieldModel, BlogPost, BlogPostComment, Book, CallableDefaultValueModel, DefaultValueModel,
@@ -1246,6 +1247,7 @@ class DeserializeListTestCase(TestCase):
 
 # test for issue 747
 
+
 class LazyStringModel(object):
     def __init__(self, lazystring):
         self.lazystring = lazystring
@@ -1258,16 +1260,14 @@ class LazyStringSerializer(serializers.Serializer):
         if instance is not None:
             instance.lazystring = attrs.get('lazystring', instance.lazystring)
             return instance
-        return Comment(**attrs)
+        return LazyStringModel(**attrs)
 
 
 class LazyStringsTestCase(TestCase):
-
     def setUp(self):
-        from django.utils.translation import ugettext_lazy as _
-
-        self.model = LazyStringModel(lazystring=_("lazystring"))
+        self.model = LazyStringModel(lazystring=_('lazystring'))
 
     def test_lazy_strings_are_translated(self):
         serializer = LazyStringSerializer(self.model)
-        self.assertEqual(type(serializer.data['lazystring']), type("lazystring"))
+        self.assertEqual(type(serializer.data['lazystring']),
+                         type('lazystring'))

From 2e8ff4473bbfe4c8d7ead59e299a663d1a493478 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Sat, 18 May 2013 14:47:39 +0100
Subject: [PATCH 075/197] Tweak docs

---
 docs/api-guide/renderers.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md
index 2a1a6979f..b9a9fd7a3 100644
--- a/docs/api-guide/renderers.md
+++ b/docs/api-guide/renderers.md
@@ -272,10 +272,10 @@ Exceptions raised and handled by an HTML renderer will attempt to render using o
 * Load and render a template named `api_exception.html`.
 * Render the HTTP status code and text, for example "404 Not Found".
 
-**Note**: If `DEBUG=True`, Django's standard traceback error page will be displayed instead of rendering the HTTP status code and text.
-
 Templates will render with a `RequestContext` which includes the `status_code` and `details` keys.
 
+**Note**: If `DEBUG=True`, Django's standard traceback error page will be displayed instead of rendering the HTTP status code and text.
+
 ---
 
 # Third party packages

From e6409bbc836cbe61be7f525900f5bc0616f5c225 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20Gro=C3=9F?= <stephan@minddust.com>
Date: Sat, 18 May 2013 15:48:36 +0200
Subject: [PATCH 076/197] Temp commit for branch change ;-)

---
 rest_framework/tests/fields.py | 61 ++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/rest_framework/tests/fields.py b/rest_framework/tests/fields.py
index 6b1cdfc77..cb5b05dc7 100644
--- a/rest_framework/tests/fields.py
+++ b/rest_framework/tests/fields.py
@@ -10,6 +10,7 @@ from django.test import TestCase
 from django.core import validators
 from rest_framework import serializers
 from rest_framework.serializers import Serializer
+from rest_framework.tests.models import RESTFrameworkModel
 
 
 class TimestampedModel(models.Model):
@@ -685,3 +686,63 @@ class ChoiceFieldTests(TestCase):
         """
         f = serializers.ChoiceField(required=False, choices=self.SAMPLE_CHOICES)
         self.assertEqual(f.choices, models.fields.BLANK_CHOICE_DASH + self.SAMPLE_CHOICES)
+
+
+class SlugFieldTests(TestCase):
+    """
+    Tests for SlugField attribute values
+    """
+
+    def test_default_value(self):
+        class SlugFieldModel(RESTFrameworkModel):
+            slug_field = models.SlugField(blank=True)
+
+        class SlugFieldSerializer(serializers.ModelSerializer):
+            class Meta:
+                model = SlugFieldModel
+
+        serializer = SlugFieldSerializer(data={})
+        self.assertEqual(serializer.is_valid(), True)
+        self.assertEqual(getattr(serializer.fields['slug_field'], 'max_length'), 50)
+
+    def test_given_value(self):
+        class SlugFieldModel(RESTFrameworkModel):
+            slug_field = models.SlugField(max_length=84, blank=True)
+
+        class SlugFieldSerializer(serializers.ModelSerializer):
+            class Meta:
+                model = SlugFieldModel
+
+        serializer = SlugFieldSerializer(data={})
+        self.assertEqual(serializer.is_valid(), True)
+        self.assertEqual(getattr(serializer.fields['slug_field'], 'max_length'), 84)
+
+
+class URLFieldTests(TestCase):
+    """
+    Tests for URLField attribute values
+    """
+
+    def test_default_value(self):
+        class URLFieldModel(RESTFrameworkModel):
+            url_field = models.URLField(blank=True)
+
+        class URLFieldSerializer(serializers.ModelSerializer):
+            class Meta:
+                model = URLFieldModel
+
+        serializer = URLFieldSerializer(data={})
+        self.assertEqual(serializer.is_valid(), True)
+        self.assertEqual(getattr(serializer.fields['url_field'], 'max_length'), 200)
+
+    def test_given_value(self):
+        class URLFieldModel(RESTFrameworkModel):
+            url_field = models.URLField(max_length=128, blank=True)
+
+        class URLFieldSerializer(serializers.ModelSerializer):
+            class Meta:
+                model = URLFieldModel
+
+        serializer = URLFieldSerializer(data={})
+        self.assertEqual(serializer.is_valid(), True)
+        self.assertEqual(getattr(serializer.fields['url_field'], 'max_length'), 128)
\ No newline at end of file

From eb9fdd04fceac322af92bd196293390270653ccd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20Gro=C3=9F?= <stephan@minddust.com>
Date: Sat, 18 May 2013 15:50:12 +0200
Subject: [PATCH 077/197] Remove unused var

---
 rest_framework/tests/serializer.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 73d6a15b3..8b487b54c 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -1262,7 +1262,6 @@ class AttributeMappingOnAutogeneratedFieldsTests(TestCase):
                 model = AMOAFModel
 
         self.serializer_class = AMOAFSerializer
-        self.objects = AMOAFModel.objects
         self.fields_attributes = {
             'char_field': [
                 ('max_length', 1024),

From e7ddaf5472ba3746da2a0e9dfed6326fc90ce08e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20T=C3=B6rnqvist?= <mjt+illyria@skyhood.com>
Date: Sat, 18 May 2013 16:50:59 +0300
Subject: [PATCH 078/197] Turns out label and help_text are not always there

---
 rest_framework/renderers.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py
index a58025cd1..2b56d6e41 100644
--- a/rest_framework/renderers.py
+++ b/rest_framework/renderers.py
@@ -366,8 +366,11 @@ class BrowsableAPIRenderer(BaseRenderer):
             if getattr(v, 'default', None) is not None:
                 kwargs['initial'] = v.default
 
-            kwargs['label'] = v.label
-            kwargs['help_text'] = v.help_text
+            if getattr(v, 'label', None) is not None:
+                kwargs['label'] = v.label
+
+            if getattr(v, 'help_text', None) is not None:
+                kwargs['help_text'] = v.help_text
 
             fields[k] = v.form_field_class(**kwargs)
 

From 80a2600891aab2211c8c4bf3ce78e3c1d5c6de72 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Sat, 18 May 2013 14:55:48 +0100
Subject: [PATCH 079/197] Styling tweaks

---
 rest_framework/static/rest_framework/css/bootstrap-tweaks.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rest_framework/static/rest_framework/css/bootstrap-tweaks.css b/rest_framework/static/rest_framework/css/bootstrap-tweaks.css
index 69e1e70d7..9b5201564 100644
--- a/rest_framework/static/rest_framework/css/bootstrap-tweaks.css
+++ b/rest_framework/static/rest_framework/css/bootstrap-tweaks.css
@@ -37,7 +37,7 @@ a single block in the template.
   border-radius: 0px;
 }
 
-.navbar .navbar-inner .nav li, .navbar .navbar-inner .nav li a, .navbar .navbar-inner .brand{
+.navbar .navbar-inner .nav li, .navbar .navbar-inner .nav li a, .navbar .navbar-inner .brand:hover{
   color: white;
 }
 
@@ -178,4 +178,4 @@ body a:hover{
 
 .request-info {
     clear:both;
-}
\ No newline at end of file
+}

From e2d3aa65d78511b526ecac24bf4198dfa4f27c16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20T=C3=B6rnqvist?= <mjt+illyria@skyhood.com>
Date: Sat, 18 May 2013 16:56:26 +0300
Subject: [PATCH 080/197] Move and rename LabelModelSerializer for further
 reuse

---
 rest_framework/tests/models.py     | 7 +++++++
 rest_framework/tests/serializer.py | 7 ++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/rest_framework/tests/models.py b/rest_framework/tests/models.py
index 3465268b6..486ec7613 100644
--- a/rest_framework/tests/models.py
+++ b/rest_framework/tests/models.py
@@ -1,6 +1,7 @@
 from __future__ import unicode_literals
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
+from rest_framework import serializers
 
 
 def foobar():
@@ -160,3 +161,9 @@ class NullableOneToOneSource(RESTFrameworkModel):
     name = models.CharField(max_length=100)
     target = models.OneToOneField(OneToOneTarget, null=True, blank=True,
                                   related_name='nullable_source')
+
+# Serializer used to test BasicModel
+class BasicModelSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = BasicModel
+
diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index fc433a8f2..343b958a8 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -5,6 +5,7 @@ from rest_framework import serializers, fields, relations
 from rest_framework.tests.models import (HasPositiveIntegerAsChoice, Album, ActionItem, Anchor, BasicModel,
     BlankFieldModel, BlogPost, BlogPostComment, Book, CallableDefaultValueModel, DefaultValueModel,
     ManyToManyModel, Person, ReadOnlyManyToManyModel, Photo)
+from rest_framework.tests.models import BasicModelSerializer
 import datetime
 import pickle
 
@@ -1148,11 +1149,7 @@ class DeserializeListTestCase(TestCase):
 # Test for issue #467
 class FieldLabelTest(TestCase):
     def setUp(self):
-        class LabelModelSerializer(serializers.ModelSerializer):
-            class Meta:
-                model = BasicModel
-
-        self.serializer_class = LabelModelSerializer
+        self.serializer_class = BasicModelSerializer
 
     def test_label_from_model(self):
         """

From b7176065a9aafb3d560f9e8c2e420bd4cc5841dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20Gro=C3=9F?= <stephan@minddust.com>
Date: Sat, 18 May 2013 16:06:30 +0200
Subject: [PATCH 081/197] Update getattr

---
 rest_framework/serializers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 1b451f2db..338803fe4 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -737,7 +737,7 @@ class ModelSerializer(Serializer):
         if model_field.__class__ in attribute_dict:
             attributes = attribute_dict[model_field.__class__]
             for attribute in attributes:
-                kwargs.update({attribute: model_field.__getattribute__(attribute)})
+                kwargs.update({attribute: getattr(model_field, attribute)})
 
         try:
             return self.field_mapping[model_field.__class__](**kwargs)

From aeba5bed05e37344caf15adff180fc48404d992d Mon Sep 17 00:00:00 2001
From: Andy McKay <amckay@mozilla.com>
Date: Sat, 18 May 2013 07:09:24 -0700
Subject: [PATCH 082/197] startswith can take a tuple

---
 rest_framework/relations.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rest_framework/relations.py b/rest_framework/relations.py
index 884b954c4..c7256587e 100644
--- a/rest_framework/relations.py
+++ b/rest_framework/relations.py
@@ -442,7 +442,7 @@ class HyperlinkedRelatedField(RelatedField):
             raise Exception('Writable related fields must include a `queryset` argument')
 
         try:
-            http_prefix = value.startswith('http:') or value.startswith('https:')
+            http_prefix = value.startswith(('http:', 'https:'))
         except AttributeError:
             msg = self.error_messages['incorrect_type']
             raise ValidationError(msg % type(value).__name__)

From 7dca0e68591569c2838e383f15f690f5891509b1 Mon Sep 17 00:00:00 2001
From: Pablo Recio <pablo@potatolondon.com>
Date: Sat, 18 May 2013 16:12:48 +0200
Subject: [PATCH 083/197] Removed unicode literals

---
 rest_framework/tests/serializer.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 50b06582a..96f184516 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -1172,7 +1172,7 @@ class SerializerRelatedChoicesTest(TestCase):
         self.assertEqual(serializer.fields['reviewer'].queryset.count(), 0)
         self.assertEqual(
             [x for x in serializer.fields['reviewer'].widget.choices],
-            [(u'', u'---------')]
+            [('', '---------')]
         )
 
     def test_with_some_persons_required(self):
@@ -1182,7 +1182,7 @@ class SerializerRelatedChoicesTest(TestCase):
         self.assertEqual(serializer.fields['assigned'].queryset.count(), 2)
         self.assertEqual(
             [x for x in serializer.fields['assigned'].widget.choices],
-            [(1, u'Person object - 1'), (2, u'Person object - 2')]
+            [(1, 'Person object - 1'), (2, 'Person object - 2')]
         )
 
     def test_with_some_persons_not_required(self):
@@ -1192,7 +1192,7 @@ class SerializerRelatedChoicesTest(TestCase):
         self.assertEqual(serializer.fields['reviewer'].queryset.count(), 2)
         self.assertEqual(
             [x for x in serializer.fields['reviewer'].widget.choices],
-            [(u'', u'---------'), (1, u'Person object - 1'), (2, u'Person object - 2')]
+            [('', '---------'), (1, 'Person object - 1'), (2, 'Person object - 2')]
         )
 
 

From 3ba43b960ecacda1121670440a38c2883815bad2 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Sat, 18 May 2013 16:19:05 +0200
Subject: [PATCH 084/197] Added @andymckay for refactoring #860

---
 docs/topics/credits.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index bba78ba8c..d805c0c1d 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -129,6 +129,7 @@ The following people have helped make REST framework great.
 * Brian Zambrano - [brianz]
 * Òscar Vilaplana - [grimborg]
 * Ryan Kaskel - [ryankask]
+* Andy McKay - [andymckay]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -294,3 +295,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [brianz]: https://github.com/brianz
 [grimborg]: https://github.com/grimborg
 [ryankask]: https://github.com/ryankask
+[andymckay]: https://github.com/andymckay

From f8c1481d4b927d8cd16406d805597ded44bb3f1c Mon Sep 17 00:00:00 2001
From: Nikolaus Schlemm <capo@coder-nostra.com>
Date: Sat, 18 May 2013 16:21:25 +0200
Subject: [PATCH 085/197] expose the fields metadata via OPTIONS as described
 in https://github.com/tomchristie/django-rest-framework/issues/192

missing:
 - get fields for method (currently all the same)
 - tests
 - right placement of code
---
 rest_framework/views.py | 41 ++++++++++++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/rest_framework/views.py b/rest_framework/views.py
index 555fa2f40..2dd2c59e9 100644
--- a/rest_framework/views.py
+++ b/rest_framework/views.py
@@ -8,7 +8,7 @@ from django.views.decorators.csrf import csrf_exempt
 from rest_framework import status, exceptions
 from rest_framework.compat import View
 from rest_framework.response import Response
-from rest_framework.request import Request
+from rest_framework.request import clone_request, Request
 from rest_framework.settings import api_settings
 from rest_framework.utils.formatting import get_view_name, get_view_description
 
@@ -52,19 +52,42 @@ class APIView(View):
         }
 
     def metadata(self, request):
-        return {
+        content = {
             'name': get_view_name(self.__class__),
             'description': get_view_description(self.__class__),
             'renders': [renderer.media_type for renderer in self.renderer_classes],
             'parses': [parser.media_type for parser in self.parser_classes],
         }
-        #  TODO: Add 'fields', from serializer info, if it exists.
-        # serializer = self.get_serializer()
-        # if serializer is not None:
-        #     field_name_types = {}
-        #     for name, field in form.fields.iteritems():
-        #         field_name_types[name] = field.__class__.__name__
-        #     content['fields'] = field_name_types
+        action_metadata = self._generate_action_metadata(request)
+        if action_metadata is not None:
+            content['actions'] = action_metadata
+
+        return content
+
+    def _generate_action_metadata(self, request):
+        '''
+        Helper for generating the fields metadata for allowed and permitted methods.
+        '''
+        actions = {}
+
+        for method in self.allowed_methods:
+            cloned_request = clone_request(request, method)
+            try:
+                self.check_permissions(cloned_request)
+
+                # TODO: find right placement - APIView does not have get_serializer
+                serializer = self.get_serializer()
+                if serializer is not None:
+                    field_name_types = {}
+                    for name, field in serializer.fields.iteritems():
+                        field_name_types[name] = field.__class__.__name__
+
+                actions[method] = field_name_types
+            except:
+                # don't add this method
+                pass
+
+        return actions if len(actions) > 0 else None
 
     def http_method_not_allowed(self, request, *args, **kwargs):
         """

From 9f9cb97d6538e320a0740749b200d418d9d52040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20Gro=C3=9F?= <stephan@minddust.com>
Date: Sat, 18 May 2013 16:24:54 +0200
Subject: [PATCH 086/197] Add TestCases for default field values

---
 rest_framework/fields.py       |   2 -
 rest_framework/tests/fields.py | 101 ++++++++++++++++++++++++++-------
 2 files changed, 82 insertions(+), 21 deletions(-)

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 491aa7eda..fc14184cc 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -383,7 +383,6 @@ class URLField(CharField):
     type_name = 'URLField'
 
     def __init__(self, **kwargs):
-        kwargs['max_length'] = kwargs.get('max_length', 200)
         kwargs['validators'] = [validators.URLValidator()]
         super(URLField, self).__init__(**kwargs)
 
@@ -392,7 +391,6 @@ class SlugField(CharField):
     type_name = 'SlugField'
 
     def __init__(self, *args, **kwargs):
-        kwargs['max_length'] = kwargs.get('max_length', 50)
         super(SlugField, self).__init__(*args, **kwargs)
 
 
diff --git a/rest_framework/tests/fields.py b/rest_framework/tests/fields.py
index cb5b05dc7..d82f6b235 100644
--- a/rest_framework/tests/fields.py
+++ b/rest_framework/tests/fields.py
@@ -688,61 +688,124 @@ class ChoiceFieldTests(TestCase):
         self.assertEqual(f.choices, models.fields.BLANK_CHOICE_DASH + self.SAMPLE_CHOICES)
 
 
+class EmailFieldTests(TestCase):
+    """
+    Tests for EmailField attribute values
+    """
+
+    class EmailFieldModel(RESTFrameworkModel):
+        email_field = models.EmailField(blank=True)
+
+    class EmailFieldWithGivenMaxLengthModel(RESTFrameworkModel):
+        email_field = models.EmailField(max_length=150, blank=True)
+
+    def test_default_model_value(self):
+        class EmailFieldSerializer(serializers.ModelSerializer):
+            class Meta:
+                model = self.EmailFieldModel
+
+        serializer = EmailFieldSerializer(data={})
+        self.assertEqual(serializer.is_valid(), True)
+        self.assertEqual(getattr(serializer.fields['email_field'], 'max_length'), 75)
+
+    def test_given_model_value(self):
+        class EmailFieldSerializer(serializers.ModelSerializer):
+            class Meta:
+                model = self.EmailFieldWithGivenMaxLengthModel
+
+        serializer = EmailFieldSerializer(data={})
+        self.assertEqual(serializer.is_valid(), True)
+        self.assertEqual(getattr(serializer.fields['email_field'], 'max_length'), 150)
+
+    def test_given_serializer_value(self):
+        class EmailFieldSerializer(serializers.ModelSerializer):
+            email_field = serializers.EmailField(source='email_field', max_length=20, required=False)
+
+            class Meta:
+                model = self.EmailFieldModel
+
+        serializer = EmailFieldSerializer(data={})
+        self.assertEqual(serializer.is_valid(), True)
+        self.assertEqual(getattr(serializer.fields['email_field'], 'max_length'), 20)
+
+
 class SlugFieldTests(TestCase):
     """
     Tests for SlugField attribute values
     """
 
-    def test_default_value(self):
-        class SlugFieldModel(RESTFrameworkModel):
-            slug_field = models.SlugField(blank=True)
+    class SlugFieldModel(RESTFrameworkModel):
+        slug_field = models.SlugField(blank=True)
 
+    class SlugFieldWithGivenMaxLengthModel(RESTFrameworkModel):
+        slug_field = models.SlugField(max_length=84, blank=True)
+
+    def test_default_model_value(self):
         class SlugFieldSerializer(serializers.ModelSerializer):
             class Meta:
-                model = SlugFieldModel
+                model = self.SlugFieldModel
 
         serializer = SlugFieldSerializer(data={})
         self.assertEqual(serializer.is_valid(), True)
         self.assertEqual(getattr(serializer.fields['slug_field'], 'max_length'), 50)
 
-    def test_given_value(self):
-        class SlugFieldModel(RESTFrameworkModel):
-            slug_field = models.SlugField(max_length=84, blank=True)
-
+    def test_given_model_value(self):
         class SlugFieldSerializer(serializers.ModelSerializer):
             class Meta:
-                model = SlugFieldModel
+                model = self.SlugFieldWithGivenMaxLengthModel
 
         serializer = SlugFieldSerializer(data={})
         self.assertEqual(serializer.is_valid(), True)
         self.assertEqual(getattr(serializer.fields['slug_field'], 'max_length'), 84)
 
+    def test_given_serializer_value(self):
+        class SlugFieldSerializer(serializers.ModelSerializer):
+            slug_field = serializers.SlugField(source='slug_field', max_length=20, required=False)
+
+            class Meta:
+                model = self.SlugFieldModel
+
+        serializer = SlugFieldSerializer(data={})
+        self.assertEqual(serializer.is_valid(), True)
+        self.assertEqual(getattr(serializer.fields['slug_field'], 'max_length'), 20)
+
 
 class URLFieldTests(TestCase):
     """
     Tests for URLField attribute values
     """
 
-    def test_default_value(self):
-        class URLFieldModel(RESTFrameworkModel):
-            url_field = models.URLField(blank=True)
+    class URLFieldModel(RESTFrameworkModel):
+        url_field = models.URLField(blank=True)
 
+    class URLFieldWithGivenMaxLengthModel(RESTFrameworkModel):
+        url_field = models.URLField(max_length=128, blank=True)
+
+    def test_default_model_value(self):
         class URLFieldSerializer(serializers.ModelSerializer):
             class Meta:
-                model = URLFieldModel
+                model = self.URLFieldModel
 
         serializer = URLFieldSerializer(data={})
         self.assertEqual(serializer.is_valid(), True)
         self.assertEqual(getattr(serializer.fields['url_field'], 'max_length'), 200)
 
-    def test_given_value(self):
-        class URLFieldModel(RESTFrameworkModel):
-            url_field = models.URLField(max_length=128, blank=True)
-
+    def test_given_model_value(self):
         class URLFieldSerializer(serializers.ModelSerializer):
             class Meta:
-                model = URLFieldModel
+                model = self.URLFieldWithGivenMaxLengthModel
 
         serializer = URLFieldSerializer(data={})
         self.assertEqual(serializer.is_valid(), True)
-        self.assertEqual(getattr(serializer.fields['url_field'], 'max_length'), 128)
\ No newline at end of file
+        self.assertEqual(getattr(serializer.fields['url_field'], 'max_length'), 128)
+
+    def test_given_serializer_value(self):
+        class URLFieldSerializer(serializers.ModelSerializer):
+            url_field = serializers.URLField(source='url_field', max_length=20, required=False)
+
+            class Meta:
+                model = self.URLFieldWithGivenMaxLengthModel
+
+        serializer = URLFieldSerializer(data={})
+        self.assertEqual(serializer.is_valid(), True)
+        self.assertEqual(getattr(serializer.fields['url_field'], 'max_length'), 20)
\ No newline at end of file

From 5f8d353f0b4e0938866a1e954bbd762f383d893b Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Sat, 18 May 2013 15:25:49 +0100
Subject: [PATCH 087/197] Rename has_user_through_model -> has_through_model

---
 rest_framework/serializers.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 3087d4e62..ff5eb8732 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -591,7 +591,7 @@ class ModelSerializer(Serializer):
         forward_rels += [field for field in opts.many_to_many if field.serialize]
 
         for model_field in forward_rels:
-            has_user_through_model = False
+            has_through_model = False
 
             if model_field.rel:
                 to_many = isinstance(model_field,
@@ -599,7 +599,7 @@ class ModelSerializer(Serializer):
                 related_model = model_field.rel.to
 
                 if to_many and not model_field.rel.through._meta.auto_created:
-                    has_user_through_model = True
+                    has_through_model = True
 
             if model_field.rel and nested:
                 if len(inspect.getargspec(self.get_nested_field).args) == 2:
@@ -629,7 +629,7 @@ class ModelSerializer(Serializer):
                 field = self.get_field(model_field)
 
             if field:
-                if has_user_through_model:
+                if has_through_model:
                     field.read_only = True
 
                 ret[model_field.name] = field
@@ -649,12 +649,12 @@ class ModelSerializer(Serializer):
                 continue
             related_model = relation.model
             to_many = relation.field.rel.multiple
-            has_user_through_model = False
+            has_through_model = False
             is_m2m = isinstance(relation.field,
                                 models.fields.related.ManyToManyField)
 
             if is_m2m and not relation.field.rel.through._meta.auto_created:
-                has_user_through_model = True
+                has_through_model = True
 
             if nested:
                 field = self.get_nested_field(None, related_model, to_many)
@@ -662,7 +662,7 @@ class ModelSerializer(Serializer):
                 field = self.get_related_field(None, related_model, to_many)
 
             if field:
-                if has_user_through_model:
+                if has_through_model:
                     field.read_only = True
 
                 ret[accessor_name] = field

From aeea32030b53eb73547696783cc6eb0d3e14f156 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20Gro=C3=9F?= <stephan@minddust.com>
Date: Sat, 18 May 2013 16:27:11 +0200
Subject: [PATCH 088/197] Add newline

---
 rest_framework/tests/fields.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rest_framework/tests/fields.py b/rest_framework/tests/fields.py
index d82f6b235..109fd01f7 100644
--- a/rest_framework/tests/fields.py
+++ b/rest_framework/tests/fields.py
@@ -808,4 +808,5 @@ class URLFieldTests(TestCase):
 
         serializer = URLFieldSerializer(data={})
         self.assertEqual(serializer.is_valid(), True)
-        self.assertEqual(getattr(serializer.fields['url_field'], 'max_length'), 20)
\ No newline at end of file
+        self.assertEqual(getattr(serializer.fields['url_field'], 'max_length'), 20
+                         
\ No newline at end of file

From 6714b755f4938e998907e3d949c832f77a76fadc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20Gro=C3=9F?= <stephan@minddust.com>
Date: Sat, 18 May 2013 16:32:31 +0200
Subject: [PATCH 089/197] Fix missing para..

---
 rest_framework/tests/fields.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/rest_framework/tests/fields.py b/rest_framework/tests/fields.py
index 109fd01f7..dad69975f 100644
--- a/rest_framework/tests/fields.py
+++ b/rest_framework/tests/fields.py
@@ -808,5 +808,4 @@ class URLFieldTests(TestCase):
 
         serializer = URLFieldSerializer(data={})
         self.assertEqual(serializer.is_valid(), True)
-        self.assertEqual(getattr(serializer.fields['url_field'], 'max_length'), 20
-                         
\ No newline at end of file
+        self.assertEqual(getattr(serializer.fields['url_field'], 'max_length'), 20)

From e2a5ec035070755b4dc87dce65b46fa987138c31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20T=C3=B6rnqvist?= <mjt+illyria@skyhood.com>
Date: Sat, 18 May 2013 17:42:54 +0300
Subject: [PATCH 090/197] Change BasicModel.verbose_name

Isn't it nicer to test for a text which is different from
what the previous broken behavior was? Now we can really
tell it works!
---
 rest_framework/tests/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rest_framework/tests/models.py b/rest_framework/tests/models.py
index 486ec7613..abf50a2de 100644
--- a/rest_framework/tests/models.py
+++ b/rest_framework/tests/models.py
@@ -34,7 +34,7 @@ class Anchor(RESTFrameworkModel):
 
 
 class BasicModel(RESTFrameworkModel):
-    text = models.CharField(max_length=100, verbose_name=_("Text"), help_text=_("Text description."))
+    text = models.CharField(max_length=100, verbose_name=_("Text comes here"), help_text=_("Text description."))
 
 
 class SlugBasedModel(RESTFrameworkModel):

From e68ea16d7a8b94b2e975d3b4407059f02906bca3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20T=C3=B6rnqvist?= <mjt+illyria@skyhood.com>
Date: Sat, 18 May 2013 17:43:47 +0300
Subject: [PATCH 091/197] Update FieldLabelTest to use new
 BasicModel.verbose_name

---
 rest_framework/tests/serializer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 343b958a8..59859ad7a 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -1158,7 +1158,7 @@ class FieldLabelTest(TestCase):
         serializer = self.serializer_class()
         text_field = serializer.fields['text']
 
-        self.assertEquals(u'Text', text_field.label)
+        self.assertEquals(u'Text comes here', text_field.label)
         self.assertEquals(u'Text description.', text_field.help_text)
 
     def test_field_ctor(self):

From 2795e842d60c4f1759129ab46bad6ba3e62195aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20T=C3=B6rnqvist?= <mjt+illyria@skyhood.com>
Date: Sat, 18 May 2013 17:44:40 +0300
Subject: [PATCH 092/197] Two test cases for html rendering of API with
 labelized model

---
 rest_framework/tests/response.py | 45 ++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/rest_framework/tests/response.py b/rest_framework/tests/response.py
index aecf83f4e..d49aaa1f9 100644
--- a/rest_framework/tests/response.py
+++ b/rest_framework/tests/response.py
@@ -1,14 +1,18 @@
 from __future__ import unicode_literals
 from django.test import TestCase
+from rest_framework.tests.models import BasicModel, BasicModelSerializer
 from rest_framework.compat import patterns, url, include
 from rest_framework.response import Response
 from rest_framework.views import APIView
+from rest_framework import generics
+from rest_framework import routers
 from rest_framework import status
 from rest_framework.renderers import (
     BaseRenderer,
     JSONRenderer,
     BrowsableAPIRenderer
 )
+from rest_framework import viewsets
 from rest_framework.settings import api_settings
 from rest_framework.compat import six
 
@@ -65,11 +69,27 @@ class HTMLView1(APIView):
         return Response('text')
 
 
+class HTMLNewModelViewSet(viewsets.ModelViewSet):
+    model = BasicModel
+
+
+class HTMLNewModelView(generics.ListCreateAPIView):
+    renderer_classes = (BrowsableAPIRenderer,)
+    permission_classes = []
+    serializer_class = BasicModelSerializer
+    model = BasicModel
+
+
+new_model_viewset_router = routers.DefaultRouter()
+new_model_viewset_router.register(r'', HTMLNewModelViewSet)
+
 urlpatterns = patterns('',
     url(r'^.*\.(?P<format>.+)$', MockView.as_view(renderer_classes=[RendererA, RendererB])),
     url(r'^$', MockView.as_view(renderer_classes=[RendererA, RendererB])),
     url(r'^html$', HTMLView.as_view()),
     url(r'^html1$', HTMLView1.as_view()),
+    url(r'^html_new_model$', HTMLNewModelView.as_view()),
+    url(r'^html_new_model_viewset', include(new_model_viewset_router.urls)),
     url(r'^restframework', include('rest_framework.urls', namespace='rest_framework'))
 )
 
@@ -173,3 +193,28 @@ class Issue122Tests(TestCase):
         Test if no infinite recursion occurs.
         """
         self.client.get('/html1')
+
+
+class Issue467Tests(TestCase):
+    """
+    Tests for #467
+    """
+
+    urls = 'rest_framework.tests.response'
+
+    def test_viewset_label_help_text(self):
+        param = '?%s=%s' % (
+            api_settings.URL_ACCEPT_OVERRIDE,
+            'text/html'
+        )
+        resp = self.client.get('/html_new_model_viewset/' + param)
+        self.assertEqual(resp['Content-Type'], 'text/html')
+        self.assertContains(resp, 'Text comes here')
+        self.assertContains(resp, 'Text description.')
+
+    def test_form_has_label_and_help_text(self):
+        resp = self.client.get('/html_new_model')
+        self.assertEqual(resp['Content-Type'], 'text/html')
+        self.assertContains(resp, 'Text comes here')
+        self.assertContains(resp, 'Text description.')
+

From ebe959b52a10a88975b15c69275b0ef5c50cb9fa Mon Sep 17 00:00:00 2001
From: Karol Majta <karolmajta@gmail.com>
Date: Sat, 18 May 2013 16:45:05 +0200
Subject: [PATCH 093/197] charset param gets now appended to response's
 Content-Type. Closes #807

---
 rest_framework/negotiation.py       | 10 ++++-
 rest_framework/renderers.py         |  2 +-
 rest_framework/response.py          | 10 +++--
 rest_framework/settings.py          |  2 +
 rest_framework/tests/negotiation.py | 35 +++++++++++++++---
 rest_framework/tests/response.py    | 57 ++++++++++++++++++++++++++---
 rest_framework/views.py             | 16 ++++++--
 7 files changed, 111 insertions(+), 21 deletions(-)

diff --git a/rest_framework/negotiation.py b/rest_framework/negotiation.py
index 4d205c0e8..668c4e5c4 100644
--- a/rest_framework/negotiation.py
+++ b/rest_framework/negotiation.py
@@ -58,11 +58,17 @@ class DefaultContentNegotiation(BaseContentNegotiation):
                             _MediaType(media_type).precedence):
                             # Eg client requests '*/*'
                             # Accepted media type is 'application/json'
-                            return renderer, renderer.media_type
+                            renderer_and_media_type = renderer, renderer.media_type
                         else:
                             # Eg client requests 'application/json; indent=8'
                             # Accepted media type is 'application/json; indent=8'
-                            return renderer, media_type
+                            renderer_and_media_type = renderer, media_type
+                        if renderer.charset:
+                            charset = renderer.charset
+                        else:
+                            charset = self.__class__.settings.DEFAULT_CHARSET
+                        retval = renderer_and_media_type + (charset,)
+                        return retval
 
         raise exceptions.NotAcceptable(available_renderers=renderers)
 
diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py
index 8361cd409..65d8b6864 100644
--- a/rest_framework/renderers.py
+++ b/rest_framework/renderers.py
@@ -36,11 +36,11 @@ class BaseRenderer(object):
 
     media_type = None
     format = None
+    charset = None
 
     def render(self, data, accepted_media_type=None, renderer_context=None):
         raise NotImplemented('Renderer class requires .render() to be implemented')
 
-
 class JSONRenderer(BaseRenderer):
     """
     Renderer which serializes to json.
diff --git a/rest_framework/response.py b/rest_framework/response.py
index 26e4ab371..40372f221 100644
--- a/rest_framework/response.py
+++ b/rest_framework/response.py
@@ -39,14 +39,18 @@ class Response(SimpleTemplateResponse):
     def rendered_content(self):
         renderer = getattr(self, 'accepted_renderer', None)
         media_type = getattr(self, 'accepted_media_type', None)
+        charset = getattr(self, 'charset', None)
         context = getattr(self, 'renderer_context', None)
 
         assert renderer, ".accepted_renderer not set on Response"
         assert media_type, ".accepted_media_type not set on Response"
         assert context, ".renderer_context not set on Response"
         context['response'] = self
-
-        self['Content-Type'] = media_type
+        if charset is not None:
+            ct = "{0}; charset={1}".format(media_type, charset)
+        else:
+            ct = media_type
+        self['Content-Type'] = ct
         return renderer.render(self.data, media_type, context)
 
     @property
@@ -67,4 +71,4 @@ class Response(SimpleTemplateResponse):
         for key in ('accepted_renderer', 'renderer_context', 'data'):
             if key in state:
                 del state[key]
-        return state
+        return state
\ No newline at end of file
diff --git a/rest_framework/settings.py b/rest_framework/settings.py
index beb511aca..255a95e21 100644
--- a/rest_framework/settings.py
+++ b/rest_framework/settings.py
@@ -83,6 +83,8 @@ DEFAULTS = {
     'FORMAT_SUFFIX_KWARG': 'format',
 
     # Input and output formats
+    'DEFAULT_CHARSET': None,
+    
     'DATE_INPUT_FORMATS': (
         ISO_8601,
     ),
diff --git a/rest_framework/tests/negotiation.py b/rest_framework/tests/negotiation.py
index 43721b842..d7ef6470a 100644
--- a/rest_framework/tests/negotiation.py
+++ b/rest_framework/tests/negotiation.py
@@ -3,18 +3,24 @@ from django.test import TestCase
 from django.test.client import RequestFactory
 from rest_framework.negotiation import DefaultContentNegotiation
 from rest_framework.request import Request
+from rest_framework.renderers import BaseRenderer
 
 
 factory = RequestFactory()
 
 
-class MockJSONRenderer(object):
+class MockJSONRenderer(BaseRenderer):
     media_type = 'application/json'
 
-
-class MockHTMLRenderer(object):
+class MockHTMLRenderer(BaseRenderer):
     media_type = 'text/html'
 
+class NoCharsetSpecifiedRenderer(BaseRenderer):
+    media_type = 'my/media'
+
+class CharsetSpecifiedRenderer(BaseRenderer):
+    media_type = 'my/media'
+    charset = 'mycharset'
 
 class TestAcceptedMediaType(TestCase):
     def setUp(self):
@@ -26,15 +32,32 @@ class TestAcceptedMediaType(TestCase):
 
     def test_client_without_accept_use_renderer(self):
         request = Request(factory.get('/'))
-        accepted_renderer, accepted_media_type = self.select_renderer(request)
+        accepted_renderer, accepted_media_type, charset = self.select_renderer(request)
         self.assertEqual(accepted_media_type, 'application/json')
 
     def test_client_underspecifies_accept_use_renderer(self):
         request = Request(factory.get('/', HTTP_ACCEPT='*/*'))
-        accepted_renderer, accepted_media_type = self.select_renderer(request)
+        accepted_renderer, accepted_media_type, charset = self.select_renderer(request)
         self.assertEqual(accepted_media_type, 'application/json')
 
     def test_client_overspecifies_accept_use_client(self):
         request = Request(factory.get('/', HTTP_ACCEPT='application/json; indent=8'))
-        accepted_renderer, accepted_media_type = self.select_renderer(request)
+        accepted_renderer, accepted_media_type, charset = self.select_renderer(request)
         self.assertEqual(accepted_media_type, 'application/json; indent=8')
+        
+class TestCharset(TestCase):
+    def setUp(self):
+        self.renderers = [NoCharsetSpecifiedRenderer()]
+        self.negotiator = DefaultContentNegotiation()
+    
+    def test_returns_none_if_no_charset_set(self):
+        request = Request(factory.get('/'))
+        renderers = [NoCharsetSpecifiedRenderer()]
+        _, _, charset = self.negotiator.select_renderer(request, renderers)
+        self.assertIsNone(charset)
+    
+    def test_returns_attribute_from_renderer_if_charset_is_set(self):
+        request = Request(factory.get('/'))
+        renderers = [CharsetSpecifiedRenderer()]
+        _, _, charset =  self.negotiator.select_renderer(request, renderers)
+        self.assertEquals(CharsetSpecifiedRenderer.charset, charset)
\ No newline at end of file
diff --git a/rest_framework/tests/response.py b/rest_framework/tests/response.py
index aecf83f4e..f2a1c635f 100644
--- a/rest_framework/tests/response.py
+++ b/rest_framework/tests/response.py
@@ -12,7 +12,6 @@ from rest_framework.renderers import (
 from rest_framework.settings import api_settings
 from rest_framework.compat import six
 
-
 class MockPickleRenderer(BaseRenderer):
     media_type = 'application/pickle'
 
@@ -20,6 +19,8 @@ class MockPickleRenderer(BaseRenderer):
 class MockJsonRenderer(BaseRenderer):
     media_type = 'application/json'
 
+class MockTextMediaRenderer(BaseRenderer):
+    media_type = 'text/html'
 
 DUMMYSTATUS = status.HTTP_200_OK
 DUMMYCONTENT = 'dummycontent'
@@ -43,14 +44,18 @@ class RendererB(BaseRenderer):
     def render(self, data, media_type=None, renderer_context=None):
         return RENDERER_B_SERIALIZER(data)
 
+class RendererC(RendererB):
+    media_type = 'mock/rendererc'
+    format = 'formatc'
+    charset = "rendererc"
+
 
 class MockView(APIView):
-    renderer_classes = (RendererA, RendererB)
+    renderer_classes = (RendererA, RendererB, RendererC)
 
     def get(self, request, **kwargs):
         return Response(DUMMYCONTENT, status=DUMMYSTATUS)
 
-
 class HTMLView(APIView):
     renderer_classes = (BrowsableAPIRenderer, )
 
@@ -64,10 +69,9 @@ class HTMLView1(APIView):
     def get(self, request, **kwargs):
         return Response('text')
 
-
 urlpatterns = patterns('',
-    url(r'^.*\.(?P<format>.+)$', MockView.as_view(renderer_classes=[RendererA, RendererB])),
-    url(r'^$', MockView.as_view(renderer_classes=[RendererA, RendererB])),
+    url(r'^.*\.(?P<format>.+)$', MockView.as_view(renderer_classes=[RendererA, RendererB, RendererC])),
+    url(r'^$', MockView.as_view(renderer_classes=[RendererA, RendererB, RendererC])),
     url(r'^html$', HTMLView.as_view()),
     url(r'^html1$', HTMLView1.as_view()),
     url(r'^restframework', include('rest_framework.urls', namespace='rest_framework'))
@@ -173,3 +177,44 @@ class Issue122Tests(TestCase):
         Test if no infinite recursion occurs.
         """
         self.client.get('/html1')
+
+class Issue807Testts(TestCase):
+    """
+    Covers #807
+    """
+    
+    urls = 'rest_framework.tests.response'
+    
+    def test_does_not_append_charset_by_default(self):
+        """
+        For backwards compatibility `REST_FRAMEWORK['DEFAULT_CHARSET']` defaults
+        to None, so that all legacy code works as expected.
+        """
+        headers = {"HTTP_ACCEPT": RendererA.media_type}
+        resp = self.client.get('/', **headers)
+        self.assertEquals(RendererA.media_type, resp['Content-Type'])
+    
+    def test_if_there_is_charset_specified_on_renderer_it_gets_appended(self):
+        """
+        If renderer class has charset attribute declared, it gets appended
+        to Response's Content-Type
+        """
+        resp = self.client.get('/?format=%s' % RendererC.format)
+        expected = "{0}; charset={1}".format(RendererC.media_type, RendererC.charset)
+        self.assertEquals(expected, resp['Content-Type'])
+    
+    def test_if_there_is_default_charset_specified_it_gets_appended(self):
+        """
+        If user defines `REST_FRAMEWORK['DEFAULT_CHARSET']` it will get appended
+        to Content-Type of all responses.
+        """
+        original_default_charset = api_settings.DEFAULT_CHARSET
+        api_settings.DEFAULT_CHARSET = "utf-8"
+        headers = {'HTTP_ACCEPT': RendererA.media_type}
+        resp = self.client.get('/', **headers)
+        expected = "{0}; charset={1}".format(
+            RendererA.media_type,
+            api_settings.DEFAULT_CHARSET
+        )
+        self.assertEquals(expected, resp['Content-Type'])
+        api_settings.DEFAULT_CHARSET = original_default_charset
\ No newline at end of file
diff --git a/rest_framework/views.py b/rest_framework/views.py
index 555fa2f40..035aa6466 100644
--- a/rest_framework/views.py
+++ b/rest_framework/views.py
@@ -183,7 +183,9 @@ class APIView(View):
             return conneg.select_renderer(request, renderers, self.format_kwarg)
         except Exception:
             if force:
-                return (renderers[0], renderers[0].media_type)
+                charset = renderers[0].charset
+                charset = charset if charset is not None else api_settings.DEFAULT_CHARSET
+                return (renderers[0], renderers[0].media_type, renderers[0].charset)
             raise
 
     def perform_authentication(self, request):
@@ -250,7 +252,10 @@ class APIView(View):
 
         # Perform content negotiation and store the accepted info on the request
         neg = self.perform_content_negotiation(request)
-        request.accepted_renderer, request.accepted_media_type = neg
+        renderer, media_type, charset = neg
+        request.accepted_renderer = renderer
+        request.accepted_media_type = media_type
+        request.accepted_charset = charset
 
     def finalize_response(self, request, response, *args, **kwargs):
         """
@@ -265,11 +270,16 @@ class APIView(View):
         if isinstance(response, Response):
             if not getattr(request, 'accepted_renderer', None):
                 neg = self.perform_content_negotiation(request, force=True)
-                request.accepted_renderer, request.accepted_media_type = neg
+                renderer, media_type, charset = neg
+                request.accepted_renderer = renderer
+                request.accepted_media_type = media_type 
 
             response.accepted_renderer = request.accepted_renderer
             response.accepted_media_type = request.accepted_media_type
             response.renderer_context = self.get_renderer_context()
+            charset = request.accepted_renderer.charset
+            charset = charset if charset else api_settings.DEFAULT_CHARSET
+            response.charset = charset
 
         for key, value in self.headers.items():
             response[key] = value

From 0c81d04170da19e5bfb332641d92d9c3346598f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20Gro=C3=9F?= <stephan@minddust.com>
Date: Sat, 18 May 2013 17:04:20 +0200
Subject: [PATCH 094/197] Add min_value=0 to autogenerated Pos..IntFields

---
 rest_framework/serializers.py      |  4 ++
 rest_framework/tests/serializer.py | 73 ++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+)

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index ff5eb8732..d0313513b 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -739,6 +739,10 @@ class ModelSerializer(Serializer):
         if issubclass(model_field.__class__, models.TextField):
             kwargs['widget'] = widgets.Textarea
 
+        if issubclass(model_field.__class__, models.PositiveIntegerField) or\
+                issubclass(model_field.__class__, models.PositiveSmallIntegerField):
+            kwargs['min_value'] = 0
+
         # TODO: TypedChoiceField?
         if model_field.flatchoices:  # This ModelField contains choices
             kwargs['choices'] = model_field.flatchoices
diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 4f188c3e4..220a581ab 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -1402,3 +1402,76 @@ class AttributeMappingOnAutogeneratedFieldsTests(TestCase):
 
     def test_url_field(self):
         self.field_test('url_field')
+
+
+class DefaultValuesOnAutogeneratedFieldsTests(TestCase):
+
+    def setUp(self):
+        class DVOAFModel(RESTFrameworkModel):
+            positive_integer_field = models.PositiveIntegerField(blank=True)
+            positive_small_integer_field = models.PositiveSmallIntegerField(blank=True)
+            email_field = models.EmailField(blank=True)
+            file_field = models.FileField(blank=True)
+            image_field = models.ImageField(blank=True)
+            slug_field = models.SlugField(blank=True)
+            url_field = models.URLField(blank=True)
+
+        class DVOAFSerializer(serializers.ModelSerializer):
+            class Meta:
+                model = DVOAFModel
+
+        self.serializer_class = DVOAFSerializer
+        self.fields_attributes = {
+            'positive_integer_field': [
+                ('min_value', 0),
+            ],
+            'positive_small_integer_field': [
+                ('min_value', 0),
+            ],
+            'email_field': [
+                ('max_length', 75),
+            ],
+            'file_field': [
+                ('max_length', 100),
+            ],
+            'image_field': [
+                ('max_length', 100),
+            ],
+            'slug_field': [
+                ('max_length', 50),
+            ],
+            'url_field': [
+                ('max_length', 200),
+            ],
+        }
+
+    def field_test(self, field):
+        serializer = self.serializer_class(data={})
+        self.assertEqual(serializer.is_valid(), True)
+
+        for attribute in self.fields_attributes[field]:
+            self.assertEqual(
+                getattr(serializer.fields[field], attribute[0]),
+                attribute[1]
+            )
+
+    def test_positive_integer_field(self):
+        self.field_test('positive_integer_field')
+
+    def test_positive_small_integer_field(self):
+        self.field_test('positive_small_integer_field')
+
+    def test_email_field(self):
+        self.field_test('email_field')
+
+    def test_file_field(self):
+        self.field_test('file_field')
+
+    def test_image_field(self):
+        self.field_test('image_field')
+
+    def test_slug_field(self):
+        self.field_test('slug_field')
+
+    def test_url_field(self):
+        self.field_test('url_field')

From c69f960066dfdef2163a53205f27c2b9e457068f Mon Sep 17 00:00:00 2001
From: Pablo Recio <pablo@potatolondon.com>
Date: Sat, 18 May 2013 16:30:40 +0200
Subject: [PATCH 095/197] Adding a class attribute into JSONRenderer for
 ensuring ascii, and using it consistently

---
 rest_framework/renderers.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py
index 8361cd409..d55a3e0ea 100644
--- a/rest_framework/renderers.py
+++ b/rest_framework/renderers.py
@@ -49,6 +49,7 @@ class JSONRenderer(BaseRenderer):
     media_type = 'application/json'
     format = 'json'
     encoder_class = encoders.JSONEncoder
+    ensure_ascii = True
 
     def render(self, data, accepted_media_type=None, renderer_context=None):
         """
@@ -72,7 +73,7 @@ class JSONRenderer(BaseRenderer):
             except (ValueError, TypeError):
                 indent = None
 
-        return json.dumps(data, cls=self.encoder_class, indent=indent)
+        return json.dumps(data, cls=self.encoder_class, indent=indent, ensure_ascii=self.ensure_ascii)
 
 
 class JSONPRenderer(JSONRenderer):

From 97f034e3d65068f7bd1e982e6fd251222a4feea1 Mon Sep 17 00:00:00 2001
From: Pablo Recio <pablo@potatolondon.com>
Date: Sat, 18 May 2013 16:31:12 +0200
Subject: [PATCH 096/197] Adds UnicodeJSONRenderer which doesn't ensure ascii

---
 rest_framework/renderers.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py
index d55a3e0ea..12e1107fa 100644
--- a/rest_framework/renderers.py
+++ b/rest_framework/renderers.py
@@ -76,6 +76,10 @@ class JSONRenderer(BaseRenderer):
         return json.dumps(data, cls=self.encoder_class, indent=indent, ensure_ascii=self.ensure_ascii)
 
 
+class UnicodeJSONRenderer(JSONRenderer):
+    ensure_ascii = False
+
+
 class JSONPRenderer(JSONRenderer):
     """
     Renderer which serializes to json,

From 6dbbbc16da740fb27f9a5a390fb61400e9f6ff64 Mon Sep 17 00:00:00 2001
From: Pablo Recio <pablo@potatolondon.com>
Date: Sat, 18 May 2013 16:32:53 +0200
Subject: [PATCH 097/197] Better checking if the content can be printable in
 the BrowsableAPI

---
 rest_framework/renderers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py
index 12e1107fa..4345a313b 100644
--- a/rest_framework/renderers.py
+++ b/rest_framework/renderers.py
@@ -325,7 +325,7 @@ class BrowsableAPIRenderer(BaseRenderer):
         renderer_context['indent'] = 4
         content = renderer.render(data, accepted_media_type, renderer_context)
 
-        if not all(char in string.printable for char in content):
+        if not isinstance(content, six.text_type):
             return '[%d bytes of binary content]'
 
         return content

From 71e29644a2950d8a82cb26f6a3e39fb76faf9707 Mon Sep 17 00:00:00 2001
From: Pablo Recio <pablo@potatolondon.com>
Date: Sat, 18 May 2013 16:50:09 +0200
Subject: [PATCH 098/197] Adds new renderer into the documentation

---
 docs/api-guide/renderers.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md
index b9a9fd7a3..1661ceecf 100644
--- a/docs/api-guide/renderers.md
+++ b/docs/api-guide/renderers.md
@@ -67,7 +67,7 @@ If your API includes views that can serve both regular webpages and API response
 
 ## JSONRenderer
 
-Renders the request data into `JSON`.
+Renders the request data into `JSON` enforcing ASCII encoding
 
 The client may additionally include an `'indent'` media type parameter, in which case the returned `JSON` will be indented.  For example `Accept: application/json; indent=4`.
 
@@ -75,6 +75,10 @@ The client may additionally include an `'indent'` media type parameter, in which
 
 **.format**: `'.json'`
 
+## UnicodeJSONRenderer
+
+Same as `JSONRenderer` but doesn't enforce ASCII encoding
+
 ## JSONPRenderer
 
 Renders the request data into `JSONP`.  The `JSONP` media type provides a mechanism of allowing cross-domain AJAX requests, by wrapping a `JSON` response in a javascript callback.

From b9b22976125fffa4552da695183bf75fbaf0b927 Mon Sep 17 00:00:00 2001
From: Pablo Recio <pablo@potatolondon.com>
Date: Sat, 18 May 2013 17:06:25 +0200
Subject: [PATCH 099/197] Tests proper encoding in JSONRenderer and
 UnicodeJSONRenderer

---
 rest_framework/tests/renderers.py | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/rest_framework/tests/renderers.py b/rest_framework/tests/renderers.py
index 40bac9cb3..739f91841 100644
--- a/rest_framework/tests/renderers.py
+++ b/rest_framework/tests/renderers.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from decimal import Decimal
 from django.core.cache import cache
 from django.test import TestCase
@@ -8,7 +9,7 @@ from rest_framework.compat import yaml, etree, patterns, url, include
 from rest_framework.response import Response
 from rest_framework.views import APIView
 from rest_framework.renderers import BaseRenderer, JSONRenderer, YAMLRenderer, \
-    XMLRenderer, JSONPRenderer, BrowsableAPIRenderer
+    XMLRenderer, JSONPRenderer, BrowsableAPIRenderer, UnicodeJSONRenderer
 from rest_framework.parsers import YAMLParser, XMLParser
 from rest_framework.settings import api_settings
 from rest_framework.compat import StringIO
@@ -254,6 +255,23 @@ class JSONRendererTests(TestCase):
         content = renderer.render(obj, 'application/json; indent=2')
         self.assertEqual(strip_trailing_whitespace(content), _indented_repr)
 
+    def test_check_ascii(self):
+        obj = {'countries': ['United Kingdom', 'France', 'España']}
+        renderer = JSONRenderer()
+        content = renderer.render(obj, 'application/json')
+        self.assertEqual(content, '{"countries": ["United Kingdom", "France", "Espa\\u00f1a"]}')
+
+
+class UnicodeJSONRendererTests(TestCase):
+    """
+    Tests specific for the Unicode JSON Renderer
+    """
+    def test_proper_encoding(self):
+        obj = {'countries': ['United Kingdom', 'France', 'España']}
+        renderer = UnicodeJSONRenderer()
+        content = renderer.render(obj, 'application/json')
+        self.assertEqual(content, '{"countries": ["United Kingdom", "France", "España"]}')
+
 
 class JSONPRendererTests(TestCase):
     """

From b4dbfa9832e2a29a5908ddf27f8746971a8e3c56 Mon Sep 17 00:00:00 2001
From: Nikolaus Schlemm <capo@coder-nostra.com>
Date: Sat, 18 May 2013 17:10:13 +0200
Subject: [PATCH 100/197] only catch relevant exceptions ;)

---
 rest_framework/views.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rest_framework/views.py b/rest_framework/views.py
index 2dd2c59e9..719df4284 100644
--- a/rest_framework/views.py
+++ b/rest_framework/views.py
@@ -83,7 +83,10 @@ class APIView(View):
                         field_name_types[name] = field.__class__.__name__
 
                 actions[method] = field_name_types
-            except:
+            except exceptions.PermissionDenied:
+                # don't add this method
+                pass
+            except exceptions.NotAuthenticated:
                 # don't add this method
                 pass
 

From a42afa04c38afe25c9032b8ce37b572678b02cf1 Mon Sep 17 00:00:00 2001
From: Nikolaus Schlemm <capo@coder-nostra.com>
Date: Sat, 18 May 2013 17:13:23 +0200
Subject: [PATCH 101/197] draft for fields' metadata via OPTIONS - needs review
 and decision

---
 rest_framework/tests/generics.py | 42 ++++++++++++++++++++++++++++++--
 1 file changed, 40 insertions(+), 2 deletions(-)

diff --git a/rest_framework/tests/generics.py b/rest_framework/tests/generics.py
index 15d87e866..014195ae7 100644
--- a/rest_framework/tests/generics.py
+++ b/rest_framework/tests/generics.py
@@ -121,8 +121,27 @@ class TestRootView(TestCase):
                 'text/html'
             ],
             'name': 'Root',
-            'description': 'Example description for OPTIONS.'
+            'description': 'Example description for OPTIONS.',
+            'actions': {}
         }
+        # TODO: this is just a draft for fields' metadata - needs review and decision
+        for method in ('HEAD', 'GET', 'POST', 'OPTIONS'):
+            expected['actions'][method] = {
+                'text': {
+                    'description': '',
+                    'label': '',
+                    'readonly': False,
+                    'required': True,
+                    'type': 'CharField',
+                },
+                'id': {
+                    'description': '',
+                    'label': '',
+                    'readonly': True,
+                    'required': True,
+                    'type': 'IntegerField',
+                },
+            }
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.data, expected)
 
@@ -238,8 +257,27 @@ class TestInstanceView(TestCase):
                 'text/html'
             ],
             'name': 'Instance',
-            'description': 'Example description for OPTIONS.'
+            'description': 'Example description for OPTIONS.',
+            'actions': {}
         }
+        # TODO: this is just a draft idea for fields' metadata - needs review and decision
+        for method in ('HEAD', 'GET', 'PATCH', 'PUT', 'OPTIONS', 'DELETE'):
+            expected['actions'][method] = {
+                'text': {
+                    'description': '',
+                    'label': '',
+                    'readonly': False,
+                    'required': True,
+                    'type': 'CharField',
+                },
+                'id': {
+                    'description': '',
+                    'label': '',
+                    'readonly': True,
+                    'required': True,
+                    'type': 'IntegerField',
+                },
+            }
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.data, expected)
 

From 025c40e7d5efbba0c3e65ab3737adef988995a24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20Gro=C3=9F?= <stephan@minddust.com>
Date: Sat, 18 May 2013 17:16:29 +0200
Subject: [PATCH 102/197] Fix order for applying min_value to fields

---
 rest_framework/serializers.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index d0313513b..943fba6ba 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -739,15 +739,16 @@ class ModelSerializer(Serializer):
         if issubclass(model_field.__class__, models.TextField):
             kwargs['widget'] = widgets.Textarea
 
-        if issubclass(model_field.__class__, models.PositiveIntegerField) or\
-                issubclass(model_field.__class__, models.PositiveSmallIntegerField):
-            kwargs['min_value'] = 0
-
         # TODO: TypedChoiceField?
         if model_field.flatchoices:  # This ModelField contains choices
             kwargs['choices'] = model_field.flatchoices
             return ChoiceField(**kwargs)
 
+        # put this below the ChoiceField because min_value isn't a valid initializer
+        if issubclass(model_field.__class__, models.PositiveIntegerField) or\
+                issubclass(model_field.__class__, models.PositiveSmallIntegerField):
+            kwargs['min_value'] = 0
+
         attribute_dict = {
             models.CharField: ['max_length'],
             models.CommaSeparatedIntegerField: ['max_length'],

From 10e451a85a034d1158148f54e98147e81454c2ed Mon Sep 17 00:00:00 2001
From: Ryan Kaskel <dev@ryankaskel.com>
Date: Sat, 18 May 2013 16:21:18 +0100
Subject: [PATCH 103/197] Handle Python 3 strings and lazy strings.

---
 rest_framework/fields.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 2ab603cfb..c3ac62813 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -19,6 +19,7 @@ from django.db.models.fields import BLANK_CHOICE_DASH
 from django import forms
 from django.forms import widgets
 from django.utils.encoding import is_protected_type
+from django.utils.functional import Promise
 from django.utils.translation import ugettext_lazy as _
 from django.utils.datastructures import SortedDict
 
@@ -45,6 +46,15 @@ def is_simple_callable(obj):
     len_defaults = len(defaults) if defaults else 0
     return len_args <= len_defaults
 
+if six.PY3:
+    def is_non_str_iterable(obj):
+        if (isinstance(obj, str) or
+            (isinstance(obj, Promise) and obj._delegate_text)):
+            return False
+        return hasattr(obj, '__iter__')
+else:
+    def is_non_str_iterable(obj):
+        return hasattr(obj, '__iter__')
 
 def get_component(obj, attr_name):
     """
@@ -169,7 +179,8 @@ class Field(object):
 
         if is_protected_type(value):
             return value
-        elif hasattr(value, '__iter__') and not isinstance(value, (dict, six.string_types)):
+        elif (is_non_str_iterable(value) and
+              not isinstance(value, (dict, six.string_types))):
             return [self.to_native(item) for item in value]
         elif isinstance(value, dict):
             # Make sure we preserve field ordering, if it exists

From 1fd66fe8c6c97acbbfa5ca4725f3a770be4250fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20T=C3=B6rnqvist?= <mjt+illyria@skyhood.com>
Date: Sat, 18 May 2013 18:27:36 +0300
Subject: [PATCH 104/197] Drop u'', it was used inconsistently and breaks for
 nothing with Python 3.2

---
 rest_framework/tests/serializer.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 5685c0615..6a7deb491 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -1336,8 +1336,8 @@ class FieldLabelTest(TestCase):
         serializer = self.serializer_class()
         text_field = serializer.fields['text']
 
-        self.assertEquals(u'Text comes here', text_field.label)
-        self.assertEquals(u'Text description.', text_field.help_text)
+        self.assertEquals('Text comes here', text_field.label)
+        self.assertEquals('Text description.', text_field.help_text)
 
     def test_field_ctor(self):
         """

From 99848b0321a07d7f05f2333f635756f45e058088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20T=C3=B6rnqvist?= <mjt+illyria@skyhood.com>
Date: Sat, 18 May 2013 18:38:37 +0300
Subject: [PATCH 105/197] Drop another case of u'', this time from #530 code

---
 rest_framework/tests/serializer.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 6a7deb491..8f901a85e 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -1343,9 +1343,9 @@ class FieldLabelTest(TestCase):
         """
         This is check that ctor supports both label and help_text.
         """
-        self.assertEquals(u'Label', fields.Field(label='Label', help_text='Help').label)
-        self.assertEquals(u'Help', fields.CharField(label='Label', help_text='Help').help_text)
-        self.assertEquals(u'Label', relations.ManyHyperlinkedRelatedField(view_name='fake', label='Label', help_text='Help').label)
+        self.assertEquals('Label', fields.Field(label='Label', help_text='Help').label)
+        self.assertEquals('Help', fields.CharField(label='Label', help_text='Help').help_text)
+        self.assertEquals('Label', relations.ManyHyperlinkedRelatedField(view_name='fake', label='Label', help_text='Help').label)
 
 
 class AttributeMappingOnAutogeneratedFieldsTests(TestCase):

From 5ab7cc6e6be5445bc0d4ccc26f1ec84239af74d5 Mon Sep 17 00:00:00 2001
From: Nikolaus Schlemm <capo@coder-nostra.com>
Date: Sat, 18 May 2013 17:38:47 +0200
Subject: [PATCH 106/197] HEAD and OPTIONS should not be exposed as actions as
 discussed in
 https://github.com/nschlemm/django-rest-framework/commit/a42afa04c38afe25c9032b8ce37b572678b02cf1#commitcomment-3241476

---
 rest_framework/tests/generics.py | 4 ++--
 rest_framework/views.py          | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/rest_framework/tests/generics.py b/rest_framework/tests/generics.py
index 014195ae7..d8556638a 100644
--- a/rest_framework/tests/generics.py
+++ b/rest_framework/tests/generics.py
@@ -125,7 +125,7 @@ class TestRootView(TestCase):
             'actions': {}
         }
         # TODO: this is just a draft for fields' metadata - needs review and decision
-        for method in ('HEAD', 'GET', 'POST', 'OPTIONS'):
+        for method in ('GET', 'POST',):
             expected['actions'][method] = {
                 'text': {
                     'description': '',
@@ -261,7 +261,7 @@ class TestInstanceView(TestCase):
             'actions': {}
         }
         # TODO: this is just a draft idea for fields' metadata - needs review and decision
-        for method in ('HEAD', 'GET', 'PATCH', 'PUT', 'OPTIONS', 'DELETE'):
+        for method in ('GET', 'PATCH', 'PUT', 'DELETE'):
             expected['actions'][method] = {
                 'text': {
                     'description': '',
diff --git a/rest_framework/views.py b/rest_framework/views.py
index 719df4284..c5b89a024 100644
--- a/rest_framework/views.py
+++ b/rest_framework/views.py
@@ -71,6 +71,10 @@ class APIView(View):
         actions = {}
 
         for method in self.allowed_methods:
+            # skip HEAD and OPTIONS
+            if method in ('HEAD', 'OPTIONS'):
+                continue
+
             cloned_request = clone_request(request, method)
             try:
                 self.check_permissions(cloned_request)

From 579f77ceaa03a216a7a635c3d3a4d83b0e5868f8 Mon Sep 17 00:00:00 2001
From: Ryan Kaskel <dev@ryankaskel.com>
Date: Sat, 18 May 2013 17:04:17 +0100
Subject: [PATCH 107/197] Move function to compat.

---
 rest_framework/compat.py | 13 +++++++++++++
 rest_framework/fields.py | 13 +------------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index cd39f5445..76dc00526 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -495,3 +495,16 @@ except ImportError:
     oauth2_provider_forms = None
     oauth2_provider_scope = None
     oauth2_constants = None
+
+# Handle lazy strings
+from django.utils.functional import Promise
+
+if six.PY3:
+    def is_non_str_iterable(obj):
+        if (isinstance(obj, str) or
+            (isinstance(obj, Promise) and obj._delegate_text)):
+            return False
+        return hasattr(obj, '__iter__')
+else:
+    def is_non_str_iterable(obj):
+        return hasattr(obj, '__iter__')
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index d5cf30e43..b5f99823a 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -19,7 +19,6 @@ from django.db.models.fields import BLANK_CHOICE_DASH
 from django import forms
 from django.forms import widgets
 from django.utils.encoding import is_protected_type
-from django.utils.functional import Promise
 from django.utils.translation import ugettext_lazy as _
 from django.utils.datastructures import SortedDict
 
@@ -27,7 +26,7 @@ from rest_framework import ISO_8601
 from rest_framework.compat import timezone, parse_date, parse_datetime, parse_time
 from rest_framework.compat import BytesIO
 from rest_framework.compat import six
-from rest_framework.compat import smart_text, force_text
+from rest_framework.compat import smart_text, force_text, is_non_str_iterable
 from rest_framework.settings import api_settings
 
 
@@ -46,16 +45,6 @@ def is_simple_callable(obj):
     len_defaults = len(defaults) if defaults else 0
     return len_args <= len_defaults
 
-if six.PY3:
-    def is_non_str_iterable(obj):
-        if (isinstance(obj, str) or
-            (isinstance(obj, Promise) and obj._delegate_text)):
-            return False
-        return hasattr(obj, '__iter__')
-else:
-    def is_non_str_iterable(obj):
-        return hasattr(obj, '__iter__')
-
 def get_component(obj, attr_name):
     """
     Given an object, and an attribute name,

From 6af61a19b78b0ebb9d8403e96c6e4a77c675b141 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Sat, 18 May 2013 18:07:43 +0200
Subject: [PATCH 108/197] Added @matteosuppo for work on #865.  Thanks!

---
 docs/topics/credits.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index d805c0c1d..0e206de82 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -130,6 +130,7 @@ The following people have helped make REST framework great.
 * Òscar Vilaplana - [grimborg]
 * Ryan Kaskel - [ryankask]
 * Andy McKay - [andymckay]
+* Matteo Suppo - [matteosuppo]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -296,3 +297,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [grimborg]: https://github.com/grimborg
 [ryankask]: https://github.com/ryankask
 [andymckay]: https://github.com/andymckay
+[matteosuppo]: https://github.com/matteosuppo

From 4dffcb5d77a575793c1dc7c1db5242a3ac2d7345 Mon Sep 17 00:00:00 2001
From: Oscar Vilaplana <dev@oscarvilaplana.cat>
Date: Sat, 18 May 2013 18:10:17 +0200
Subject: [PATCH 109/197] Added humanized field names and types

---
 rest_framework/fields.py       | 91 +++++++++++++++++++++++++++++++++-
 rest_framework/tests/fields.py | 57 +++++++++++++++++++++
 rest_framework/views.py        |  2 +
 3 files changed, 148 insertions(+), 2 deletions(-)

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 491aa7eda..b23813ec3 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -23,13 +23,44 @@ from django.utils.translation import ugettext_lazy as _
 from django.utils.datastructures import SortedDict
 
 from rest_framework import ISO_8601
-from rest_framework.compat import timezone, parse_date, parse_datetime, parse_time
+from rest_framework.compat import (timezone, parse_date, parse_datetime,
+                                   parse_time)
 from rest_framework.compat import BytesIO
 from rest_framework.compat import six
 from rest_framework.compat import smart_text
 from rest_framework.settings import api_settings
 
 
+HUMANIZED_FIELD_TYPES = {
+    'BooleanField': u'Boolean',
+    'CharField': u'Single Character',
+    'ChoiceField': u'Single Choice',
+    'ComboField': u'Single Choice',
+    'DateField': u'Date',
+    'DateTimeField': u'Date and Time',
+    'DecimalField': u'Decimal',
+    'EmailField': u'Email',
+    'Field': u'Field',
+    'FileField': u'File',
+    'FilePathField': u'File Path',
+    'FloatField': u'Float',
+    'GenericIPAddressField': u'Generic IP Address',
+    'IPAddressField': u'IP Address',
+    'ImageField': u'Image',
+    'IntegerField': u'Integer',
+    'MultiValueField': u'Multiple Value',
+    'MultipleChoiceField': u'Multiple Choice',
+    'NullBooleanField': u'Nullable Boolean',
+    'RegexField': u'Regular Expression',
+    'SlugField': u'Slug',
+    'SplitDateTimeField': u'Split Date and Time',
+    'TimeField': u'Time',
+    'TypedChoiceField': u'Typed Single Choice',
+    'TypedMultipleChoiceField': u'Typed Multiple Choice',
+    'URLField': u'URL',
+}
+
+
 def is_simple_callable(obj):
     """
     True if the object is a callable that takes no arguments.
@@ -62,7 +93,8 @@ def get_component(obj, attr_name):
 
 
 def readable_datetime_formats(formats):
-    format = ', '.join(formats).replace(ISO_8601, 'YYYY-MM-DDThh:mm[:ss[.uuuuuu]][+HHMM|-HHMM|Z]')
+    format = ', '.join(formats).replace(ISO_8601,
+             'YYYY-MM-DDThh:mm[:ss[.uuuuuu]][+HHMM|-HHMM|Z]')
     return humanize_strptime(format)
 
 
@@ -71,6 +103,61 @@ def readable_date_formats(formats):
     return humanize_strptime(format)
 
 
+def humanize_field_type(field_type):
+    """Return a human-readable name for a field type.
+
+    :param field_type: Either a field type class (for example
+        django.forms.fields.DateTimeField), or the name of a field type
+        (for example "DateTimeField").
+
+    :return: unicode
+
+    """
+    if isinstance(field_type, basestring):
+        field_type_name = field_type
+    else:
+        field_type_name = field_type.__name__
+    try:
+        return HUMANIZED_FIELD_TYPES[field_type_name]
+    except KeyError:
+        humanized = re.sub('([a-z0-9])([A-Z])', r'\1 \2', field_type_name)
+        return humanized.capitalize()
+
+
+def humanize_field(field):
+    """Return a human-readable description of a field.
+
+    :param field: A Django field.
+
+    :return: A dictionary of the form {type: type name, required: bool,
+             label: field label: read_only: bool,
+             help_text: optional help text}
+
+    """
+    humanized = {
+        'type': (field.type_name if field.type_name
+                 else humanize_field_type(field.form_field_class)),
+        'required': getattr(field, 'required', False),
+        'label': field.label,
+    }
+    optional_attrs = ['read_only', 'help_text']
+    for attr in optional_attrs:
+        if hasattr(field, attr):
+            humanized[attr] = getattr(field, attr)
+    return humanized
+
+
+def humanize_form_fields(form):
+    """Return a humanized description of all the fields in a form.
+
+    :param form: A Django form.
+    :return: A dictionary of {field_label: humanized description}
+
+    """
+    fields = SortedDict([(f.name, humanize_field(f)) for f in form.fields])
+    return fields
+
+
 def readable_time_formats(formats):
     format = ', '.join(formats).replace(ISO_8601, 'hh:mm[:ss[.uuuuuu]]')
     return humanize_strptime(format)
diff --git a/rest_framework/tests/fields.py b/rest_framework/tests/fields.py
index 6b1cdfc77..de61b0112 100644
--- a/rest_framework/tests/fields.py
+++ b/rest_framework/tests/fields.py
@@ -4,12 +4,17 @@ General serializer field tests.
 from __future__ import unicode_literals
 from django.utils.datastructures import SortedDict
 import datetime
+from rest_framework.fields import humanize_field, humanize_field_type
+from django import forms
 from decimal import Decimal
 from django.db import models
 from django.test import TestCase
 from django.core import validators
 from rest_framework import serializers
 from rest_framework.serializers import Serializer
+from rest_framework.fields import Field
+from collections import namedtuple
+from uuid import uuid4
 
 
 class TimestampedModel(models.Model):
@@ -685,3 +690,55 @@ class ChoiceFieldTests(TestCase):
         """
         f = serializers.ChoiceField(required=False, choices=self.SAMPLE_CHOICES)
         self.assertEqual(f.choices, models.fields.BLANK_CHOICE_DASH + self.SAMPLE_CHOICES)
+
+
+class HumanizedFieldType(TestCase):
+    def test_standard_type_classes(self):
+        for field_type_name in forms.fields.__all__:
+            field_type = getattr(forms.fields, field_type_name)
+            humanized = humanize_field_type(field_type)
+            self.assert_valid_name(humanized)
+
+    def test_standard_type_names(self):
+        for field_type_name in forms.fields.__all__:
+            humanized = humanize_field_type(field_type_name)
+            self.assert_valid_name(humanized)
+
+    def test_custom_type_name(self):
+        humanized = humanize_field_type('SomeCustomType')
+        self.assertEquals(humanized, u'Some custom type')
+
+    def test_custom_type(self):
+        custom_type = namedtuple('SomeCustomType', [])
+        humanized = humanize_field_type(custom_type)
+        self.assertEquals(humanized, u'Some custom type')
+
+    def assert_valid_name(self, humanized):
+        """A humanized field name is valid if it's a non-empty
+        unicode.
+
+        """
+        self.assertIsInstance(humanized, unicode)
+        self.assertTrue(humanized)
+
+
+class HumanizedField(TestCase):
+    def setUp(self):
+        self.required_field = Field()
+        self.required_field.label = uuid4().hex
+        self.required_field.required = True
+
+        self.optional_field = Field()
+        self.optional_field.label = uuid4().hex
+        self.optional_field.required = False
+
+    def test_required(self):
+        self.assertEqual(humanize_field(self.required_field)['required'], True)
+
+    def test_optional(self):
+        self.assertEqual(humanize_field(self.optional_field)['required'],
+                         False)
+
+    def test_label(self):
+        for field in (self.required_field, self.optional_field):
+            self.assertEqual(humanize_field(field)['label'], field.label)
diff --git a/rest_framework/views.py b/rest_framework/views.py
index 2dd2c59e9..c4662a1f5 100644
--- a/rest_framework/views.py
+++ b/rest_framework/views.py
@@ -80,6 +80,8 @@ class APIView(View):
                 if serializer is not None:
                     field_name_types = {}
                     for name, field in serializer.fields.iteritems():
+                        from rest_framework.fields import humanize_field
+                        humanize_field(field)
                         field_name_types[name] = field.__class__.__name__
 
                 actions[method] = field_name_types

From 0d3d66cb0232e1067600ef22fcf88937ac6bee9d Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Sat, 18 May 2013 17:21:43 +0100
Subject: [PATCH 110/197] Added proper charset support

---
 rest_framework/negotiation.py        | 10 ++----
 rest_framework/renderers.py          |  6 ++++
 rest_framework/response.py           | 18 ++++++----
 rest_framework/settings.py           |  2 --
 rest_framework/tests/htmlrenderer.py | 10 +++---
 rest_framework/tests/negotiation.py  | 28 +++------------
 rest_framework/tests/response.py     | 54 +++++++++++++++-------------
 rest_framework/views.py              | 16 ++-------
 8 files changed, 62 insertions(+), 82 deletions(-)

diff --git a/rest_framework/negotiation.py b/rest_framework/negotiation.py
index 668c4e5c4..4d205c0e8 100644
--- a/rest_framework/negotiation.py
+++ b/rest_framework/negotiation.py
@@ -58,17 +58,11 @@ class DefaultContentNegotiation(BaseContentNegotiation):
                             _MediaType(media_type).precedence):
                             # Eg client requests '*/*'
                             # Accepted media type is 'application/json'
-                            renderer_and_media_type = renderer, renderer.media_type
+                            return renderer, renderer.media_type
                         else:
                             # Eg client requests 'application/json; indent=8'
                             # Accepted media type is 'application/json; indent=8'
-                            renderer_and_media_type = renderer, media_type
-                        if renderer.charset:
-                            charset = renderer.charset
-                        else:
-                            charset = self.__class__.settings.DEFAULT_CHARSET
-                        retval = renderer_and_media_type + (charset,)
-                        return retval
+                            return renderer, media_type
 
         raise exceptions.NotAcceptable(available_renderers=renderers)
 
diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py
index 65d8b6864..b91e3861f 100644
--- a/rest_framework/renderers.py
+++ b/rest_framework/renderers.py
@@ -41,6 +41,7 @@ class BaseRenderer(object):
     def render(self, data, accepted_media_type=None, renderer_context=None):
         raise NotImplemented('Renderer class requires .render() to be implemented')
 
+
 class JSONRenderer(BaseRenderer):
     """
     Renderer which serializes to json.
@@ -115,6 +116,7 @@ class XMLRenderer(BaseRenderer):
 
     media_type = 'application/xml'
     format = 'xml'
+    charset = 'utf-8'
 
     def render(self, data, accepted_media_type=None, renderer_context=None):
         """
@@ -164,6 +166,7 @@ class YAMLRenderer(BaseRenderer):
     media_type = 'application/yaml'
     format = 'yaml'
     encoder = encoders.SafeDumper
+    charset = 'utf-8'
 
     def render(self, data, accepted_media_type=None, renderer_context=None):
         """
@@ -204,6 +207,7 @@ class TemplateHTMLRenderer(BaseRenderer):
         '%(status_code)s.html',
         'api_exception.html'
     ]
+    charset = 'utf-8'
 
     def render(self, data, accepted_media_type=None, renderer_context=None):
         """
@@ -275,6 +279,7 @@ class StaticHTMLRenderer(TemplateHTMLRenderer):
     """
     media_type = 'text/html'
     format = 'html'
+    charset = 'utf-8'
 
     def render(self, data, accepted_media_type=None, renderer_context=None):
         renderer_context = renderer_context or {}
@@ -296,6 +301,7 @@ class BrowsableAPIRenderer(BaseRenderer):
     media_type = 'text/html'
     format = 'api'
     template = 'rest_framework/api.html'
+    charset = 'utf-8'
 
     def get_default_renderer(self, view):
         """
diff --git a/rest_framework/response.py b/rest_framework/response.py
index 40372f221..32e74a45e 100644
--- a/rest_framework/response.py
+++ b/rest_framework/response.py
@@ -18,7 +18,7 @@ class Response(SimpleTemplateResponse):
 
     def __init__(self, data=None, status=200,
                  template_name=None, headers=None,
-                 exception=False):
+                 exception=False, charset=None):
         """
         Alters the init arguments slightly.
         For example, drop 'template_name', and instead use 'data'.
@@ -30,6 +30,7 @@ class Response(SimpleTemplateResponse):
         self.data = data
         self.template_name = template_name
         self.exception = exception
+        self.charset = charset
 
         if headers:
             for name, value in six.iteritems(headers):
@@ -39,18 +40,21 @@ class Response(SimpleTemplateResponse):
     def rendered_content(self):
         renderer = getattr(self, 'accepted_renderer', None)
         media_type = getattr(self, 'accepted_media_type', None)
-        charset = getattr(self, 'charset', None)
         context = getattr(self, 'renderer_context', None)
 
         assert renderer, ".accepted_renderer not set on Response"
         assert media_type, ".accepted_media_type not set on Response"
         assert context, ".renderer_context not set on Response"
         context['response'] = self
-        if charset is not None:
-            ct = "{0}; charset={1}".format(media_type, charset)
+
+        if self.charset is None:
+            self.charset = renderer.charset
+
+        if self.charset is not None:
+            content_type = "{0}; charset={1}".format(media_type, self.charset)
         else:
-            ct = media_type
-        self['Content-Type'] = ct
+            content_type = media_type
+        self['Content-Type'] = content_type
         return renderer.render(self.data, media_type, context)
 
     @property
@@ -71,4 +75,4 @@ class Response(SimpleTemplateResponse):
         for key in ('accepted_renderer', 'renderer_context', 'data'):
             if key in state:
                 del state[key]
-        return state
\ No newline at end of file
+        return state
diff --git a/rest_framework/settings.py b/rest_framework/settings.py
index 255a95e21..beb511aca 100644
--- a/rest_framework/settings.py
+++ b/rest_framework/settings.py
@@ -83,8 +83,6 @@ DEFAULTS = {
     'FORMAT_SUFFIX_KWARG': 'format',
 
     # Input and output formats
-    'DEFAULT_CHARSET': None,
-    
     'DATE_INPUT_FORMATS': (
         ISO_8601,
     ),
diff --git a/rest_framework/tests/htmlrenderer.py b/rest_framework/tests/htmlrenderer.py
index 8f2e2b5a0..5d18a6e83 100644
--- a/rest_framework/tests/htmlrenderer.py
+++ b/rest_framework/tests/htmlrenderer.py
@@ -66,19 +66,19 @@ class TemplateHTMLRendererTests(TestCase):
     def test_simple_html_view(self):
         response = self.client.get('/')
         self.assertContains(response, "example: foobar")
-        self.assertEqual(response['Content-Type'], 'text/html')
+        self.assertEqual(response['Content-Type'], 'text/html; charset=utf-8')
 
     def test_not_found_html_view(self):
         response = self.client.get('/not_found')
         self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
         self.assertEqual(response.content, six.b("404 Not Found"))
-        self.assertEqual(response['Content-Type'], 'text/html')
+        self.assertEqual(response['Content-Type'], 'text/html; charset=utf-8')
 
     def test_permission_denied_html_view(self):
         response = self.client.get('/permission_denied')
         self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
         self.assertEqual(response.content, six.b("403 Forbidden"))
-        self.assertEqual(response['Content-Type'], 'text/html')
+        self.assertEqual(response['Content-Type'], 'text/html; charset=utf-8')
 
 
 class TemplateHTMLRendererExceptionTests(TestCase):
@@ -109,10 +109,10 @@ class TemplateHTMLRendererExceptionTests(TestCase):
         response = self.client.get('/not_found')
         self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
         self.assertEqual(response.content, six.b("404: Not found"))
-        self.assertEqual(response['Content-Type'], 'text/html')
+        self.assertEqual(response['Content-Type'], 'text/html; charset=utf-8')
 
     def test_permission_denied_html_view_with_template(self):
         response = self.client.get('/permission_denied')
         self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
         self.assertEqual(response.content, six.b("403: Permission denied"))
-        self.assertEqual(response['Content-Type'], 'text/html')
+        self.assertEqual(response['Content-Type'], 'text/html; charset=utf-8')
diff --git a/rest_framework/tests/negotiation.py b/rest_framework/tests/negotiation.py
index d7ef6470a..7f84827f0 100644
--- a/rest_framework/tests/negotiation.py
+++ b/rest_framework/tests/negotiation.py
@@ -12,15 +12,14 @@ factory = RequestFactory()
 class MockJSONRenderer(BaseRenderer):
     media_type = 'application/json'
 
+
 class MockHTMLRenderer(BaseRenderer):
     media_type = 'text/html'
 
+
 class NoCharsetSpecifiedRenderer(BaseRenderer):
     media_type = 'my/media'
 
-class CharsetSpecifiedRenderer(BaseRenderer):
-    media_type = 'my/media'
-    charset = 'mycharset'
 
 class TestAcceptedMediaType(TestCase):
     def setUp(self):
@@ -32,32 +31,15 @@ class TestAcceptedMediaType(TestCase):
 
     def test_client_without_accept_use_renderer(self):
         request = Request(factory.get('/'))
-        accepted_renderer, accepted_media_type, charset = self.select_renderer(request)
+        accepted_renderer, accepted_media_type = self.select_renderer(request)
         self.assertEqual(accepted_media_type, 'application/json')
 
     def test_client_underspecifies_accept_use_renderer(self):
         request = Request(factory.get('/', HTTP_ACCEPT='*/*'))
-        accepted_renderer, accepted_media_type, charset = self.select_renderer(request)
+        accepted_renderer, accepted_media_type = self.select_renderer(request)
         self.assertEqual(accepted_media_type, 'application/json')
 
     def test_client_overspecifies_accept_use_client(self):
         request = Request(factory.get('/', HTTP_ACCEPT='application/json; indent=8'))
-        accepted_renderer, accepted_media_type, charset = self.select_renderer(request)
+        accepted_renderer, accepted_media_type = self.select_renderer(request)
         self.assertEqual(accepted_media_type, 'application/json; indent=8')
-        
-class TestCharset(TestCase):
-    def setUp(self):
-        self.renderers = [NoCharsetSpecifiedRenderer()]
-        self.negotiator = DefaultContentNegotiation()
-    
-    def test_returns_none_if_no_charset_set(self):
-        request = Request(factory.get('/'))
-        renderers = [NoCharsetSpecifiedRenderer()]
-        _, _, charset = self.negotiator.select_renderer(request, renderers)
-        self.assertIsNone(charset)
-    
-    def test_returns_attribute_from_renderer_if_charset_is_set(self):
-        request = Request(factory.get('/'))
-        renderers = [CharsetSpecifiedRenderer()]
-        _, _, charset =  self.negotiator.select_renderer(request, renderers)
-        self.assertEquals(CharsetSpecifiedRenderer.charset, charset)
\ No newline at end of file
diff --git a/rest_framework/tests/response.py b/rest_framework/tests/response.py
index f2a1c635f..8f1163e87 100644
--- a/rest_framework/tests/response.py
+++ b/rest_framework/tests/response.py
@@ -12,6 +12,7 @@ from rest_framework.renderers import (
 from rest_framework.settings import api_settings
 from rest_framework.compat import six
 
+
 class MockPickleRenderer(BaseRenderer):
     media_type = 'application/pickle'
 
@@ -19,6 +20,7 @@ class MockPickleRenderer(BaseRenderer):
 class MockJsonRenderer(BaseRenderer):
     media_type = 'application/json'
 
+
 class MockTextMediaRenderer(BaseRenderer):
     media_type = 'text/html'
 
@@ -44,6 +46,7 @@ class RendererB(BaseRenderer):
     def render(self, data, media_type=None, renderer_context=None):
         return RENDERER_B_SERIALIZER(data)
 
+
 class RendererC(RendererB):
     media_type = 'mock/rendererc'
     format = 'formatc'
@@ -56,6 +59,14 @@ class MockView(APIView):
     def get(self, request, **kwargs):
         return Response(DUMMYCONTENT, status=DUMMYSTATUS)
 
+
+class MockViewSettingCharset(APIView):
+    renderer_classes = (RendererA, RendererB, RendererC)
+
+    def get(self, request, **kwargs):
+        return Response(DUMMYCONTENT, status=DUMMYSTATUS, charset='setbyview')
+
+
 class HTMLView(APIView):
     renderer_classes = (BrowsableAPIRenderer, )
 
@@ -70,6 +81,7 @@ class HTMLView1(APIView):
         return Response('text')
 
 urlpatterns = patterns('',
+    url(r'^setbyview$', MockViewSettingCharset.as_view(renderer_classes=[RendererA, RendererB, RendererC])),
     url(r'^.*\.(?P<format>.+)$', MockView.as_view(renderer_classes=[RendererA, RendererB, RendererC])),
     url(r'^$', MockView.as_view(renderer_classes=[RendererA, RendererB, RendererC])),
     url(r'^html$', HTMLView.as_view()),
@@ -178,43 +190,37 @@ class Issue122Tests(TestCase):
         """
         self.client.get('/html1')
 
+
 class Issue807Testts(TestCase):
     """
     Covers #807
     """
-    
+
     urls = 'rest_framework.tests.response'
-    
+
     def test_does_not_append_charset_by_default(self):
         """
-        For backwards compatibility `REST_FRAMEWORK['DEFAULT_CHARSET']` defaults
-        to None, so that all legacy code works as expected.
+        Renderers don't include a charset unless set explicitly.
         """
         headers = {"HTTP_ACCEPT": RendererA.media_type}
         resp = self.client.get('/', **headers)
-        self.assertEquals(RendererA.media_type, resp['Content-Type'])
-    
+        self.assertEqual(RendererA.media_type, resp['Content-Type'])
+
     def test_if_there_is_charset_specified_on_renderer_it_gets_appended(self):
         """
         If renderer class has charset attribute declared, it gets appended
         to Response's Content-Type
         """
-        resp = self.client.get('/?format=%s' % RendererC.format)
-        expected = "{0}; charset={1}".format(RendererC.media_type, RendererC.charset)
-        self.assertEquals(expected, resp['Content-Type'])
-    
-    def test_if_there_is_default_charset_specified_it_gets_appended(self):
-        """
-        If user defines `REST_FRAMEWORK['DEFAULT_CHARSET']` it will get appended
-        to Content-Type of all responses.
-        """
-        original_default_charset = api_settings.DEFAULT_CHARSET
-        api_settings.DEFAULT_CHARSET = "utf-8"
-        headers = {'HTTP_ACCEPT': RendererA.media_type}
+        headers = {"HTTP_ACCEPT": RendererC.media_type}
         resp = self.client.get('/', **headers)
-        expected = "{0}; charset={1}".format(
-            RendererA.media_type,
-            api_settings.DEFAULT_CHARSET
-        )
-        self.assertEquals(expected, resp['Content-Type'])
-        api_settings.DEFAULT_CHARSET = original_default_charset
\ No newline at end of file
+        expected = "{0}; charset={1}".format(RendererC.media_type, RendererC.charset)
+        self.assertEqual(expected, resp['Content-Type'])
+
+    def test_charset_set_explictly_on_response(self):
+        """
+        The charset may be set explictly on the response.
+        """
+        headers = {"HTTP_ACCEPT": RendererC.media_type}
+        resp = self.client.get('/setbyview', **headers)
+        expected = "{0}; charset={1}".format(RendererC.media_type, 'setbyview')
+        self.assertEqual(expected, resp['Content-Type'])
diff --git a/rest_framework/views.py b/rest_framework/views.py
index 035aa6466..555fa2f40 100644
--- a/rest_framework/views.py
+++ b/rest_framework/views.py
@@ -183,9 +183,7 @@ class APIView(View):
             return conneg.select_renderer(request, renderers, self.format_kwarg)
         except Exception:
             if force:
-                charset = renderers[0].charset
-                charset = charset if charset is not None else api_settings.DEFAULT_CHARSET
-                return (renderers[0], renderers[0].media_type, renderers[0].charset)
+                return (renderers[0], renderers[0].media_type)
             raise
 
     def perform_authentication(self, request):
@@ -252,10 +250,7 @@ class APIView(View):
 
         # Perform content negotiation and store the accepted info on the request
         neg = self.perform_content_negotiation(request)
-        renderer, media_type, charset = neg
-        request.accepted_renderer = renderer
-        request.accepted_media_type = media_type
-        request.accepted_charset = charset
+        request.accepted_renderer, request.accepted_media_type = neg
 
     def finalize_response(self, request, response, *args, **kwargs):
         """
@@ -270,16 +265,11 @@ class APIView(View):
         if isinstance(response, Response):
             if not getattr(request, 'accepted_renderer', None):
                 neg = self.perform_content_negotiation(request, force=True)
-                renderer, media_type, charset = neg
-                request.accepted_renderer = renderer
-                request.accepted_media_type = media_type 
+                request.accepted_renderer, request.accepted_media_type = neg
 
             response.accepted_renderer = request.accepted_renderer
             response.accepted_media_type = request.accepted_media_type
             response.renderer_context = self.get_renderer_context()
-            charset = request.accepted_renderer.charset
-            charset = charset if charset else api_settings.DEFAULT_CHARSET
-            response.charset = charset
 
         for key, value in self.headers.items():
             response[key] = value

From d4721fc1f70050fc275ad16958e4795e0f3aab1c Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Sat, 18 May 2013 17:25:38 +0100
Subject: [PATCH 111/197] Correct charset on UnicodeJSONRenderer

---
 rest_framework/renderers.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py
index a67c5eeae..9d08c5d48 100644
--- a/rest_framework/renderers.py
+++ b/rest_framework/renderers.py
@@ -79,6 +79,7 @@ class JSONRenderer(BaseRenderer):
 
 class UnicodeJSONRenderer(JSONRenderer):
     ensure_ascii = False
+    charset = 'utf-8'
 
 
 class JSONPRenderer(JSONRenderer):

From fecadacab150aab48b8b84f4f0e5340ead74c287 Mon Sep 17 00:00:00 2001
From: Oscar Vilaplana <dev@oscarvilaplana.cat>
Date: Sat, 18 May 2013 18:27:53 +0200
Subject: [PATCH 112/197] added tests for form

---
 rest_framework/fields.py       |  6 +++---
 rest_framework/tests/fields.py | 23 ++++++++++++++++++++++-
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index b23813ec3..544afc986 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -135,8 +135,7 @@ def humanize_field(field):
 
     """
     humanized = {
-        'type': (field.type_name if field.type_name
-                 else humanize_field_type(field.form_field_class)),
+        'type': humanize_field_type(field.__class__),
         'required': getattr(field, 'required', False),
         'label': field.label,
     }
@@ -154,7 +153,8 @@ def humanize_form_fields(form):
     :return: A dictionary of {field_label: humanized description}
 
     """
-    fields = SortedDict([(f.name, humanize_field(f)) for f in form.fields])
+    fields = SortedDict([(name, humanize_field(field))
+                         for name, field in form.fields.iteritems()])
     return fields
 
 
diff --git a/rest_framework/tests/fields.py b/rest_framework/tests/fields.py
index de61b0112..6a180cb89 100644
--- a/rest_framework/tests/fields.py
+++ b/rest_framework/tests/fields.py
@@ -4,7 +4,8 @@ General serializer field tests.
 from __future__ import unicode_literals
 from django.utils.datastructures import SortedDict
 import datetime
-from rest_framework.fields import humanize_field, humanize_field_type
+from rest_framework.fields import (humanize_field, humanize_field_type,
+                                   humanize_form_fields)
 from django import forms
 from decimal import Decimal
 from django.db import models
@@ -742,3 +743,23 @@ class HumanizedField(TestCase):
     def test_label(self):
         for field in (self.required_field, self.optional_field):
             self.assertEqual(humanize_field(field)['label'], field.label)
+
+
+class Form(forms.Form):
+    field1 = forms.CharField(max_length=3, label='field one')
+    field2 = forms.CharField(label='field two')
+
+
+class HumanizedSerializer(TestCase):
+    def setUp(self):
+        self.serializer = TimestampedModelSerializer()
+
+    def test_humanized(self):
+        humanized = humanize_form_fields(Form())
+        self.assertEqual(humanized, {
+            'field1': {
+                u'help_text': u'', u'required': True,
+                u'type': u'Single Character', u'label': 'field one'},
+            'field2': {
+                u'help_text': u'', u'required': True,
+                u'type': u'Single Character', u'label': 'field two'}})

From 7f1cc82f96c2ba4064b28957a8b2d5b313be3c40 Mon Sep 17 00:00:00 2001
From: Nikolaus Schlemm <capo@coder-nostra.com>
Date: Sat, 18 May 2013 18:29:51 +0200
Subject: [PATCH 113/197] added unittests for permission check of exposing
 actions via OPTIONS

---
 rest_framework/tests/permissions.py | 45 +++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/rest_framework/tests/permissions.py b/rest_framework/tests/permissions.py
index b3993be58..5a18182bf 100644
--- a/rest_framework/tests/permissions.py
+++ b/rest_framework/tests/permissions.py
@@ -108,6 +108,51 @@ class ModelPermissionsIntegrationTests(TestCase):
         response = instance_view(request, pk='2')
         self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
 
+    def test_options_permitted(self):
+        request = factory.options('/', content_type='application/json',
+                               HTTP_AUTHORIZATION=self.permitted_credentials)
+        response = root_view(request, pk='1')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertIn('actions', response.data)
+        self.assertEquals(response.data['actions'].keys(), ['POST', 'GET',])
+
+        request = factory.options('/1', content_type='application/json',
+                               HTTP_AUTHORIZATION=self.permitted_credentials)
+        response = instance_view(request, pk='1')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertIn('actions', response.data)
+        self.assertEquals(response.data['actions'].keys(), ['PUT', 'PATCH', 'DELETE', 'GET',])
+
+    def test_options_disallowed(self):
+        request = factory.options('/', content_type='application/json',
+                               HTTP_AUTHORIZATION=self.disallowed_credentials)
+        response = root_view(request, pk='1')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertIn('actions', response.data)
+        self.assertEquals(response.data['actions'].keys(), ['GET',])
+
+        request = factory.options('/1', content_type='application/json',
+                               HTTP_AUTHORIZATION=self.disallowed_credentials)
+        response = instance_view(request, pk='1')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertIn('actions', response.data)
+        self.assertEquals(response.data['actions'].keys(), ['GET',])
+
+    def test_options_updateonly(self):
+        request = factory.options('/', content_type='application/json',
+                               HTTP_AUTHORIZATION=self.updateonly_credentials)
+        response = root_view(request, pk='1')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertIn('actions', response.data)
+        self.assertEquals(response.data['actions'].keys(), ['GET',])
+
+        request = factory.options('/1', content_type='application/json',
+                               HTTP_AUTHORIZATION=self.updateonly_credentials)
+        response = instance_view(request, pk='1')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertIn('actions', response.data)
+        self.assertEquals(response.data['actions'].keys(), ['PUT', 'PATCH', 'GET',])
+
 
 class OwnerModel(models.Model):
     text = models.CharField(max_length=100)

From 351814e110d642bf1351b95141924190e56d9694 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Sat, 18 May 2013 18:32:02 +0200
Subject: [PATCH 114/197] Added @lolek09 for work on #862.  Kick ass!

---
 docs/topics/credits.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index 0e206de82..acd6576ec 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -131,6 +131,7 @@ The following people have helped make REST framework great.
 * Ryan Kaskel - [ryankask]
 * Andy McKay - [andymckay]
 * Matteo Suppo - [matteosuppo]
+* Karol Majta - [lolek09]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -298,3 +299,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [ryankask]: https://github.com/ryankask
 [andymckay]: https://github.com/andymckay
 [matteosuppo]: https://github.com/matteosuppo
+[lolek09]: https://github.com/lolek09

From 4631b91e144ae758b4417f20b0379ce5b9179ee6 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Sat, 18 May 2013 21:12:44 +0100
Subject: [PATCH 115/197] Fix broken 'binary content' in browseable API

---
 rest_framework/renderers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py
index 9d08c5d48..6b508e6d0 100644
--- a/rest_framework/renderers.py
+++ b/rest_framework/renderers.py
@@ -332,8 +332,8 @@ class BrowsableAPIRenderer(BaseRenderer):
         renderer_context['indent'] = 4
         content = renderer.render(data, accepted_media_type, renderer_context)
 
-        if not isinstance(content, six.text_type):
-            return '[%d bytes of binary content]'
+        if not all(char in string.printable for char in content):
+            return '[%d bytes of binary content]' % len(content)
 
         return content
 

From 4802177766b92c644d7c6f446d0bdf2dbe1917e6 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Sat, 18 May 2013 21:19:53 +0100
Subject: [PATCH 116/197] Enforce object permissions check when rendering forms
 in browseable API

---
 rest_framework/renderers.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py
index 6b508e6d0..08df7e91d 100644
--- a/rest_framework/renderers.py
+++ b/rest_framework/renderers.py
@@ -349,6 +349,7 @@ class BrowsableAPIRenderer(BaseRenderer):
 
         try:
             view.check_permissions(request)
+            view.check_object_permissions(request, obj)
         except exceptions.APIException:
             return False  # Doesn't have permissions
         return True

From 7c945b43f05f1b340f78c23f80c8043937c7fd2a Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Sat, 18 May 2013 23:52:02 +0100
Subject: [PATCH 117/197] Only use object permissions in browsable api form
 generation if an object exists

---
 rest_framework/renderers.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py
index 08df7e91d..c67c8ed6f 100644
--- a/rest_framework/renderers.py
+++ b/rest_framework/renderers.py
@@ -349,7 +349,8 @@ class BrowsableAPIRenderer(BaseRenderer):
 
         try:
             view.check_permissions(request)
-            view.check_object_permissions(request, obj)
+            if obj is not None:
+                view.check_object_permissions(request, obj)
         except exceptions.APIException:
             return False  # Doesn't have permissions
         return True

From c0f3a1c397a564ee78b3a656f14f7ff46b0d2b31 Mon Sep 17 00:00:00 2001
From: Nikolaus Schlemm <capo@coder-nostra.com>
Date: Sun, 19 May 2013 09:25:02 +0200
Subject: [PATCH 118/197] Integrated status quo of grimborg's awesome
 humanize_field() for exposing field metadata via OPTIONS :)

---
 rest_framework/fields.py         |  2 +-
 rest_framework/tests/generics.py | 36 ++++++++++++++++----------------
 rest_framework/views.py          |  3 +--
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index d6db3ebeb..a215e02b7 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -136,7 +136,7 @@ def humanize_field(field):
     humanized = {
         'type': humanize_field_type(field.__class__),
         'required': getattr(field, 'required', False),
-        'label': field.label,
+        'label': getattr(field, 'label', None),
     }
     optional_attrs = ['read_only', 'help_text']
     for attr in optional_attrs:
diff --git a/rest_framework/tests/generics.py b/rest_framework/tests/generics.py
index d8556638a..a1edd28d7 100644
--- a/rest_framework/tests/generics.py
+++ b/rest_framework/tests/generics.py
@@ -128,18 +128,18 @@ class TestRootView(TestCase):
         for method in ('GET', 'POST',):
             expected['actions'][method] = {
                 'text': {
-                    'description': '',
-                    'label': '',
-                    'readonly': False,
+                    #'description': '',
+                    'label': None,
+                    'read_only': False,
                     'required': True,
-                    'type': 'CharField',
+                    'type': 'Single Character',
                 },
                 'id': {
-                    'description': '',
-                    'label': '',
-                    'readonly': True,
-                    'required': True,
-                    'type': 'IntegerField',
+                    #'description': '',
+                    'label': None,
+                    'read_only': True,
+                    'required': False,
+                    'type': 'Integer',
                 },
             }
         self.assertEqual(response.status_code, status.HTTP_200_OK)
@@ -264,18 +264,18 @@ class TestInstanceView(TestCase):
         for method in ('GET', 'PATCH', 'PUT', 'DELETE'):
             expected['actions'][method] = {
                 'text': {
-                    'description': '',
-                    'label': '',
-                    'readonly': False,
+                    #'description': '',
+                    'label': None,
+                    'read_only': False,
                     'required': True,
-                    'type': 'CharField',
+                    'type': 'Single Character',
                 },
                 'id': {
-                    'description': '',
-                    'label': '',
-                    'readonly': True,
-                    'required': True,
-                    'type': 'IntegerField',
+                    #'description': '',
+                    'label': None,
+                    'read_only': True,
+                    'required': False,
+                    'type': 'Integer',
                 },
             }
         self.assertEqual(response.status_code, status.HTTP_200_OK)
diff --git a/rest_framework/views.py b/rest_framework/views.py
index 11d50e5dc..e8bd9f505 100644
--- a/rest_framework/views.py
+++ b/rest_framework/views.py
@@ -85,8 +85,7 @@ class APIView(View):
                     field_name_types = {}
                     for name, field in serializer.fields.iteritems():
                         from rest_framework.fields import humanize_field
-                        humanize_field(field)
-                        field_name_types[name] = field.__class__.__name__
+                        field_name_types[name] = humanize_field(field)
 
                 actions[method] = field_name_types
             except exceptions.PermissionDenied:

From b915c1d4d81fc459ed7c79ee5264ef7467963c3f Mon Sep 17 00:00:00 2001
From: Oscar Vilaplana <dev@oscarvilaplana.cat>
Date: Sun, 19 May 2013 11:15:38 +0200
Subject: [PATCH 119/197] Made field label optional in OPTIONS

---
 rest_framework/fields.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index a215e02b7..b1bbb4d4a 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -136,11 +136,10 @@ def humanize_field(field):
     humanized = {
         'type': humanize_field_type(field.__class__),
         'required': getattr(field, 'required', False),
-        'label': getattr(field, 'label', None),
     }
-    optional_attrs = ['read_only', 'help_text']
+    optional_attrs = ['read_only', 'help_text', 'label']
     for attr in optional_attrs:
-        if hasattr(field, attr):
+        if getattr(field, attr, None) is not None:
             humanized[attr] = getattr(field, attr)
     return humanized
 

From 08e9e2042c99cde66721a22475df6e084a06e3d2 Mon Sep 17 00:00:00 2001
From: Oscar Vilaplana <dev@oscarvilaplana.cat>
Date: Sun, 19 May 2013 11:26:56 +0200
Subject: [PATCH 120/197] Disabled label and help_text in unit test. We should
 change the test so that it sets them up.

---
 rest_framework/tests/generics.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/rest_framework/tests/generics.py b/rest_framework/tests/generics.py
index a1edd28d7..293c6633c 100644
--- a/rest_framework/tests/generics.py
+++ b/rest_framework/tests/generics.py
@@ -128,15 +128,17 @@ class TestRootView(TestCase):
         for method in ('GET', 'POST',):
             expected['actions'][method] = {
                 'text': {
-                    #'description': '',
-                    'label': None,
+                    # TODO add help_text and label when they are available
+                    #'help_text': '',
+                    #'label': None,
                     'read_only': False,
                     'required': True,
                     'type': 'Single Character',
                 },
                 'id': {
-                    #'description': '',
-                    'label': None,
+                    # TODO add help_text and label when they are available
+                    #'help_text': '',
+                    #'label': None,
                     'read_only': True,
                     'required': False,
                     'type': 'Integer',
@@ -264,15 +266,19 @@ class TestInstanceView(TestCase):
         for method in ('GET', 'PATCH', 'PUT', 'DELETE'):
             expected['actions'][method] = {
                 'text': {
+                    # TODO uncomment label and description when they are
+                    # available
                     #'description': '',
-                    'label': None,
+                    #'label': None,
                     'read_only': False,
                     'required': True,
                     'type': 'Single Character',
                 },
                 'id': {
+                    # TODO uncomment label and description when they are
+                    # available
                     #'description': '',
-                    'label': None,
+                    #'label': None,
                     'read_only': True,
                     'required': False,
                     'type': 'Integer',

From a91841f7fe91f79a18a1f4f0352ec3e07f389a0a Mon Sep 17 00:00:00 2001
From: Nikolaus Schlemm <capo@coder-nostra.com>
Date: Sun, 19 May 2013 11:29:41 +0200
Subject: [PATCH 121/197] WORKAROUND: avoid errors like "AttributeError:
 'APIRoot' object has no attribute 'get_serializer'"

---
 rest_framework/views.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rest_framework/views.py b/rest_framework/views.py
index e8bd9f505..6348ca885 100644
--- a/rest_framework/views.py
+++ b/rest_framework/views.py
@@ -80,6 +80,8 @@ class APIView(View):
                 self.check_permissions(cloned_request)
 
                 # TODO: find right placement - APIView does not have get_serializer
+                if not hasattr(self, 'get_serializer'):
+                    continue
                 serializer = self.get_serializer()
                 if serializer is not None:
                     field_name_types = {}

From 1154c12b3389c3098ee8755887f785da43666ec4 Mon Sep 17 00:00:00 2001
From: Nikolaus Schlemm <capo@coder-nostra.com>
Date: Sun, 19 May 2013 11:37:12 +0200
Subject: [PATCH 122/197] don't expose fields for GET and DELETE - leaving room
 for parameters like e.g. filter or paginate

---
 rest_framework/views.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/rest_framework/views.py b/rest_framework/views.py
index 6348ca885..c9d55c18e 100644
--- a/rest_framework/views.py
+++ b/rest_framework/views.py
@@ -79,6 +79,11 @@ class APIView(View):
             try:
                 self.check_permissions(cloned_request)
 
+                # TODO: discuss whether and how to expose parameters like e.g. filter or paginate
+                if method in ('GET', 'DELETE'):
+                    actions[method] = {}
+                    continue
+
                 # TODO: find right placement - APIView does not have get_serializer
                 if not hasattr(self, 'get_serializer'):
                     continue

From b07cfdcf54961dc44604c6b87e2cc339901038a3 Mon Sep 17 00:00:00 2001
From: Nikolaus Schlemm <capo@coder-nostra.com>
Date: Sun, 19 May 2013 13:54:13 +0200
Subject: [PATCH 123/197] FIXED TEST FOR: don't expose fields for GET and
 DELETE - leaving room for parameters like e.g. filter or paginate

---
 rest_framework/tests/generics.py | 42 +++++++++++++++++---------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/rest_framework/tests/generics.py b/rest_framework/tests/generics.py
index 293c6633c..2cbb55e6c 100644
--- a/rest_framework/tests/generics.py
+++ b/rest_framework/tests/generics.py
@@ -125,25 +125,25 @@ class TestRootView(TestCase):
             'actions': {}
         }
         # TODO: this is just a draft for fields' metadata - needs review and decision
-        for method in ('GET', 'POST',):
-            expected['actions'][method] = {
-                'text': {
-                    # TODO add help_text and label when they are available
-                    #'help_text': '',
-                    #'label': None,
-                    'read_only': False,
-                    'required': True,
-                    'type': 'Single Character',
-                },
-                'id': {
-                    # TODO add help_text and label when they are available
-                    #'help_text': '',
-                    #'label': None,
-                    'read_only': True,
-                    'required': False,
-                    'type': 'Integer',
-                },
-            }
+        expected['actions']['GET'] = {}
+        expected['actions']['POST'] = {
+            'text': {
+                # TODO add help_text and label when they are available
+                #'help_text': '',
+                #'label': None,
+                'read_only': False,
+                'required': True,
+                'type': 'Single Character',
+            },
+            'id': {
+                # TODO add help_text and label when they are available
+                #'help_text': '',
+                #'label': None,
+                'read_only': True,
+                'required': False,
+                'type': 'Integer',
+            },
+        }
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.data, expected)
 
@@ -263,7 +263,9 @@ class TestInstanceView(TestCase):
             'actions': {}
         }
         # TODO: this is just a draft idea for fields' metadata - needs review and decision
-        for method in ('GET', 'PATCH', 'PUT', 'DELETE'):
+        for method in ('GET', 'DELETE'):
+            expected['actions'][method] = {}
+        for method in ('PATCH', 'PUT'):
             expected['actions'][method] = {
                 'text': {
                     # TODO uncomment label and description when they are

From efca5f6feccf72421577ccea8889c7de729c47b8 Mon Sep 17 00:00:00 2001
From: Nikolaus Schlemm <capo@coder-nostra.com>
Date: Sun, 19 May 2013 14:54:16 +0200
Subject: [PATCH 124/197] use double quotes for docstring instead of single
 quotes

---
 rest_framework/views.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rest_framework/views.py b/rest_framework/views.py
index c9d55c18e..be64a8d0e 100644
--- a/rest_framework/views.py
+++ b/rest_framework/views.py
@@ -65,9 +65,9 @@ class APIView(View):
         return content
 
     def _generate_action_metadata(self, request):
-        '''
+        """
         Helper for generating the fields metadata for allowed and permitted methods.
-        '''
+        """
         actions = {}
 
         for method in self.allowed_methods:

From f1f5f92d899ae37d71234bf8a8a3ad52e20a253f Mon Sep 17 00:00:00 2001
From: Oscar Vilaplana <dev@oscarvilaplana.cat>
Date: Sun, 19 May 2013 14:55:46 +0200
Subject: [PATCH 125/197] Added tests, cleaned up imports

---
 rest_framework/tests/fields.py | 20 +++++++++++---------
 rest_framework/tests/views.py  |  3 +++
 rest_framework/views.py        | 14 +++++---------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/rest_framework/tests/fields.py b/rest_framework/tests/fields.py
index 7a5ed7181..6bc37db28 100644
--- a/rest_framework/tests/fields.py
+++ b/rest_framework/tests/fields.py
@@ -2,21 +2,23 @@
 General serializer field tests.
 """
 from __future__ import unicode_literals
-from django.utils.datastructures import SortedDict
-import datetime
-from rest_framework.fields import (humanize_field, humanize_field_type,
-                                   humanize_form_fields)
-from django import forms
+
+from collections import namedtuple
 from decimal import Decimal
+from uuid import uuid4
+
+import datetime
+from django import forms
+from django.core import validators
 from django.db import models
 from django.test import TestCase
-from django.core import validators
+from django.utils.datastructures import SortedDict
+
 from rest_framework import serializers
+from rest_framework.fields import (humanize_field, humanize_field_type, humanize_form_fields,
+                                   Field)
 from rest_framework.serializers import Serializer
 from rest_framework.tests.models import RESTFrameworkModel
-from rest_framework.fields import Field
-from collections import namedtuple
-from uuid import uuid4
 
 
 class TimestampedModel(models.Model):
diff --git a/rest_framework/tests/views.py b/rest_framework/tests/views.py
index 994cf6dc3..b70ef4ae2 100644
--- a/rest_framework/tests/views.py
+++ b/rest_framework/tests/views.py
@@ -6,6 +6,8 @@ from rest_framework.decorators import api_view
 from rest_framework.response import Response
 from rest_framework.settings import api_settings
 from rest_framework.views import APIView
+from rest_framework import exceptions
+from rest_framework import serializers
 import copy
 
 factory = RequestFactory()
@@ -98,3 +100,4 @@ class FunctionBasedViewIntegrationTests(TestCase):
         }
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
         self.assertEqual(sanitise_json_error(response.data), expected)
+
diff --git a/rest_framework/views.py b/rest_framework/views.py
index c9d55c18e..1af4c0baa 100644
--- a/rest_framework/views.py
+++ b/rest_framework/views.py
@@ -2,13 +2,16 @@
 Provides an APIView class that is the base of all views in REST framework.
 """
 from __future__ import unicode_literals
+
 from django.core.exceptions import PermissionDenied
 from django.http import Http404, HttpResponse
 from django.views.decorators.csrf import csrf_exempt
+
 from rest_framework import status, exceptions
 from rest_framework.compat import View
-from rest_framework.response import Response
+from rest_framework.fields import humanize_form_fields
 from rest_framework.request import clone_request, Request
+from rest_framework.response import Response
 from rest_framework.settings import api_settings
 from rest_framework.utils.formatting import get_view_name, get_view_description
 
@@ -69,7 +72,6 @@ class APIView(View):
         Helper for generating the fields metadata for allowed and permitted methods.
         '''
         actions = {}
-
         for method in self.allowed_methods:
             # skip HEAD and OPTIONS
             if method in ('HEAD', 'OPTIONS'):
@@ -84,17 +86,11 @@ class APIView(View):
                     actions[method] = {}
                     continue
 
-                # TODO: find right placement - APIView does not have get_serializer
                 if not hasattr(self, 'get_serializer'):
                     continue
                 serializer = self.get_serializer()
                 if serializer is not None:
-                    field_name_types = {}
-                    for name, field in serializer.fields.iteritems():
-                        from rest_framework.fields import humanize_field
-                        field_name_types[name] = humanize_field(field)
-
-                actions[method] = field_name_types
+                    actions[method] = humanize_form_fields(serializer)
             except exceptions.PermissionDenied:
                 # don't add this method
                 pass

From 696c053f4fbbbb302d9b214d8daf511879256a7f Mon Sep 17 00:00:00 2001
From: Oscar Vilaplana <dev@oscarvilaplana.cat>
Date: Sun, 19 May 2013 15:04:43 +0200
Subject: [PATCH 126/197] s/Single Character/String/

---
 rest_framework/fields.py         | 2 +-
 rest_framework/tests/fields.py   | 4 ++--
 rest_framework/tests/generics.py | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index b1bbb4d4a..98768d721 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -33,7 +33,7 @@ from rest_framework.settings import api_settings
 
 HUMANIZED_FIELD_TYPES = {
     'BooleanField': u'Boolean',
-    'CharField': u'Single Character',
+    'CharField': u'String',
     'ChoiceField': u'Single Choice',
     'ComboField': u'Single Choice',
     'DateField': u'Date',
diff --git a/rest_framework/tests/fields.py b/rest_framework/tests/fields.py
index 6bc37db28..3882b53f4 100644
--- a/rest_framework/tests/fields.py
+++ b/rest_framework/tests/fields.py
@@ -885,7 +885,7 @@ class HumanizedSerializer(TestCase):
         self.assertEqual(humanized, {
             'field1': {
                 u'help_text': u'', u'required': True,
-                u'type': u'Single Character', u'label': 'field one'},
+                u'type': u'String', u'label': 'field one'},
             'field2': {
                 u'help_text': u'', u'required': True,
-                u'type': u'Single Character', u'label': 'field two'}})
+                u'type': u'String', u'label': 'field two'}})
diff --git a/rest_framework/tests/generics.py b/rest_framework/tests/generics.py
index 2cbb55e6c..38bf1990b 100644
--- a/rest_framework/tests/generics.py
+++ b/rest_framework/tests/generics.py
@@ -133,7 +133,7 @@ class TestRootView(TestCase):
                 #'label': None,
                 'read_only': False,
                 'required': True,
-                'type': 'Single Character',
+                'type': 'String',
             },
             'id': {
                 # TODO add help_text and label when they are available
@@ -274,7 +274,7 @@ class TestInstanceView(TestCase):
                     #'label': None,
                     'read_only': False,
                     'required': True,
-                    'type': 'Single Character',
+                    'type': 'String',
                 },
                 'id': {
                     # TODO uncomment label and description when they are

From edbf65c06e403645d91ce9dec24495a58323a3a0 Mon Sep 17 00:00:00 2001
From: Oscar Vilaplana <dev@oscarvilaplana.cat>
Date: Sun, 19 May 2013 15:06:24 +0200
Subject: [PATCH 127/197] Removed unused imports

---
 rest_framework/tests/views.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/rest_framework/tests/views.py b/rest_framework/tests/views.py
index b70ef4ae2..c0f42a068 100644
--- a/rest_framework/tests/views.py
+++ b/rest_framework/tests/views.py
@@ -1,14 +1,16 @@
 from __future__ import unicode_literals
+
+import copy
+
 from django.test import TestCase
 from django.test.client import RequestFactory
+
 from rest_framework import status
 from rest_framework.decorators import api_view
 from rest_framework.response import Response
 from rest_framework.settings import api_settings
 from rest_framework.views import APIView
-from rest_framework import exceptions
-from rest_framework import serializers
-import copy
+
 
 factory = RequestFactory()
 

From e80488b6192580c7a731114e58edd718d1c79120 Mon Sep 17 00:00:00 2001
From: Oscar Vilaplana <dev@oscarvilaplana.cat>
Date: Sun, 19 May 2013 15:08:41 +0200
Subject: [PATCH 128/197] Added min_length and max_length

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

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 98768d721..cdcb0ee9e 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -137,7 +137,8 @@ def humanize_field(field):
         'type': humanize_field_type(field.__class__),
         'required': getattr(field, 'required', False),
     }
-    optional_attrs = ['read_only', 'help_text', 'label']
+    optional_attrs = ['read_only', 'help_text', 'label',
+                      'min_length', 'max_length']
     for attr in optional_attrs:
         if getattr(field, attr, None) is not None:
             humanized[attr] = getattr(field, attr)

From 31893cff745b8cb62c3cc98b7103af2860eca319 Mon Sep 17 00:00:00 2001
From: Nikolaus Schlemm <capo@coder-nostra.com>
Date: Sun, 19 May 2013 15:12:01 +0200
Subject: [PATCH 129/197] * make test assertion more explicit * cleanup

---
 rest_framework/tests/fields.py | 2 +-
 rest_framework/tests/views.py  | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/rest_framework/tests/fields.py b/rest_framework/tests/fields.py
index 6bc37db28..d0b352413 100644
--- a/rest_framework/tests/fields.py
+++ b/rest_framework/tests/fields.py
@@ -846,7 +846,7 @@ class HumanizedFieldType(TestCase):
 
         """
         self.assertIsInstance(humanized, unicode)
-        self.assertTrue(humanized)
+        self.assertNotEqual(humanized, '')
 
 
 class HumanizedField(TestCase):
diff --git a/rest_framework/tests/views.py b/rest_framework/tests/views.py
index b70ef4ae2..994cf6dc3 100644
--- a/rest_framework/tests/views.py
+++ b/rest_framework/tests/views.py
@@ -6,8 +6,6 @@ from rest_framework.decorators import api_view
 from rest_framework.response import Response
 from rest_framework.settings import api_settings
 from rest_framework.views import APIView
-from rest_framework import exceptions
-from rest_framework import serializers
 import copy
 
 factory = RequestFactory()
@@ -100,4 +98,3 @@ class FunctionBasedViewIntegrationTests(TestCase):
         }
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
         self.assertEqual(sanitise_json_error(response.data), expected)
-

From 7a5cd090aa91a5d1af0d54586f36e2156e1ccc60 Mon Sep 17 00:00:00 2001
From: Oscar Vilaplana <dev@oscarvilaplana.cat>
Date: Sun, 19 May 2013 15:45:33 +0200
Subject: [PATCH 130/197] fixed tests, added docs, renamed helper method

---
 rest_framework/tests/fields.py   | 22 +++++++++++++---------
 rest_framework/tests/generics.py |  2 ++
 rest_framework/views.py          | 13 +++++++------
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/rest_framework/tests/fields.py b/rest_framework/tests/fields.py
index 13df769f8..856980926 100644
--- a/rest_framework/tests/fields.py
+++ b/rest_framework/tests/fields.py
@@ -15,8 +15,8 @@ from django.test import TestCase
 from django.utils.datastructures import SortedDict
 
 from rest_framework import serializers
-from rest_framework.fields import (humanize_field, humanize_field_type, humanize_form_fields,
-                                   Field)
+from rest_framework.fields import (humanize_field, humanize_field_type,
+                                   humanize_form_fields, Field)
 from rest_framework.serializers import Serializer
 from rest_framework.tests.models import RESTFrameworkModel
 
@@ -882,10 +882,14 @@ class HumanizedSerializer(TestCase):
 
     def test_humanized(self):
         humanized = humanize_form_fields(Form())
-        self.assertEqual(humanized, {
-            'field1': {
-                u'help_text': u'', u'required': True,
-                u'type': u'String', u'label': 'field one'},
-            'field2': {
-                u'help_text': u'', u'required': True,
-                u'type': u'String', u'label': 'field two'}})
+        expected = {
+            'field1': {u'help_text': u'',
+                       u'label': u'field one',
+                       u'max_length': 3,
+                       u'required': True,
+                       u'type': u'String'},
+            'field2': {u'help_text': u'',
+                       u'label': u'field two',
+                       u'required': True,
+                       u'type': u'String'}}
+        self.assertEqual(humanized, expected)
diff --git a/rest_framework/tests/generics.py b/rest_framework/tests/generics.py
index 38bf1990b..b7292c814 100644
--- a/rest_framework/tests/generics.py
+++ b/rest_framework/tests/generics.py
@@ -131,6 +131,7 @@ class TestRootView(TestCase):
                 # TODO add help_text and label when they are available
                 #'help_text': '',
                 #'label': None,
+                'max_length': 100,
                 'read_only': False,
                 'required': True,
                 'type': 'String',
@@ -272,6 +273,7 @@ class TestInstanceView(TestCase):
                     # available
                     #'description': '',
                     #'label': None,
+                    'max_length': 100,
                     'read_only': False,
                     'required': True,
                     'type': 'String',
diff --git a/rest_framework/views.py b/rest_framework/views.py
index 1c4854f05..5f9e1bf2c 100644
--- a/rest_framework/views.py
+++ b/rest_framework/views.py
@@ -61,15 +61,16 @@ class APIView(View):
             'renders': [renderer.media_type for renderer in self.renderer_classes],
             'parses': [parser.media_type for parser in self.parser_classes],
         }
-        action_metadata = self._generate_action_metadata(request)
-        if action_metadata is not None:
-            content['actions'] = action_metadata
+        content['actions'] = self.action_metadata(request)
 
         return content
 
-    def _generate_action_metadata(self, request):
-        """
-        Helper for generating the fields metadata for allowed and permitted methods.
+    def action_metadata(self, request):
+        """Return a dictionary with the fields required fo reach allowed method. If no method is allowed,
+        return an empty dictionary.
+
+        :param request: Request for which to return the metadata of the allowed methods.
+        :return: A dictionary of the form {method: {field: {field attribute: value}}}
         """
         actions = {}
         for method in self.allowed_methods:

From 9133ef77ab7940abbf69b688cd3b28c62665a8c7 Mon Sep 17 00:00:00 2001
From: Oscar Vilaplana <dev@oscarvilaplana.cat>
Date: Sun, 19 May 2013 15:47:23 +0200
Subject: [PATCH 131/197] removed TODO

---
 rest_framework/tests/generics.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rest_framework/tests/generics.py b/rest_framework/tests/generics.py
index b7292c814..8285e2d18 100644
--- a/rest_framework/tests/generics.py
+++ b/rest_framework/tests/generics.py
@@ -124,7 +124,6 @@ class TestRootView(TestCase):
             'description': 'Example description for OPTIONS.',
             'actions': {}
         }
-        # TODO: this is just a draft for fields' metadata - needs review and decision
         expected['actions']['GET'] = {}
         expected['actions']['POST'] = {
             'text': {

From 259153b3f96f51a613c0526ab947517a2a774857 Mon Sep 17 00:00:00 2001
From: Oscar Vilaplana <dev@oscarvilaplana.cat>
Date: Sun, 19 May 2013 15:47:50 +0200
Subject: [PATCH 132/197] removed TODO

---
 rest_framework/tests/generics.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/rest_framework/tests/generics.py b/rest_framework/tests/generics.py
index 8285e2d18..e6b3797bb 100644
--- a/rest_framework/tests/generics.py
+++ b/rest_framework/tests/generics.py
@@ -262,26 +262,17 @@ class TestInstanceView(TestCase):
             'description': 'Example description for OPTIONS.',
             'actions': {}
         }
-        # TODO: this is just a draft idea for fields' metadata - needs review and decision
         for method in ('GET', 'DELETE'):
             expected['actions'][method] = {}
         for method in ('PATCH', 'PUT'):
             expected['actions'][method] = {
                 'text': {
-                    # TODO uncomment label and description when they are
-                    # available
-                    #'description': '',
-                    #'label': None,
                     'max_length': 100,
                     'read_only': False,
                     'required': True,
                     'type': 'String',
                 },
                 'id': {
-                    # TODO uncomment label and description when they are
-                    # available
-                    #'description': '',
-                    #'label': None,
                     'read_only': True,
                     'required': False,
                     'type': 'Integer',

From dea0b6ab7fcf8eb9ffebbe7720e4923df7f3c5a4 Mon Sep 17 00:00:00 2001
From: Oscar Vilaplana <dev@oscarvilaplana.cat>
Date: Sun, 19 May 2013 15:48:16 +0200
Subject: [PATCH 133/197] removed TODO

---
 rest_framework/tests/generics.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/rest_framework/tests/generics.py b/rest_framework/tests/generics.py
index e6b3797bb..a2f8fb4b3 100644
--- a/rest_framework/tests/generics.py
+++ b/rest_framework/tests/generics.py
@@ -127,18 +127,12 @@ class TestRootView(TestCase):
         expected['actions']['GET'] = {}
         expected['actions']['POST'] = {
             'text': {
-                # TODO add help_text and label when they are available
-                #'help_text': '',
-                #'label': None,
                 'max_length': 100,
                 'read_only': False,
                 'required': True,
                 'type': 'String',
             },
             'id': {
-                # TODO add help_text and label when they are available
-                #'help_text': '',
-                #'label': None,
                 'read_only': True,
                 'required': False,
                 'type': 'Integer',

From 42a8fe8995c6be871ee3c03f85c4ab790f4d63fc Mon Sep 17 00:00:00 2001
From: Neamar <neamar@neamar.fr>
Date: Mon, 20 May 2013 10:42:10 +0300
Subject: [PATCH 134/197] Corrected docs (authentication instead of filtering)

---
 docs/api-guide/filtering.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md
index a710ad7dd..66df46a43 100644
--- a/docs/api-guide/filtering.md
+++ b/docs/api-guide/filtering.md
@@ -87,7 +87,7 @@ The default filter backends may be set globally, using the `DEFAULT_FILTER_BACKE
         'DEFAULT_FILTER_BACKENDS': ('rest_framework.filters.DjangoFilterBackend',)
     }
 
-You can also set the authentication policy on a per-view, or per-viewset basis,
+You can also set the filter backends on a per-view, or per-viewset basis,
 using the `GenericAPIView` class based views.
 
     class UserListView(generics.ListAPIView):

From 4c85829cb7771216a7ca4b336ca1c346585d3705 Mon Sep 17 00:00:00 2001
From: Neamar <neamar@neamar.fr>
Date: Mon, 20 May 2013 10:48:07 +0300
Subject: [PATCH 135/197] Legacy parameter order

---
 docs/api-guide/filtering.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md
index 66df46a43..8226aa42d 100644
--- a/docs/api-guide/filtering.md
+++ b/docs/api-guide/filtering.md
@@ -216,7 +216,7 @@ For more details, see the [Django documentation][search-django-admin].
 
 ## OrderingFilter
 
-The `OrderingFilter` class supports simple query parameter controlled ordering of results.  To specify the result order, set a query parameter named `'order'` to the required field name.  For example:
+The `OrderingFilter` class supports simple query parameter controlled ordering of results.  To specify the result order, set a query parameter named `'ordering'` to the required field name.  For example:
 
     http://example.com/api/users?ordering=username
 

From c3fd7c66856f39b697de0647adbc8d7b59323360 Mon Sep 17 00:00:00 2001
From: David Jones <git@jonesdavid.com>
Date: Mon, 20 May 2013 13:04:38 +0100
Subject: [PATCH 136/197] Updated SlugField to raise validation errors for
 invalid slugs

---
 rest_framework/fields.py       | 18 ++++++++++++++++--
 rest_framework/tests/fields.py | 15 +++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index b5f99823a..5c2ac5280 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -389,11 +389,25 @@ class URLField(CharField):
 
 class SlugField(CharField):
     type_name = 'SlugField'
-
+    form_field_class = forms.SlugField
+    
+    default_error_messages = {
+        'invalid': _("Enter a valid 'slug' consisting of letters, numbers,"
+                     " underscores or hyphens."),
+    }
+    default_validators = [validators.validate_slug]
+    
     def __init__(self, *args, **kwargs):
         super(SlugField, self).__init__(*args, **kwargs)
 
-
+    def __deepcopy__(self, memo):
+        result = copy.copy(self)
+        memo[id(self)] = result
+        #result.widget = copy.deepcopy(self.widget, memo)
+        result.validators = self.validators[:]
+        return result
+    
+  
 class ChoiceField(WritableField):
     type_name = 'ChoiceField'
     form_field_class = forms.ChoiceField
diff --git a/rest_framework/tests/fields.py b/rest_framework/tests/fields.py
index dad69975f..a31042069 100644
--- a/rest_framework/tests/fields.py
+++ b/rest_framework/tests/fields.py
@@ -769,6 +769,21 @@ class SlugFieldTests(TestCase):
         self.assertEqual(serializer.is_valid(), True)
         self.assertEqual(getattr(serializer.fields['slug_field'], 'max_length'), 20)
 
+    def test_invalid_slug(self):
+        """
+        Make sure an invalid slug raises ValidationError
+        """
+        class SlugFieldSerializer(serializers.ModelSerializer):
+            slug_field = serializers.SlugField(source='slug_field', max_length=20, required=True)
+        
+            class Meta:
+                model = self.SlugFieldModel
+                
+        s = SlugFieldSerializer(data={'slug_field': 'a b'})
+        
+        self.assertEqual(s.is_valid(), False)
+        self.assertEqual(s.errors,  {'slug_field': ["Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."]})
+
 
 class URLFieldTests(TestCase):
     """

From bc8671d7ea11922ed85921f27b61798894261304 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 20 May 2013 13:43:26 +0100
Subject: [PATCH 137/197] More explicit quickstart guide.  Closes #867.

---
 docs/tutorial/quickstart.md | 44 +++++++++++++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/docs/tutorial/quickstart.md b/docs/tutorial/quickstart.md
index 52fe3acf4..c41cb63fb 100644
--- a/docs/tutorial/quickstart.md
+++ b/docs/tutorial/quickstart.md
@@ -2,7 +2,43 @@
 
 We're going to create a simple API to allow admin users to view and edit the users and groups in the system.
 
-Create a new Django project, and start a new app called `quickstart`.  Once you've set up a database and got everything synced and ready to go open up the app's directory and we'll get coding...
+## Project setup
+
+Create a new Django project named `tutorial`, then start a new app called `quickstart`.
+
+    # Set up a new project
+    django-admin.py startproject tutorial
+    cd tutorial
+
+    # Create a virtualenv to isolate our package dependancies locally
+    virtualenv env
+    source env/bin/activate
+
+    # Install Django and Django REST framework into the virtualenv
+    pip install django
+    pip install djangorestframework
+
+    # Create a new app
+    python manage.py startapp quickstart
+
+Next you'll need to get a database set up and synced.  If you just want to use SQLite for now, then you'll want to edit your `tutorial/settings.py` module to include something like this:
+
+    DATABASES = {
+        'default': {
+            'ENGINE': 'django.db.backends.sqlite3',
+            'NAME': 'database.sql',
+            'USER': '',
+            'PASSWORD': '',
+            'HOST': '',
+            'PORT': ''
+        }
+    }
+
+The run `syncdb` like so:
+
+    python manange.py syncdb
+
+Once you've set up a database and got everything synced and ready to go, open up the app's directory and we'll get coding...
 
 ## Serializers
 
@@ -80,7 +116,7 @@ Finally, we're including default login and logout views for use with the browsab
 
 ## Settings
 
-We'd also like to set a few global settings.  We'd like to turn on pagination, and we want our API to only be accessible to admin users.
+We'd also like to set a few global settings.  We'd like to turn on pagination, and we want our API to only be accessible to admin users.  The settings module will be in `tutorial/settings.py`
 
     INSTALLED_APPS = (
         ...
@@ -98,6 +134,10 @@ Okay, we're done.
 
 ## Testing our API
 
+We're now ready to test the API we've built.  Let's fire up the server from the command line.
+
+    python ./manage.py runserver
+
 We can now access our API, both from the command-line, using tools like `curl`...
 
     bash: curl -H 'Accept: application/json; indent=4' -u admin:password http://127.0.0.1:8000/users/ 

From 3aad12220df39545e81cf93694df3c690e44005e Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 20 May 2013 13:46:29 +0100
Subject: [PATCH 138/197] Added @commonorgarden, for fix #875.  Thank you :)

---
 docs/topics/credits.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index acd6576ec..7f8883a53 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -132,6 +132,7 @@ The following people have helped make REST framework great.
 * Andy McKay - [andymckay]
 * Matteo Suppo - [matteosuppo]
 * Karol Majta - [lolek09]
+* David Jones - [commonorgarden]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -300,3 +301,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [andymckay]: https://github.com/andymckay
 [matteosuppo]: https://github.com/matteosuppo
 [lolek09]: https://github.com/lolek09
+[commonorgarden]: https://github.com/commonorgarden

From 26e037d41582ba110beac003b0c3f1bf5bfd4891 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 20 May 2013 13:49:42 +0100
Subject: [PATCH 139/197] Fix broken docs links.  Closes #873

---
 docs/topics/rest-hypermedia-hateoas.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/topics/rest-hypermedia-hateoas.md b/docs/topics/rest-hypermedia-hateoas.md
index 43e5a8c63..aeba579fe 100644
--- a/docs/topics/rest-hypermedia-hateoas.md
+++ b/docs/topics/rest-hypermedia-hateoas.md
@@ -37,8 +37,8 @@ What REST framework doesn't do is give you is machine readable hypermedia format
 [cite]: http://vimeo.com/channels/restfest/page:2
 [dissertation]: http://www.ics.uci.edu/~fielding/pubs/dissertation/top.htm
 [hypertext-driven]: http://roy.gbiv.com/untangled/2008/rest-apis-must-be-hypertext-driven
-[restful-web-services]: 
-[building-hypermedia-apis]: …
+[restful-web-services]: http://www.amazon.com/Restful-Web-Services-Leonard-Richardson/dp/0596529260
+[building-hypermedia-apis]: http://www.amazon.com/Building-Hypermedia-APIs-HTML5-Node/dp/1449306578
 [designing-hypermedia-apis]: http://designinghypermediaapis.com/
 [restisover]: http://blog.steveklabnik.com/posts/2012-02-23-rest-is-over
 [readinglist]: http://blog.steveklabnik.com/posts/2012-02-27-hypermedia-api-reading-list

From 6fcffcc9c65d789b02c07372e3f4dd2f9ef5eba3 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 20 May 2013 14:02:19 +0100
Subject: [PATCH 140/197] Typo

---
 docs/tutorial/6-viewsets-and-routers.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorial/6-viewsets-and-routers.md b/docs/tutorial/6-viewsets-and-routers.md
index 277804e24..419b420dc 100644
--- a/docs/tutorial/6-viewsets-and-routers.md
+++ b/docs/tutorial/6-viewsets-and-routers.md
@@ -1,4 +1,4 @@
-# Tutorial 6 - ViewSets & Routers
+# Tutorial 6: ViewSets & Routers
 
 REST framework includes an abstraction for dealing with `ViewSets`, that allows the developer to concentrate on modeling the state and interactions of the API, and leave the URL construction to be handled automatically, based on common conventions.
 

From f19e0d544fdcd318c2bde2057d91777beda78915 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 20 May 2013 21:00:56 +0100
Subject: [PATCH 141/197] Fix charset issues

---
 docs/api-guide/renderers.md       | 60 ++++++++++++++++++++++++++-----
 rest_framework/renderers.py       | 13 ++++---
 rest_framework/response.py        |  6 +++-
 rest_framework/tests/renderers.py | 28 ++++++++-------
 rest_framework/tests/response.py  | 21 +++++------
 5 files changed, 92 insertions(+), 36 deletions(-)

diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md
index 1661ceecf..fb5a5518d 100644
--- a/docs/api-guide/renderers.md
+++ b/docs/api-guide/renderers.md
@@ -67,7 +67,7 @@ If your API includes views that can serve both regular webpages and API response
 
 ## JSONRenderer
 
-Renders the request data into `JSON` enforcing ASCII encoding
+Renders the request data into `JSON`, using ASCII encoding.
 
 The client may additionally include an `'indent'` media type parameter, in which case the returned `JSON` will be indented.  For example `Accept: application/json; indent=4`.
 
@@ -75,9 +75,19 @@ The client may additionally include an `'indent'` media type parameter, in which
 
 **.format**: `'.json'`
 
+**.charset**: `iso-8859-1`
+
 ## UnicodeJSONRenderer
 
-Same as `JSONRenderer` but doesn't enforce ASCII encoding
+Renders the request data into `JSON`, using utf-8 encoding.
+
+The client may additionally include an `'indent'` media type parameter, in which case the returned `JSON` will be indented.  For example `Accept: application/json; indent=4`.
+
+**.media_type**: `application/json`
+
+**.format**: `'.json'`
+
+**.charset**: `utf-8`
 
 ## JSONPRenderer
 
@@ -91,6 +101,8 @@ The javascript callback function must be set by the client including a `callback
 
 **.format**: `'.jsonp'`
 
+**.charset**: `iso-8859-1`
+
 ## YAMLRenderer
 
 Renders the request data into `YAML`. 
@@ -101,6 +113,8 @@ Requires the `pyyaml` package to be installed.
 
 **.format**: `'.yaml'`
 
+**.charset**: `utf-8`
+
 ## XMLRenderer
 
 Renders REST framework's default style of `XML` response content.
@@ -113,6 +127,8 @@ If you are considering using `XML` for your API, you may want to consider implem
 
 **.format**: `'.xml'`
 
+**.charset**: `utf-8`
+
 ## TemplateHTMLRenderer
 
 Renders data to HTML, using Django's standard template rendering.
@@ -147,6 +163,8 @@ If you're building websites that use `TemplateHTMLRenderer` along with other ren
 
 **.format**: `'.html'`
 
+**.charset**: `utf-8`
+
 See also: `StaticHTMLRenderer`
 
 ## StaticHTMLRenderer
@@ -167,6 +185,8 @@ You can use `TemplateHTMLRenderer` either to return regular HTML pages using RES
 
 **.format**: `'.html'`
 
+**.charset**: `utf-8`
+
 See also: `TemplateHTMLRenderer`
 
 ## BrowsableAPIRenderer
@@ -177,12 +197,16 @@ Renders data into HTML for the Browsable API.  This renderer will determine whic
 
 **.format**: `'.api'`
 
+**.charset**: `utf-8`
+
 ---
 
 # Custom renderers
 
 To implement a custom renderer, you should override `BaseRenderer`, set the `.media_type` and `.format` properties, and implement the `.render(self, data, media_type=None, renderer_context=None)` method.
 
+The method should return a bytestring, which wil be used as the body of the HTTP response.
+
 The arguments passed to the `.render()` method are:
 
 ### `data`
@@ -209,14 +233,34 @@ The following is an example plaintext renderer that will return a response with
     from rest_framework import renderers
 
 
-    class PlainText(renderers.BaseRenderer):
+    class PlainTextRenderer(renderers.BaseRenderer):
         media_type = 'text/plain'
         format = 'txt'
         
         def render(self, data, media_type=None, renderer_context=None):
-            if isinstance(data, basestring):
-                return data
-            return smart_unicode(data)
+            return data.encode(self.charset)
+
+## Setting the character set
+
+By default renderer classes are assumed to be using the `UTF-8` encoding.  To use a different encoding, set the `charset` attribute on the renderer.
+
+    class PlainTextRenderer(renderers.BaseRenderer):
+        media_type = 'text/plain'
+        format = 'txt'
+        charset = 'iso-8859-1'
+
+        def render(self, data, media_type=None, renderer_context=None):
+            return data.encode(self.charset)
+
+If the renderer returns a raw bytestring, you should set a charset value of `None`, which will ensure the `Content-Type` header of the response will not have a `charset` value set.  Doing so will also ensure that the browsable API will not attempt to display the binary content as a string.
+
+    class JPEGRenderer(renderers.BaseRenderer):
+        media_type = 'image/jpeg'
+        format = 'jpg'
+        charset = None
+
+        def render(self, data, media_type=None, renderer_context=None):
+            return data
 
 ---
 
@@ -286,11 +330,11 @@ Templates will render with a `RequestContext` which includes the `status_code` a
 
 The following third party packages are also available.
 
-## MessagePack
+### MessagePack
 
 [MessagePack][messagepack] is a fast, efficient binary serialization format.  [Juan Riaza][juanriaza] maintains the [djangorestframework-msgpack][djangorestframework-msgpack] package which provides MessagePack renderer and parser support for REST framework.
 
-## CSV
+### CSV
 
 Comma-separated values are a plain-text tabular data format, that can be easily imported into spreadsheet applications.  [Mjumbe Poe][mjumbewu] maintains the [djangorestframework-csv][djangorestframework-csv] package which provides CSV renderer support for REST framework.
 
diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py
index c67c8ed6f..fd8683462 100644
--- a/rest_framework/renderers.py
+++ b/rest_framework/renderers.py
@@ -9,7 +9,6 @@ REST framework also provides an HTML renderer the renders the browsable API.
 from __future__ import unicode_literals
 
 import copy
-import string
 import json
 from django import forms
 from django.http.multipartparser import parse_header
@@ -36,7 +35,7 @@ class BaseRenderer(object):
 
     media_type = None
     format = None
-    charset = None
+    charset = 'utf-8'
 
     def render(self, data, accepted_media_type=None, renderer_context=None):
         raise NotImplemented('Renderer class requires .render() to be implemented')
@@ -51,6 +50,7 @@ class JSONRenderer(BaseRenderer):
     format = 'json'
     encoder_class = encoders.JSONEncoder
     ensure_ascii = True
+    charset = 'iso-8859-1'
 
     def render(self, data, accepted_media_type=None, renderer_context=None):
         """
@@ -74,7 +74,12 @@ class JSONRenderer(BaseRenderer):
             except (ValueError, TypeError):
                 indent = None
 
-        return json.dumps(data, cls=self.encoder_class, indent=indent, ensure_ascii=self.ensure_ascii)
+        ret = json.dumps(data, cls=self.encoder_class,
+            indent=indent, ensure_ascii=self.ensure_ascii)
+
+        if not self.ensure_ascii:
+            return bytes(ret.encode(self.charset))
+        return ret
 
 
 class UnicodeJSONRenderer(JSONRenderer):
@@ -332,7 +337,7 @@ class BrowsableAPIRenderer(BaseRenderer):
         renderer_context['indent'] = 4
         content = renderer.render(data, accepted_media_type, renderer_context)
 
-        if not all(char in string.printable for char in content):
+        if renderer.charset is None:
             return '[%d bytes of binary content]' % len(content)
 
         return content
diff --git a/rest_framework/response.py b/rest_framework/response.py
index 32e74a45e..3e0dd1062 100644
--- a/rest_framework/response.py
+++ b/rest_framework/response.py
@@ -55,7 +55,11 @@ class Response(SimpleTemplateResponse):
         else:
             content_type = media_type
         self['Content-Type'] = content_type
-        return renderer.render(self.data, media_type, context)
+
+        ret = renderer.render(self.data, media_type, context)
+        if isinstance(ret, six.text_type):
+            return bytes(ret.encode(self.charset))
+        return ret
 
     @property
     def status_text(self):
diff --git a/rest_framework/tests/renderers.py b/rest_framework/tests/renderers.py
index 739f91841..1b2b92791 100644
--- a/rest_framework/tests/renderers.py
+++ b/rest_framework/tests/renderers.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
 from decimal import Decimal
 from django.core.cache import cache
 from django.test import TestCase
@@ -135,7 +137,7 @@ class RendererEndToEndTests(TestCase):
     def test_default_renderer_serializes_content(self):
         """If the Accept header is not set the default renderer should serialize the response."""
         resp = self.client.get('/')
-        self.assertEqual(resp['Content-Type'], RendererA.media_type)
+        self.assertEqual(resp['Content-Type'], RendererA.media_type + '; charset=utf-8')
         self.assertEqual(resp.content, RENDERER_A_SERIALIZER(DUMMYCONTENT))
         self.assertEqual(resp.status_code, DUMMYSTATUS)
 
@@ -143,13 +145,13 @@ class RendererEndToEndTests(TestCase):
         """No response must be included in HEAD requests."""
         resp = self.client.head('/')
         self.assertEqual(resp.status_code, DUMMYSTATUS)
-        self.assertEqual(resp['Content-Type'], RendererA.media_type)
+        self.assertEqual(resp['Content-Type'], RendererA.media_type + '; charset=utf-8')
         self.assertEqual(resp.content, six.b(''))
 
     def test_default_renderer_serializes_content_on_accept_any(self):
         """If the Accept header is set to */* the default renderer should serialize the response."""
         resp = self.client.get('/', HTTP_ACCEPT='*/*')
-        self.assertEqual(resp['Content-Type'], RendererA.media_type)
+        self.assertEqual(resp['Content-Type'], RendererA.media_type + '; charset=utf-8')
         self.assertEqual(resp.content, RENDERER_A_SERIALIZER(DUMMYCONTENT))
         self.assertEqual(resp.status_code, DUMMYSTATUS)
 
@@ -157,7 +159,7 @@ class RendererEndToEndTests(TestCase):
         """If the Accept header is set the specified renderer should serialize the response.
         (In this case we check that works for the default renderer)"""
         resp = self.client.get('/', HTTP_ACCEPT=RendererA.media_type)
-        self.assertEqual(resp['Content-Type'], RendererA.media_type)
+        self.assertEqual(resp['Content-Type'], RendererA.media_type + '; charset=utf-8')
         self.assertEqual(resp.content, RENDERER_A_SERIALIZER(DUMMYCONTENT))
         self.assertEqual(resp.status_code, DUMMYSTATUS)
 
@@ -165,7 +167,7 @@ class RendererEndToEndTests(TestCase):
         """If the Accept header is set the specified renderer should serialize the response.
         (In this case we check that works for a non-default renderer)"""
         resp = self.client.get('/', HTTP_ACCEPT=RendererB.media_type)
-        self.assertEqual(resp['Content-Type'], RendererB.media_type)
+        self.assertEqual(resp['Content-Type'], RendererB.media_type + '; charset=utf-8')
         self.assertEqual(resp.content, RENDERER_B_SERIALIZER(DUMMYCONTENT))
         self.assertEqual(resp.status_code, DUMMYSTATUS)
 
@@ -176,7 +178,7 @@ class RendererEndToEndTests(TestCase):
             RendererB.media_type
         )
         resp = self.client.get('/' + param)
-        self.assertEqual(resp['Content-Type'], RendererB.media_type)
+        self.assertEqual(resp['Content-Type'], RendererB.media_type + '; charset=utf-8')
         self.assertEqual(resp.content, RENDERER_B_SERIALIZER(DUMMYCONTENT))
         self.assertEqual(resp.status_code, DUMMYSTATUS)
 
@@ -193,7 +195,7 @@ class RendererEndToEndTests(TestCase):
             RendererB.format
         )
         resp = self.client.get('/' + param)
-        self.assertEqual(resp['Content-Type'], RendererB.media_type)
+        self.assertEqual(resp['Content-Type'], RendererB.media_type + '; charset=utf-8')
         self.assertEqual(resp.content, RENDERER_B_SERIALIZER(DUMMYCONTENT))
         self.assertEqual(resp.status_code, DUMMYSTATUS)
 
@@ -201,7 +203,7 @@ class RendererEndToEndTests(TestCase):
         """If a 'format' keyword arg is specified, the renderer with the matching
         format attribute should serialize the response."""
         resp = self.client.get('/something.formatb')
-        self.assertEqual(resp['Content-Type'], RendererB.media_type)
+        self.assertEqual(resp['Content-Type'], RendererB.media_type + '; charset=utf-8')
         self.assertEqual(resp.content, RENDERER_B_SERIALIZER(DUMMYCONTENT))
         self.assertEqual(resp.status_code, DUMMYSTATUS)
 
@@ -214,7 +216,7 @@ class RendererEndToEndTests(TestCase):
         )
         resp = self.client.get('/' + param,
                                HTTP_ACCEPT=RendererB.media_type)
-        self.assertEqual(resp['Content-Type'], RendererB.media_type)
+        self.assertEqual(resp['Content-Type'], RendererB.media_type + '; charset=utf-8')
         self.assertEqual(resp.content, RENDERER_B_SERIALIZER(DUMMYCONTENT))
         self.assertEqual(resp.status_code, DUMMYSTATUS)
 
@@ -270,7 +272,7 @@ class UnicodeJSONRendererTests(TestCase):
         obj = {'countries': ['United Kingdom', 'France', 'España']}
         renderer = UnicodeJSONRenderer()
         content = renderer.render(obj, 'application/json')
-        self.assertEqual(content, '{"countries": ["United Kingdom", "France", "España"]}')
+        self.assertEqual(content, '{"countries": ["United Kingdom", "France", "España"]}'.encode('utf-8'))
 
 
 class JSONPRendererTests(TestCase):
@@ -287,7 +289,7 @@ class JSONPRendererTests(TestCase):
         resp = self.client.get('/jsonp/jsonrenderer',
                                HTTP_ACCEPT='application/javascript')
         self.assertEqual(resp.status_code, status.HTTP_200_OK)
-        self.assertEqual(resp['Content-Type'], 'application/javascript')
+        self.assertEqual(resp['Content-Type'], 'application/javascript; charset=iso-8859-1')
         self.assertEqual(resp.content,
             ('callback(%s);' % _flat_repr).encode('ascii'))
 
@@ -298,7 +300,7 @@ class JSONPRendererTests(TestCase):
         resp = self.client.get('/jsonp/nojsonrenderer',
                                HTTP_ACCEPT='application/javascript')
         self.assertEqual(resp.status_code, status.HTTP_200_OK)
-        self.assertEqual(resp['Content-Type'], 'application/javascript')
+        self.assertEqual(resp['Content-Type'], 'application/javascript; charset=iso-8859-1')
         self.assertEqual(resp.content,
             ('callback(%s);' % _flat_repr).encode('ascii'))
 
@@ -310,7 +312,7 @@ class JSONPRendererTests(TestCase):
         resp = self.client.get('/jsonp/nojsonrenderer?callback=' + callback_func,
                                HTTP_ACCEPT='application/javascript')
         self.assertEqual(resp.status_code, status.HTTP_200_OK)
-        self.assertEqual(resp['Content-Type'], 'application/javascript')
+        self.assertEqual(resp['Content-Type'], 'application/javascript; charset=iso-8859-1')
         self.assertEqual(resp.content,
             ('%s(%s);' % (callback_func, _flat_repr)).encode('ascii'))
 
diff --git a/rest_framework/tests/response.py b/rest_framework/tests/response.py
index 8f1163e87..a527baa37 100644
--- a/rest_framework/tests/response.py
+++ b/rest_framework/tests/response.py
@@ -101,7 +101,7 @@ class RendererIntegrationTests(TestCase):
     def test_default_renderer_serializes_content(self):
         """If the Accept header is not set the default renderer should serialize the response."""
         resp = self.client.get('/')
-        self.assertEqual(resp['Content-Type'], RendererA.media_type)
+        self.assertEqual(resp['Content-Type'], RendererA.media_type + '; charset=utf-8')
         self.assertEqual(resp.content, RENDERER_A_SERIALIZER(DUMMYCONTENT))
         self.assertEqual(resp.status_code, DUMMYSTATUS)
 
@@ -109,13 +109,13 @@ class RendererIntegrationTests(TestCase):
         """No response must be included in HEAD requests."""
         resp = self.client.head('/')
         self.assertEqual(resp.status_code, DUMMYSTATUS)
-        self.assertEqual(resp['Content-Type'], RendererA.media_type)
+        self.assertEqual(resp['Content-Type'], RendererA.media_type + '; charset=utf-8')
         self.assertEqual(resp.content, six.b(''))
 
     def test_default_renderer_serializes_content_on_accept_any(self):
         """If the Accept header is set to */* the default renderer should serialize the response."""
         resp = self.client.get('/', HTTP_ACCEPT='*/*')
-        self.assertEqual(resp['Content-Type'], RendererA.media_type)
+        self.assertEqual(resp['Content-Type'], RendererA.media_type + '; charset=utf-8')
         self.assertEqual(resp.content, RENDERER_A_SERIALIZER(DUMMYCONTENT))
         self.assertEqual(resp.status_code, DUMMYSTATUS)
 
@@ -123,7 +123,7 @@ class RendererIntegrationTests(TestCase):
         """If the Accept header is set the specified renderer should serialize the response.
         (In this case we check that works for the default renderer)"""
         resp = self.client.get('/', HTTP_ACCEPT=RendererA.media_type)
-        self.assertEqual(resp['Content-Type'], RendererA.media_type)
+        self.assertEqual(resp['Content-Type'], RendererA.media_type + '; charset=utf-8')
         self.assertEqual(resp.content, RENDERER_A_SERIALIZER(DUMMYCONTENT))
         self.assertEqual(resp.status_code, DUMMYSTATUS)
 
@@ -131,7 +131,7 @@ class RendererIntegrationTests(TestCase):
         """If the Accept header is set the specified renderer should serialize the response.
         (In this case we check that works for a non-default renderer)"""
         resp = self.client.get('/', HTTP_ACCEPT=RendererB.media_type)
-        self.assertEqual(resp['Content-Type'], RendererB.media_type)
+        self.assertEqual(resp['Content-Type'], RendererB.media_type + '; charset=utf-8')
         self.assertEqual(resp.content, RENDERER_B_SERIALIZER(DUMMYCONTENT))
         self.assertEqual(resp.status_code, DUMMYSTATUS)
 
@@ -142,7 +142,7 @@ class RendererIntegrationTests(TestCase):
             RendererB.media_type
         )
         resp = self.client.get('/' + param)
-        self.assertEqual(resp['Content-Type'], RendererB.media_type)
+        self.assertEqual(resp['Content-Type'], RendererB.media_type + '; charset=utf-8')
         self.assertEqual(resp.content, RENDERER_B_SERIALIZER(DUMMYCONTENT))
         self.assertEqual(resp.status_code, DUMMYSTATUS)
 
@@ -150,7 +150,7 @@ class RendererIntegrationTests(TestCase):
         """If a 'format' query is specified, the renderer with the matching
         format attribute should serialize the response."""
         resp = self.client.get('/?format=%s' % RendererB.format)
-        self.assertEqual(resp['Content-Type'], RendererB.media_type)
+        self.assertEqual(resp['Content-Type'], RendererB.media_type + '; charset=utf-8')
         self.assertEqual(resp.content, RENDERER_B_SERIALIZER(DUMMYCONTENT))
         self.assertEqual(resp.status_code, DUMMYSTATUS)
 
@@ -158,7 +158,7 @@ class RendererIntegrationTests(TestCase):
         """If a 'format' keyword arg is specified, the renderer with the matching
         format attribute should serialize the response."""
         resp = self.client.get('/something.formatb')
-        self.assertEqual(resp['Content-Type'], RendererB.media_type)
+        self.assertEqual(resp['Content-Type'], RendererB.media_type + '; charset=utf-8')
         self.assertEqual(resp.content, RENDERER_B_SERIALIZER(DUMMYCONTENT))
         self.assertEqual(resp.status_code, DUMMYSTATUS)
 
@@ -167,7 +167,7 @@ class RendererIntegrationTests(TestCase):
         the renderer with the matching format attribute should serialize the response."""
         resp = self.client.get('/?format=%s' % RendererB.format,
                                HTTP_ACCEPT=RendererB.media_type)
-        self.assertEqual(resp['Content-Type'], RendererB.media_type)
+        self.assertEqual(resp['Content-Type'], RendererB.media_type + '; charset=utf-8')
         self.assertEqual(resp.content, RENDERER_B_SERIALIZER(DUMMYCONTENT))
         self.assertEqual(resp.status_code, DUMMYSTATUS)
 
@@ -204,7 +204,8 @@ class Issue807Testts(TestCase):
         """
         headers = {"HTTP_ACCEPT": RendererA.media_type}
         resp = self.client.get('/', **headers)
-        self.assertEqual(RendererA.media_type, resp['Content-Type'])
+        expected = "{0}; charset={1}".format(RendererA.media_type, 'utf-8')
+        self.assertEqual(expected, resp['Content-Type'])
 
     def test_if_there_is_charset_specified_on_renderer_it_gets_appended(self):
         """

From aef7ac72cc49db0745edcfe083220570abbbe3a7 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 20 May 2013 21:18:17 +0100
Subject: [PATCH 142/197] content type may be set explicitly on the response

---
 docs/api-guide/renderers.md      |  9 +++++++++
 docs/api-guide/responses.md      |  3 ++-
 rest_framework/response.py       | 18 ++++++++++--------
 rest_framework/tests/response.py | 13 ++++++-------
 4 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md
index fb5a5518d..63641d233 100644
--- a/docs/api-guide/renderers.md
+++ b/docs/api-guide/renderers.md
@@ -300,6 +300,15 @@ For example:
         data = serializer.data
         return Response(data)
 
+## Underspecifying the media type
+
+In some cases you might want a renderer to serve a range of media types.
+In this case you can underspecify the media types it should respond to, by using a `media_type` value such as `image/*`, or `*/*`.
+
+If you underspecify the renderer's media type, you should make sure to specify the media type explictly when you return the response, using the `content_type` attribute.  For example:
+
+    return Response(data, content_type='image/png')
+
 ## Designing your media types
 
 For the purposes of many Web APIs, simple `JSON` responses with hyperlinked relations may be sufficient.  If you want to fully embrace RESTful design and [HATEOAS] you'll need to consider the design and usage of your media types in more detail.
diff --git a/docs/api-guide/responses.md b/docs/api-guide/responses.md
index 794f93774..59632ad51 100644
--- a/docs/api-guide/responses.md
+++ b/docs/api-guide/responses.md
@@ -20,7 +20,7 @@ Unless you want to heavily customize REST framework for some reason, you should
 
 ## Response()
 
-**Signature:** `Response(data, status=None, template_name=None, headers=None)`
+**Signature:** `Response(data, status=None, template_name=None, headers=None, content_type=None)`
 
 Unlike regular `HttpResponse` objects, you do not instantiate `Response` objects with rendered content.  Instead you pass in unrendered data, which may consist of any python primatives.
 
@@ -34,6 +34,7 @@ Arguments:
 * `status`: A status code for the response.  Defaults to 200.  See also [status codes][statuscodes].
 * `template_name`: A template name to use if `HTMLRenderer` is selected.
 * `headers`: A dictionary of HTTP headers to use in the response.
+* `content_type`: The content type of the response.  Typically, this will be set automatically by the renderer as determined by content negotiation, but there may be some cases where you need to specify the content type explicitly.
 
 ---
 
diff --git a/rest_framework/response.py b/rest_framework/response.py
index 3e0dd1062..110ccb133 100644
--- a/rest_framework/response.py
+++ b/rest_framework/response.py
@@ -18,7 +18,7 @@ class Response(SimpleTemplateResponse):
 
     def __init__(self, data=None, status=200,
                  template_name=None, headers=None,
-                 exception=False, charset=None):
+                 exception=False, content_type=None):
         """
         Alters the init arguments slightly.
         For example, drop 'template_name', and instead use 'data'.
@@ -30,7 +30,7 @@ class Response(SimpleTemplateResponse):
         self.data = data
         self.template_name = template_name
         self.exception = exception
-        self.charset = charset
+        self.content_type = content_type
 
         if headers:
             for name, value in six.iteritems(headers):
@@ -47,18 +47,20 @@ class Response(SimpleTemplateResponse):
         assert context, ".renderer_context not set on Response"
         context['response'] = self
 
-        if self.charset is None:
-            self.charset = renderer.charset
+        charset = renderer.charset
+        content_type = self.content_type
 
-        if self.charset is not None:
-            content_type = "{0}; charset={1}".format(media_type, self.charset)
-        else:
+        if content_type is None and charset is not None:
+            content_type = "{0}; charset={1}".format(media_type, charset)
+        elif content_type is None:
             content_type = media_type
         self['Content-Type'] = content_type
 
         ret = renderer.render(self.data, media_type, context)
         if isinstance(ret, six.text_type):
-            return bytes(ret.encode(self.charset))
+            assert charset, 'renderer returned unicode, and did not specify ' \
+            'a charset value.'
+            return bytes(ret.encode(charset))
         return ret
 
     @property
diff --git a/rest_framework/tests/response.py b/rest_framework/tests/response.py
index a527baa37..12b8cda21 100644
--- a/rest_framework/tests/response.py
+++ b/rest_framework/tests/response.py
@@ -60,11 +60,11 @@ class MockView(APIView):
         return Response(DUMMYCONTENT, status=DUMMYSTATUS)
 
 
-class MockViewSettingCharset(APIView):
+class MockViewSettingContentType(APIView):
     renderer_classes = (RendererA, RendererB, RendererC)
 
     def get(self, request, **kwargs):
-        return Response(DUMMYCONTENT, status=DUMMYSTATUS, charset='setbyview')
+        return Response(DUMMYCONTENT, status=DUMMYSTATUS, content_type='setbyview')
 
 
 class HTMLView(APIView):
@@ -81,7 +81,7 @@ class HTMLView1(APIView):
         return Response('text')
 
 urlpatterns = patterns('',
-    url(r'^setbyview$', MockViewSettingCharset.as_view(renderer_classes=[RendererA, RendererB, RendererC])),
+    url(r'^setbyview$', MockViewSettingContentType.as_view(renderer_classes=[RendererA, RendererB, RendererC])),
     url(r'^.*\.(?P<format>.+)$', MockView.as_view(renderer_classes=[RendererA, RendererB, RendererC])),
     url(r'^$', MockView.as_view(renderer_classes=[RendererA, RendererB, RendererC])),
     url(r'^html$', HTMLView.as_view()),
@@ -217,11 +217,10 @@ class Issue807Testts(TestCase):
         expected = "{0}; charset={1}".format(RendererC.media_type, RendererC.charset)
         self.assertEqual(expected, resp['Content-Type'])
 
-    def test_charset_set_explictly_on_response(self):
+    def test_content_type_set_explictly_on_response(self):
         """
-        The charset may be set explictly on the response.
+        The content type may be set explictly on the response.
         """
         headers = {"HTTP_ACCEPT": RendererC.media_type}
         resp = self.client.get('/setbyview', **headers)
-        expected = "{0}; charset={1}".format(RendererC.media_type, 'setbyview')
-        self.assertEqual(expected, resp['Content-Type'])
+        self.assertEqual('setbyview', resp['Content-Type'])

From 62c7326b7715fc3ad8c9950930cda1f70d5393ee Mon Sep 17 00:00:00 2001
From: Andrew Tarzwell <atarzwell@indecline.ca>
Date: Mon, 20 May 2013 17:43:37 -0300
Subject: [PATCH 143/197] Update Typo

---
 docs/tutorial/6-viewsets-and-routers.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorial/6-viewsets-and-routers.md b/docs/tutorial/6-viewsets-and-routers.md
index 419b420dc..4ed10e828 100644
--- a/docs/tutorial/6-viewsets-and-routers.md
+++ b/docs/tutorial/6-viewsets-and-routers.md
@@ -59,7 +59,7 @@ To see what's going on under the hood let's first explicitly create a set of vie
 
 In the `urls.py` file we bind our `ViewSet` classes into a set of concrete views.
 
-    from snippets.resources import SnippetResource, UserResource
+    from snippets.views import SnippetViewSet, UserViewSet
 
     snippet_list = SnippetViewSet.as_view({
         'get': 'list',

From 8bbb94dea92c286bad38b41a2c96843fafe85897 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Tue, 21 May 2013 12:18:37 +0200
Subject: [PATCH 144/197] Added @atarzwell for docs fix #876. Thanks!

---
 docs/topics/credits.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index 7f8883a53..79ff85169 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -133,6 +133,7 @@ The following people have helped make REST framework great.
 * Matteo Suppo - [matteosuppo]
 * Karol Majta - [lolek09]
 * David Jones - [commonorgarden]
+* Andrew Tarzwell - [atarzwell]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -302,3 +303,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [matteosuppo]: https://github.com/matteosuppo
 [lolek09]: https://github.com/lolek09
 [commonorgarden]: https://github.com/commonorgarden
+[atarzwell]: https://github.com/atarzwell

From ac99b814973c13d04362923cf71b96d4eec459cf Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Tue, 21 May 2013 12:05:44 +0100
Subject: [PATCH 145/197] Note usage of django-filter 0.5.4 for Django 1.3
 support. Closes #877

---
 docs/api-guide/filtering.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md
index 8226aa42d..dd4cf8d76 100644
--- a/docs/api-guide/filtering.md
+++ b/docs/api-guide/filtering.md
@@ -175,6 +175,7 @@ For more details on using filter sets see the [django-filter documentation][djan
 * By default filtering is not enabled.  If you want to use `DjangoFilterBackend` remember to make sure it is installed by using the `'DEFAULT_FILTER_BACKENDS'` setting.
 * When using boolean fields, you should use the values `True` and `False` in the URL query parameters, rather than `0`, `1`, `true` or `false`.  (The allowed boolean values are currently hardwired in Django's [NullBooleanSelect implementation][nullbooleanselect].) 
 * `django-filter` supports filtering across relationships, using Django's double-underscore syntax.
+* For Django 1.3 support, make sure to install `django-filter` version 0.5.4, as later versions drop support for 1.3.
 
 ---
 

From 6434a5f4a8717c3addbd2e16825826c1ff0f844b Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Tue, 21 May 2013 12:12:39 +0100
Subject: [PATCH 146/197] Added @mikee2185 and @mjtorn for their work on #467. 
 Thank you :)

---
 docs/topics/credits.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index 79ff85169..4b39d4529 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -134,6 +134,8 @@ The following people have helped make REST framework great.
 * Karol Majta - [lolek09]
 * David Jones - [commonorgarden]
 * Andrew Tarzwell - [atarzwell]
+* Michal Dvořák - [mikee2185]
+* Markus Törnqvist - [mjtorn]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -304,3 +306,5 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [lolek09]: https://github.com/lolek09
 [commonorgarden]: https://github.com/commonorgarden
 [atarzwell]: https://github.com/atarzwell
+[mikee2185]: https://github.com/mikee2185
+[mjtorn]: https://github.com/mjtorn

From 0e80a535fb617ffb64f948f53cc1831249487f1a Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Tue, 21 May 2013 17:45:25 +0100
Subject: [PATCH 147/197] Tweak nav style slightly

---
 docs/api-guide/renderers.md | 4 ++--
 docs/css/default.css        | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md
index 63641d233..a5eba9fc5 100644
--- a/docs/api-guide/renderers.md
+++ b/docs/api-guide/renderers.md
@@ -339,11 +339,11 @@ Templates will render with a `RequestContext` which includes the `status_code` a
 
 The following third party packages are also available.
 
-### MessagePack
+## MessagePack
 
 [MessagePack][messagepack] is a fast, efficient binary serialization format.  [Juan Riaza][juanriaza] maintains the [djangorestframework-msgpack][djangorestframework-msgpack] package which provides MessagePack renderer and parser support for REST framework.
 
-### CSV
+## CSV
 
 Comma-separated values are a plain-text tabular data format, that can be easily imported into spreadsheet applications.  [Mjumbe Poe][mjumbewu] maintains the [djangorestframework-csv][djangorestframework-csv] package which provides CSV renderer support for REST framework.
 
diff --git a/docs/css/default.css b/docs/css/default.css
index 998efa273..5c6c72ced 100644
--- a/docs/css/default.css
+++ b/docs/css/default.css
@@ -103,6 +103,10 @@ pre {
   overflow: hidden;
 }
 
+.nav-list > li > a {
+  padding: 2px 15px 3px;
+}
+
 /* Set the table of contents to static so it flows back into the content when
    viewed on tablets and smaller. */
 @media (max-width: 767px) {

From 06b28f66edf0dafd5a93c031248975db372fa4af Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Wed, 22 May 2013 09:07:12 +0100
Subject: [PATCH 148/197] Tweak method ordering for better consistency

---
 rest_framework/mixins.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py
index f3cd5868f..f11def6d4 100644
--- a/rest_framework/mixins.py
+++ b/rest_framework/mixins.py
@@ -110,16 +110,6 @@ class UpdateModelMixin(object):
     """
     Update a model instance.
     """
-    def get_object_or_none(self):
-        try:
-            return self.get_object()
-        except Http404:
-            # If this is a PUT-as-create operation, we need to ensure that
-            # we have relevant permissions, as if this was a POST request.
-            # This will either raise a PermissionDenied exception,
-            # or simply return None
-            self.check_permissions(clone_request(self.request, 'POST'))
-
     def update(self, request, *args, **kwargs):
         partial = kwargs.pop('partial', False)
         self.object = self.get_object_or_none()
@@ -148,6 +138,16 @@ class UpdateModelMixin(object):
         kwargs['partial'] = True
         return self.update(request, *args, **kwargs)
 
+    def get_object_or_none(self):
+        try:
+            return self.get_object()
+        except Http404:
+            # If this is a PUT-as-create operation, we need to ensure that
+            # we have relevant permissions, as if this was a POST request.
+            # This will either raise a PermissionDenied exception,
+            # or simply return None
+            self.check_permissions(clone_request(self.request, 'POST'))
+
     def pre_save(self, obj):
         """
         Set any attributes on the object that are implicit in the request.

From 0c2b534d95240c0e08f9af261f676447d3a3ab57 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Wed, 22 May 2013 09:29:43 +0100
Subject: [PATCH 149/197] Minor cleanup

---
 rest_framework/tests/serializer.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 1772ee378..4a23859f7 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -129,11 +129,6 @@ class PositiveIntegerAsChoiceSerializer(serializers.ModelSerializer):
         fields = ['some_integer']
 
 
-class BrokenModelSerializer(serializers.ModelSerializer):
-    class Meta:
-        fields = ['some_field']
-
-
 class BasicTests(TestCase):
     def setUp(self):
         self.comment = Comment(
@@ -424,8 +419,12 @@ class ValidationTests(TestCase):
         Assert that a meaningful exception message is outputted when the model
         field is missing (e.g. when mistyping ``model``).
         """
+        class BrokenModelSerializer(serializers.ModelSerializer):
+            class Meta:
+                fields = ['some_field']
+
         try:
-            serializer = BrokenModelSerializer()
+            BrokenModelSerializer()
         except AssertionError as e:
             self.assertEqual(e.args[0], "Serializer class 'BrokenModelSerializer' is missing 'model' Meta option")
         except:
@@ -447,7 +446,7 @@ class CustomValidationTests(TestCase):
     class CommentSerializerWithFieldValidator(CommentSerializer):
 
         def validate_email(self, attrs, source):
-            value = attrs[source]
+            attrs[source]
             return attrs
 
         def validate_content(self, attrs, source):

From c55406657d40e12c37a2390bf4b44ae01a356c2a Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Wed, 22 May 2013 16:45:33 +0100
Subject: [PATCH 150/197] Security email address

---
 README.md     | 7 +++++++
 docs/index.md | 9 ++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5d1631d49..94996c39d 100644
--- a/README.md
+++ b/README.md
@@ -102,6 +102,12 @@ For questions and support, use the [REST framework discussion group][group], or
 
 You may also want to [follow the author on Twitter][twitter].
 
+# Security
+
+If you believe you’ve found something in Django REST framework which has security implications, please **do not raise the issue in a public forum**.
+
+Send a description of the issue via email to [rest-framework-security@googlegroups.com][security-mail].  The project maintainers will then work with you to resolve any issues where required, prior to any public disclosure.
+
 # License
 
 Copyright (c) 2011-2013, Tom Christie
@@ -149,3 +155,4 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 [pyyaml]: http://pypi.python.org/pypi/PyYAML
 [defusedxml]: https://pypi.python.org/pypi/defusedxml
 [django-filter]: http://pypi.python.org/pypi/django-filter
+[security-mail]: mailto:rest-framework-security@googlegroups.com
diff --git a/docs/index.md b/docs/index.md
index 7c38efd34..222bb7399 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -206,7 +206,13 @@ For updates on REST framework development, you may also want to follow [the auth
 
 <a style="padding-top: 10px" href="https://twitter.com/_tomchristie" class="twitter-follow-button" data-show-count="false">Follow @_tomchristie</a>
 <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
- 
+
+## Security
+
+If you believe you’ve found something in Django REST framework which has security implications, please **do not raise the issue in a public forum**.
+
+Send a description of the issue via email to [rest-framework-security@googlegroups.com][security-mail].  The project maintainers will then work with you to resolve any issues where required, prior to any public disclosure.
+
 ## License
 
 Copyright (c) 2011-2013, Tom Christie
@@ -294,6 +300,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 [stack-overflow]: http://stackoverflow.com/
 [django-rest-framework-tag]: http://stackoverflow.com/questions/tagged/django-rest-framework
 [django-tag]: http://stackoverflow.com/questions/tagged/django
+[security-mail]: mailto:rest-framework-security@googlegroups.com
 [paid-support]: http://dabapps.com/services/build/api-development/
 [dabapps]: http://dabapps.com
 [contact-dabapps]: http://dabapps.com/contact/

From 17699056af0b132cedff81f233b06869c9347fae Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Wed, 22 May 2013 16:45:56 +0100
Subject: [PATCH 151/197] Use assertEqual, not assertEquals

---
 rest_framework/tests/serializer.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 4a23859f7..f2c31872a 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -1364,16 +1364,16 @@ class FieldLabelTest(TestCase):
         serializer = self.serializer_class()
         text_field = serializer.fields['text']
 
-        self.assertEquals('Text comes here', text_field.label)
-        self.assertEquals('Text description.', text_field.help_text)
+        self.assertEqual('Text comes here', text_field.label)
+        self.assertEqual('Text description.', text_field.help_text)
 
     def test_field_ctor(self):
         """
         This is check that ctor supports both label and help_text.
         """
-        self.assertEquals('Label', fields.Field(label='Label', help_text='Help').label)
-        self.assertEquals('Help', fields.CharField(label='Label', help_text='Help').help_text)
-        self.assertEquals('Label', relations.HyperlinkedRelatedField(view_name='fake', label='Label', help_text='Help', many=True).label)
+        self.assertEqual('Label', fields.Field(label='Label', help_text='Help').label)
+        self.assertEqual('Help', fields.CharField(label='Label', help_text='Help').help_text)
+        self.assertEqual('Label', relations.HyperlinkedRelatedField(view_name='fake', label='Label', help_text='Help', many=True).label)
 
 
 class AttributeMappingOnAutogeneratedFieldsTests(TestCase):

From 7a93fdbe0a89089d45b2509e943d0d49ef155a2c Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Wed, 22 May 2013 16:46:15 +0100
Subject: [PATCH 152/197] Last bits of charset sorting-out-ness

---
 docs/api-guide/renderers.md       | 29 +++++++++++++++++++++++++----
 rest_framework/renderers.py       | 25 ++++++++++++++++++-------
 rest_framework/tests/renderers.py | 14 +++++++-------
 3 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md
index a5eba9fc5..0161b54d1 100644
--- a/docs/api-guide/renderers.md
+++ b/docs/api-guide/renderers.md
@@ -67,22 +67,40 @@ If your API includes views that can serve both regular webpages and API response
 
 ## JSONRenderer
 
-Renders the request data into `JSON`, using ASCII encoding.
+Renders the request data into `JSON`, using utf-8 encoding.
+
+Note that non-ascii charaters will be rendered using JSON's `\uXXXX` character escape.  For example:
+
+    {"unicode black star": "\u2605"}
 
 The client may additionally include an `'indent'` media type parameter, in which case the returned `JSON` will be indented.  For example `Accept: application/json; indent=4`.
 
+    {
+        "unicode black star": "\u2605"
+    }
+
 **.media_type**: `application/json`
 
 **.format**: `'.json'`
 
-**.charset**: `iso-8859-1`
+**.charset**: `utf-8`
 
 ## UnicodeJSONRenderer
 
 Renders the request data into `JSON`, using utf-8 encoding.
 
+Note that non-ascii charaters will not be character escaped.  For example:
+
+    {"unicode black star": "★"}
+
 The client may additionally include an `'indent'` media type parameter, in which case the returned `JSON` will be indented.  For example `Accept: application/json; indent=4`.
 
+    {
+        "unicode black star": "★"
+    }
+
+Both the `JSONRenderer` and `UnicodeJSONRenderer` styles conform to [RFC 4627][rfc4627], and are syntactically valid JSON.
+
 **.media_type**: `application/json`
 
 **.format**: `'.json'`
@@ -101,7 +119,7 @@ The javascript callback function must be set by the client including a `callback
 
 **.format**: `'.jsonp'`
 
-**.charset**: `iso-8859-1`
+**.charset**: `utf-8`
 
 ## YAMLRenderer
 
@@ -252,7 +270,9 @@ By default renderer classes are assumed to be using the `UTF-8` encoding.  To us
         def render(self, data, media_type=None, renderer_context=None):
             return data.encode(self.charset)
 
-If the renderer returns a raw bytestring, you should set a charset value of `None`, which will ensure the `Content-Type` header of the response will not have a `charset` value set.  Doing so will also ensure that the browsable API will not attempt to display the binary content as a string.
+Note that if a renderer class returns a unicode string, then the response content will be coerced into a bytestring by the `Response` class, with the `charset` attribute set on the renderer used to determine the encoding.
+
+If the renderer returns a bytestring representing raw binary content, you should set a charset value of `None`, which will ensure the `Content-Type` header of the response will not have a `charset` value set.  Doing so will also ensure that the browsable API will not attempt to display the binary content as a string.
 
     class JPEGRenderer(renderers.BaseRenderer):
         media_type = 'image/jpeg'
@@ -350,6 +370,7 @@ Comma-separated values are a plain-text tabular data format, that can be easily
 [cite]: https://docs.djangoproject.com/en/dev/ref/template-response/#the-rendering-process
 [conneg]: content-negotiation.md
 [browser-accept-headers]: http://www.gethifi.com/blog/browser-rest-http-accept-headers
+[rfc4627]: http://www.ietf.org/rfc/rfc4627.txt
 [cors]: http://www.w3.org/TR/cors/
 [cors-docs]: ../topics/ajax-csrf-cors.md
 [HATEOAS]: http://timelessrepo.com/haters-gonna-hateoas
diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py
index b4fa55bd2..c42b086fd 100644
--- a/rest_framework/renderers.py
+++ b/rest_framework/renderers.py
@@ -43,18 +43,21 @@ class BaseRenderer(object):
 
 class JSONRenderer(BaseRenderer):
     """
-    Renderer which serializes to json.
+    Renderer which serializes to JSON.
+    Applies JSON's backslash-u character escaping for non-ascii characters.
     """
 
     media_type = 'application/json'
     format = 'json'
     encoder_class = encoders.JSONEncoder
     ensure_ascii = True
-    charset = 'iso-8859-1'
+    charset = 'utf-8'
+    # Note that JSON encodings must be utf-8, utf-16 or utf-32.
+    # See: http://www.ietf.org/rfc/rfc4627.txt
 
     def render(self, data, accepted_media_type=None, renderer_context=None):
         """
-        Render `obj` into json.
+        Render `data` into JSON.
         """
         if data is None:
             return ''
@@ -77,7 +80,11 @@ class JSONRenderer(BaseRenderer):
         ret = json.dumps(data, cls=self.encoder_class,
             indent=indent, ensure_ascii=self.ensure_ascii)
 
-        if not self.ensure_ascii:
+        # On python 2.x json.dumps() returns bytestrings if ensure_ascii=True,
+        # but if ensure_ascii=False, the return type is underspecified,
+        # and may (or may not) be unicode.
+        # On python 3.x json.dumps() returns unicode strings.
+        if isinstance(ret, six.text_type):
             return bytes(ret.encode(self.charset))
         return ret
 
@@ -85,6 +92,10 @@ class JSONRenderer(BaseRenderer):
 class UnicodeJSONRenderer(JSONRenderer):
     ensure_ascii = False
     charset = 'utf-8'
+    """
+    Renderer which serializes to JSON.
+    Does *not* apply JSON's character escaping for non-ascii characters.
+    """
 
 
 class JSONPRenderer(JSONRenderer):
@@ -117,7 +128,7 @@ class JSONPRenderer(JSONRenderer):
         callback = self.get_callback(renderer_context)
         json = super(JSONPRenderer, self).render(data, accepted_media_type,
                                                  renderer_context)
-        return "%s(%s);" % (callback, json)
+        return callback.encode(self.charset) + b'(' + json + b');'
 
 
 class XMLRenderer(BaseRenderer):
@@ -138,7 +149,7 @@ class XMLRenderer(BaseRenderer):
 
         stream = StringIO()
 
-        xml = SimplerXMLGenerator(stream, "utf-8")
+        xml = SimplerXMLGenerator(stream, self.charset)
         xml.startDocument()
         xml.startElement("root", {})
 
@@ -188,7 +199,7 @@ class YAMLRenderer(BaseRenderer):
         if data is None:
             return ''
 
-        return yaml.dump(data, stream=None, Dumper=self.encoder)
+        return yaml.dump(data, stream=None, encoding=self.charset, Dumper=self.encoder)
 
 
 class TemplateHTMLRenderer(BaseRenderer):
diff --git a/rest_framework/tests/renderers.py b/rest_framework/tests/renderers.py
index 1b2b92791..9096c82df 100644
--- a/rest_framework/tests/renderers.py
+++ b/rest_framework/tests/renderers.py
@@ -29,7 +29,7 @@ RENDERER_B_SERIALIZER = lambda x: ('Renderer B: %s' % x).encode('ascii')
 
 
 expected_results = [
-    ((elem for elem in [1, 2, 3]), JSONRenderer, '[1, 2, 3]')  # Generator
+    ((elem for elem in [1, 2, 3]), JSONRenderer, b'[1, 2, 3]')  # Generator
 ]
 
 
@@ -246,7 +246,7 @@ class JSONRendererTests(TestCase):
         renderer = JSONRenderer()
         content = renderer.render(obj, 'application/json')
         # Fix failing test case which depends on version of JSON library.
-        self.assertEqual(content, _flat_repr)
+        self.assertEqual(content.decode('utf-8'), _flat_repr)
 
     def test_with_content_type_args(self):
         """
@@ -255,13 +255,13 @@ class JSONRendererTests(TestCase):
         obj = {'foo': ['bar', 'baz']}
         renderer = JSONRenderer()
         content = renderer.render(obj, 'application/json; indent=2')
-        self.assertEqual(strip_trailing_whitespace(content), _indented_repr)
+        self.assertEqual(strip_trailing_whitespace(content.decode('utf-8')), _indented_repr)
 
     def test_check_ascii(self):
         obj = {'countries': ['United Kingdom', 'France', 'España']}
         renderer = JSONRenderer()
         content = renderer.render(obj, 'application/json')
-        self.assertEqual(content, '{"countries": ["United Kingdom", "France", "Espa\\u00f1a"]}')
+        self.assertEqual(content, '{"countries": ["United Kingdom", "France", "Espa\\u00f1a"]}'.encode('utf-8'))
 
 
 class UnicodeJSONRendererTests(TestCase):
@@ -289,7 +289,7 @@ class JSONPRendererTests(TestCase):
         resp = self.client.get('/jsonp/jsonrenderer',
                                HTTP_ACCEPT='application/javascript')
         self.assertEqual(resp.status_code, status.HTTP_200_OK)
-        self.assertEqual(resp['Content-Type'], 'application/javascript; charset=iso-8859-1')
+        self.assertEqual(resp['Content-Type'], 'application/javascript; charset=utf-8')
         self.assertEqual(resp.content,
             ('callback(%s);' % _flat_repr).encode('ascii'))
 
@@ -300,7 +300,7 @@ class JSONPRendererTests(TestCase):
         resp = self.client.get('/jsonp/nojsonrenderer',
                                HTTP_ACCEPT='application/javascript')
         self.assertEqual(resp.status_code, status.HTTP_200_OK)
-        self.assertEqual(resp['Content-Type'], 'application/javascript; charset=iso-8859-1')
+        self.assertEqual(resp['Content-Type'], 'application/javascript; charset=utf-8')
         self.assertEqual(resp.content,
             ('callback(%s);' % _flat_repr).encode('ascii'))
 
@@ -312,7 +312,7 @@ class JSONPRendererTests(TestCase):
         resp = self.client.get('/jsonp/nojsonrenderer?callback=' + callback_func,
                                HTTP_ACCEPT='application/javascript')
         self.assertEqual(resp.status_code, status.HTTP_200_OK)
-        self.assertEqual(resp['Content-Type'], 'application/javascript; charset=iso-8859-1')
+        self.assertEqual(resp['Content-Type'], 'application/javascript; charset=utf-8')
         self.assertEqual(resp.content,
             ('%s(%s);' % (callback_func, _flat_repr)).encode('ascii'))
 

From 02b29267acd3e3afabe6497a6ed04b10888d8731 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Wed, 22 May 2013 21:04:42 +0100
Subject: [PATCH 153/197] Fix release notes

---
 docs/topics/release-notes.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 560dd3050..519085b9a 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -44,7 +44,7 @@ You can determine your currently installed version using `pip freeze`:
 
 * Bugfix: HyperlinkedIdentityField now uses `lookup_field` kwarg.
 
-### 2.3.2
+### 2.3.3
 
 **Date**: 16th May 2013
 

From a1deb5eac7d6d00c6269d88fce1cc6818d8ec04a Mon Sep 17 00:00:00 2001
From: Oscar Vilaplana <dev@oscarvilaplana.cat>
Date: Thu, 23 May 2013 08:26:55 +0200
Subject: [PATCH 154/197] simplified, moved field humanizing to Field. broken
 tests

---
 rest_framework/fields.py       | 86 +++++---------------------------
 rest_framework/serializers.py  |  7 +++
 rest_framework/tests/fields.py | 91 +++++++++++++---------------------
 rest_framework/views.py        |  2 +-
 4 files changed, 56 insertions(+), 130 deletions(-)

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index cdcb0ee9e..d5a1394dc 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -31,36 +31,6 @@ from rest_framework.compat import smart_text, force_text, is_non_str_iterable
 from rest_framework.settings import api_settings
 
 
-HUMANIZED_FIELD_TYPES = {
-    'BooleanField': u'Boolean',
-    'CharField': u'String',
-    'ChoiceField': u'Single Choice',
-    'ComboField': u'Single Choice',
-    'DateField': u'Date',
-    'DateTimeField': u'Date and Time',
-    'DecimalField': u'Decimal',
-    'EmailField': u'Email',
-    'Field': u'Field',
-    'FileField': u'File',
-    'FilePathField': u'File Path',
-    'FloatField': u'Float',
-    'GenericIPAddressField': u'Generic IP Address',
-    'IPAddressField': u'IP Address',
-    'ImageField': u'Image',
-    'IntegerField': u'Integer',
-    'MultiValueField': u'Multiple Value',
-    'MultipleChoiceField': u'Multiple Choice',
-    'NullBooleanField': u'Nullable Boolean',
-    'RegexField': u'Regular Expression',
-    'SlugField': u'Slug',
-    'SplitDateTimeField': u'Split Date and Time',
-    'TimeField': u'Time',
-    'TypedChoiceField': u'Typed Single Choice',
-    'TypedMultipleChoiceField': u'Typed Multiple Choice',
-    'URLField': u'URL',
-}
-
-
 def is_simple_callable(obj):
     """
     True if the object is a callable that takes no arguments.
@@ -102,49 +72,6 @@ def readable_date_formats(formats):
     return humanize_strptime(format)
 
 
-def humanize_field_type(field_type):
-    """Return a human-readable name for a field type.
-
-    :param field_type: Either a field type class (for example
-        django.forms.fields.DateTimeField), or the name of a field type
-        (for example "DateTimeField").
-
-    :return: unicode
-
-    """
-    if isinstance(field_type, basestring):
-        field_type_name = field_type
-    else:
-        field_type_name = field_type.__name__
-    try:
-        return HUMANIZED_FIELD_TYPES[field_type_name]
-    except KeyError:
-        humanized = re.sub('([a-z0-9])([A-Z])', r'\1 \2', field_type_name)
-        return humanized.capitalize()
-
-
-def humanize_field(field):
-    """Return a human-readable description of a field.
-
-    :param field: A Django field.
-
-    :return: A dictionary of the form {type: type name, required: bool,
-             label: field label: read_only: bool,
-             help_text: optional help text}
-
-    """
-    humanized = {
-        'type': humanize_field_type(field.__class__),
-        'required': getattr(field, 'required', False),
-    }
-    optional_attrs = ['read_only', 'help_text', 'label',
-                      'min_length', 'max_length']
-    for attr in optional_attrs:
-        if getattr(field, attr, None) is not None:
-            humanized[attr] = getattr(field, attr)
-    return humanized
-
-
 def humanize_form_fields(form):
     """Return a humanized description of all the fields in a form.
 
@@ -274,6 +201,19 @@ class Field(object):
             return {'type': self.type_name}
         return {}
 
+    @property
+    def humanized(self):
+        humanized = {
+            'type': self.type_name,
+            'required': getattr(self, 'required', False),
+        }
+        optional_attrs = ['read_only', 'help_text', 'label',
+                          'min_length', 'max_length']
+        for attr in optional_attrs:
+            if getattr(self, attr, None) is not None:
+                humanized[attr] = getattr(self, attr)
+        return humanized
+
 
 class WritableField(Field):
     """
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 943fba6ba..072815df2 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -521,6 +521,13 @@ class BaseSerializer(WritableField):
 
         return self.object
 
+    @property
+    def humanized(self):
+        humanized_fields = SortedDict(
+            [(name, field.humanized)
+             for name, field in self.fields.iteritems()])
+        return humanized_fields
+
 
 class Serializer(six.with_metaclass(SerializerMetaclass, BaseSerializer)):
     pass
diff --git a/rest_framework/tests/fields.py b/rest_framework/tests/fields.py
index 856980926..fd1fe9615 100644
--- a/rest_framework/tests/fields.py
+++ b/rest_framework/tests/fields.py
@@ -15,8 +15,7 @@ from django.test import TestCase
 from django.utils.datastructures import SortedDict
 
 from rest_framework import serializers
-from rest_framework.fields import (humanize_field, humanize_field_type,
-                                   humanize_form_fields, Field)
+from rest_framework.fields import Field, CharField
 from rest_framework.serializers import Serializer
 from rest_framework.tests.models import RESTFrameworkModel
 
@@ -768,14 +767,16 @@ class SlugFieldTests(TestCase):
 
     def test_given_serializer_value(self):
         class SlugFieldSerializer(serializers.ModelSerializer):
-            slug_field = serializers.SlugField(source='slug_field', max_length=20, required=False)
+            slug_field = serializers.SlugField(source='slug_field',
+                                               max_length=20, required=False)
 
             class Meta:
                 model = self.SlugFieldModel
 
         serializer = SlugFieldSerializer(data={})
         self.assertEqual(serializer.is_valid(), True)
-        self.assertEqual(getattr(serializer.fields['slug_field'], 'max_length'), 20)
+        self.assertEqual(getattr(serializer.fields['slug_field'],
+                                 'max_length'), 20)
 
 
 class URLFieldTests(TestCase):
@@ -796,7 +797,8 @@ class URLFieldTests(TestCase):
 
         serializer = URLFieldSerializer(data={})
         self.assertEqual(serializer.is_valid(), True)
-        self.assertEqual(getattr(serializer.fields['url_field'], 'max_length'), 200)
+        self.assertEqual(getattr(serializer.fields['url_field'],
+                                 'max_length'), 200)
 
     def test_given_model_value(self):
         class URLFieldSerializer(serializers.ModelSerializer):
@@ -805,48 +807,21 @@ class URLFieldTests(TestCase):
 
         serializer = URLFieldSerializer(data={})
         self.assertEqual(serializer.is_valid(), True)
-        self.assertEqual(getattr(serializer.fields['url_field'], 'max_length'), 128)
+        self.assertEqual(getattr(serializer.fields['url_field'],
+                                 'max_length'), 128)
 
     def test_given_serializer_value(self):
         class URLFieldSerializer(serializers.ModelSerializer):
-            url_field = serializers.URLField(source='url_field', max_length=20, required=False)
+            url_field = serializers.URLField(source='url_field',
+                                             max_length=20, required=False)
 
             class Meta:
                 model = self.URLFieldWithGivenMaxLengthModel
 
         serializer = URLFieldSerializer(data={})
         self.assertEqual(serializer.is_valid(), True)
-        self.assertEqual(getattr(serializer.fields['url_field'], 'max_length'), 20)
-
-
-class HumanizedFieldType(TestCase):
-    def test_standard_type_classes(self):
-        for field_type_name in forms.fields.__all__:
-            field_type = getattr(forms.fields, field_type_name)
-            humanized = humanize_field_type(field_type)
-            self.assert_valid_name(humanized)
-
-    def test_standard_type_names(self):
-        for field_type_name in forms.fields.__all__:
-            humanized = humanize_field_type(field_type_name)
-            self.assert_valid_name(humanized)
-
-    def test_custom_type_name(self):
-        humanized = humanize_field_type('SomeCustomType')
-        self.assertEquals(humanized, u'Some custom type')
-
-    def test_custom_type(self):
-        custom_type = namedtuple('SomeCustomType', [])
-        humanized = humanize_field_type(custom_type)
-        self.assertEquals(humanized, u'Some custom type')
-
-    def assert_valid_name(self, humanized):
-        """A humanized field name is valid if it's a non-empty
-        unicode.
-
-        """
-        self.assertIsInstance(humanized, unicode)
-        self.assertNotEqual(humanized, '')
+        self.assertEqual(getattr(serializer.fields['url_field'],
+                         'max_length'), 20)
 
 
 class HumanizedField(TestCase):
@@ -859,37 +834,41 @@ class HumanizedField(TestCase):
         self.optional_field.label = uuid4().hex
         self.optional_field.required = False
 
+    def test_type(self):
+        for field in (self.required_field, self.optional_field):
+            self.assertEqual(field.humanized['type'], field.type_name)
+
     def test_required(self):
-        self.assertEqual(humanize_field(self.required_field)['required'], True)
+        self.assertEqual(self.required_field.humanized['required'], True)
 
     def test_optional(self):
-        self.assertEqual(humanize_field(self.optional_field)['required'],
-                         False)
+        self.assertEqual(self.optional_field.humanized['required'], False)
 
     def test_label(self):
         for field in (self.required_field, self.optional_field):
-            self.assertEqual(humanize_field(field)['label'], field.label)
+            self.assertEqual(field.humanized['label'], field.label)
 
 
-class Form(forms.Form):
-    field1 = forms.CharField(max_length=3, label='field one')
-    field2 = forms.CharField(label='field two')
+class HumanizableSerializer(Serializer):
+    field1 = CharField(3, required=True)
+    field2 = CharField(10, required=False)
 
 
 class HumanizedSerializer(TestCase):
     def setUp(self):
-        self.serializer = TimestampedModelSerializer()
+        self.serializer = HumanizableSerializer()
 
     def test_humanized(self):
-        humanized = humanize_form_fields(Form())
+        humanized = self.serializer.humanized
         expected = {
-            'field1': {u'help_text': u'',
-                       u'label': u'field one',
+            'field1': {u'required': True,
                        u'max_length': 3,
-                       u'required': True,
-                       u'type': u'String'},
-            'field2': {u'help_text': u'',
-                       u'label': u'field two',
-                       u'required': True,
-                       u'type': u'String'}}
-        self.assertEqual(humanized, expected)
+                       u'type': u'CharField',
+                       u'read_only': False},
+            'field2': {u'required': False,
+                       u'max_length': 10,
+                       u'type': u'CharField',
+                       u'read_only': False}}
+        self.assertEqual(set(expected.keys()), set(humanized.keys()))
+        for k, v in humanized.iteritems():
+            self.assertEqual(v, expected[k])
diff --git a/rest_framework/views.py b/rest_framework/views.py
index 5f9e1bf2c..d1afbe894 100644
--- a/rest_framework/views.py
+++ b/rest_framework/views.py
@@ -91,7 +91,7 @@ class APIView(View):
                     continue
                 serializer = self.get_serializer()
                 if serializer is not None:
-                    actions[method] = humanize_form_fields(serializer)
+                    actions[method] = serializer.humanized
             except exceptions.PermissionDenied:
                 # don't add this method
                 pass

From 78c53d530ff3d7a4a443b104ad73952d0b5b5b8b Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Fri, 24 May 2013 21:08:27 +0100
Subject: [PATCH 155/197] Updating docs

---
 docs/api-guide/fields.md     |  7 +++++++
 docs/topics/release-notes.md | 11 +++++++++++
 2 files changed, 18 insertions(+)

diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md
index e117c370c..b3208eb15 100644
--- a/docs/api-guide/fields.md
+++ b/docs/api-guide/fields.md
@@ -56,6 +56,13 @@ A dictionary of error codes to error messages.
 Used only if rendering the field to HTML.
 This argument sets the widget that should be used to render the field.
 
+### `label`
+
+A short text string that may be used as the name of the field in HTML form fields or other descriptive elements.
+
+### `help_text`
+
+A text string that may be used as a description of the field in HTML form fields or other descriptive elements.
 
 ---
 
diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 519085b9a..ff0115463 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -42,8 +42,19 @@ You can determine your currently installed version using `pip freeze`:
 
 ### Master
 
+* Serializer fields now support `label` and `help_text`.
+* Added `UnicodeJSONRenderer`.
+* Bugfix: `charset` now properly included in `Content-Type` of responses.
+* Bugfix: Blank choice now added in browsable API on nullable relationships.
+* Bugfix: Many to many relationships with `through` tables are now read-only.
+* Bugfix: Serializer fields now respect model field args such as `max_length`.
+* Bugfix: SlugField now performs slug validation.
+* Bugfix: Lazy-translatable strings now properly serialized.
+* Bugfix: Browsable API now supports bootswatch styles properly.
 * Bugfix: HyperlinkedIdentityField now uses `lookup_field` kwarg.
 
+**Note**: Responses now correctly include an appropriate charset on the `Content-Type` header.  For example: `application/json; charset=utf-8`.  If you have tests that check the content type of responses, you may need to update these accordingly.
+
 ### 2.3.3
 
 **Date**: 16th May 2013

From 112b52f57e8f5a4a54e2b0c40f442ee63daf9709 Mon Sep 17 00:00:00 2001
From: Alex Burgel <aburgel@gmail.com>
Date: Fri, 24 May 2013 18:28:47 -0400
Subject: [PATCH 156/197] Allow action decorator to handle multiple http
 methods

---
 rest_framework/decorators.py    |  6 +++---
 rest_framework/routers.py       | 10 +++++-----
 rest_framework/tests/routers.py | 19 ++++++++++++-------
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/rest_framework/decorators.py b/rest_framework/decorators.py
index 81e585e1c..8f79c817d 100644
--- a/rest_framework/decorators.py
+++ b/rest_framework/decorators.py
@@ -112,18 +112,18 @@ def link(**kwargs):
     Used to mark a method on a ViewSet that should be routed for GET requests.
     """
     def decorator(func):
-        func.bind_to_method = 'get'
+        func.bind_to_methods = ['get']
         func.kwargs = kwargs
         return func
     return decorator
 
 
-def action(**kwargs):
+def action(methods=['post'], **kwargs):
     """
     Used to mark a method on a ViewSet that should be routed for POST requests.
     """
     def decorator(func):
-        func.bind_to_method = 'post'
+        func.bind_to_methods = methods
         func.kwargs = kwargs
         return func
     return decorator
diff --git a/rest_framework/routers.py b/rest_framework/routers.py
index dba104c3f..6c5fd0048 100644
--- a/rest_framework/routers.py
+++ b/rest_framework/routers.py
@@ -131,20 +131,20 @@ class SimpleRouter(BaseRouter):
         dynamic_routes = []
         for methodname in dir(viewset):
             attr = getattr(viewset, methodname)
-            httpmethod = getattr(attr, 'bind_to_method', None)
-            if httpmethod:
-                dynamic_routes.append((httpmethod, methodname))
+            httpmethods = getattr(attr, 'bind_to_methods', None)
+            if httpmethods:
+                dynamic_routes.append((httpmethods, methodname))
 
         ret = []
         for route in self.routes:
             if route.mapping == {'{httpmethod}': '{methodname}'}:
                 # Dynamic routes (@link or @action decorator)
-                for httpmethod, methodname in dynamic_routes:
+                for httpmethods, methodname in dynamic_routes:
                     initkwargs = route.initkwargs.copy()
                     initkwargs.update(getattr(viewset, methodname).kwargs)
                     ret.append(Route(
                         url=replace_methodname(route.url, methodname),
-                        mapping={httpmethod: methodname},
+                        mapping=dict((httpmethod, methodname) for httpmethod in httpmethods),
                         name=replace_methodname(route.name, methodname),
                         initkwargs=initkwargs,
                     ))
diff --git a/rest_framework/tests/routers.py b/rest_framework/tests/routers.py
index 4e4765cb2..9f9ced0f1 100644
--- a/rest_framework/tests/routers.py
+++ b/rest_framework/tests/routers.py
@@ -23,6 +23,10 @@ class BasicViewSet(viewsets.ViewSet):
     def action2(self, request, *args, **kwargs):
         return Response({'method': 'action2'})
 
+    @action(methods=['post', 'delete'])
+    def action3(self, request, *args, **kwargs):
+        return Response({'method': 'action2'})
+
     @link()
     def link1(self, request, *args, **kwargs):
         return Response({'method': 'link1'})
@@ -40,16 +44,17 @@ class TestSimpleRouter(TestCase):
         routes = self.router.get_routes(BasicViewSet)
         decorator_routes = routes[2:]
         # Make sure all these endpoints exist and none have been clobbered
-        for i, endpoint in enumerate(['action1', 'action2', 'link1', 'link2']):
+        for i, endpoint in enumerate(['action1', 'action2', 'action3', 'link1', 'link2']):
             route = decorator_routes[i]
             # check url listing
             self.assertEqual(route.url,
                              '^{{prefix}}/{{lookup}}/{0}/$'.format(endpoint))
             # check method to function mapping
-            if endpoint.startswith('action'):
-                method_map = 'post'
+            if endpoint == 'action3':
+                methods_map = ['post', 'delete']
+            elif endpoint.startswith('action'):
+                methods_map = ['post']
             else:
-                method_map = 'get'
-            self.assertEqual(route.mapping[method_map], endpoint)
-
-
+                methods_map = ['get']
+            for method in methods_map:
+                self.assertEqual(route.mapping[method], endpoint)

From fcaee6e580efc62658a5b155525c55ef427c5778 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Fri, 24 May 2013 23:44:23 +0100
Subject: [PATCH 157/197] Clean up OPTIONS implementation

---
 docs/topics/release-notes.md        |  1 +
 rest_framework/fields.py            | 59 ++++++++++++-----------
 rest_framework/generics.py          | 43 +++++++++++++++--
 rest_framework/serializers.py       | 16 ++++---
 rest_framework/tests/fields.py      | 54 +++++++++------------
 rest_framework/tests/generics.py    | 74 +++++++++++++++--------------
 rest_framework/tests/permissions.py | 15 +++---
 rest_framework/tests/renderers.py   |  8 ++++
 rest_framework/utils/encoders.py    |  7 ++-
 rest_framework/views.py             | 64 ++++++-------------------
 10 files changed, 175 insertions(+), 166 deletions(-)

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index ff0115463..348b3a608 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -44,6 +44,7 @@ You can determine your currently installed version using `pip freeze`:
 
 * Serializer fields now support `label` and `help_text`.
 * Added `UnicodeJSONRenderer`.
+* `OPTIONS` requests now return metadata about fields for `POST` and `PUT` requests.
 * Bugfix: `charset` now properly included in `Content-Type` of responses.
 * Bugfix: Blank choice now added in browsable API on nullable relationships.
 * Bugfix: Many to many relationships with `through` tables are now read-only.
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index cb5f9a405..1534eecad 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -11,7 +11,6 @@ from decimal import Decimal, DecimalException
 import inspect
 import re
 import warnings
-
 from django.core import validators
 from django.core.exceptions import ValidationError
 from django.conf import settings
@@ -21,7 +20,6 @@ from django.forms import widgets
 from django.utils.encoding import is_protected_type
 from django.utils.translation import ugettext_lazy as _
 from django.utils.datastructures import SortedDict
-
 from rest_framework import ISO_8601
 from rest_framework.compat import (timezone, parse_date, parse_datetime,
                                    parse_time)
@@ -46,6 +44,7 @@ def is_simple_callable(obj):
     len_defaults = len(defaults) if defaults else 0
     return len_args <= len_defaults
 
+
 def get_component(obj, attr_name):
     """
     Given an object, and an attribute name,
@@ -72,18 +71,6 @@ def readable_date_formats(formats):
     return humanize_strptime(format)
 
 
-def humanize_form_fields(form):
-    """Return a humanized description of all the fields in a form.
-
-    :param form: A Django form.
-    :return: A dictionary of {field_label: humanized description}
-
-    """
-    fields = SortedDict([(name, humanize_field(field))
-                         for name, field in form.fields.iteritems()])
-    return fields
-
-
 def readable_time_formats(formats):
     format = ', '.join(formats).replace(ISO_8601, 'hh:mm[:ss[.uuuuuu]]')
     return humanize_strptime(format)
@@ -122,6 +109,7 @@ class Field(object):
     partial = False
     use_files = False
     form_field_class = forms.CharField
+    type_label = 'field'
 
     def __init__(self, source=None, label=None, help_text=None):
         self.parent = None
@@ -207,18 +195,17 @@ class Field(object):
             return {'type': self.type_name}
         return {}
 
-    @property
-    def humanized(self):
-        humanized = {
-            'type': self.type_name,
-            'required': getattr(self, 'required', False),
-        }
-        optional_attrs = ['read_only', 'help_text', 'label',
+    def metadata(self):
+        metadata = SortedDict()
+        metadata['type'] = self.type_label
+        metadata['required'] = getattr(self, 'required', False)
+        optional_attrs = ['read_only', 'label', 'help_text',
                           'min_length', 'max_length']
         for attr in optional_attrs:
-            if getattr(self, attr, None) is not None:
-                humanized[attr] = getattr(self, attr)
-        return humanized
+            value = getattr(self, attr, None)
+            if value is not None and value != '':
+                metadata[attr] = force_text(value, strings_only=True)
+        return metadata
 
 
 class WritableField(Field):
@@ -375,6 +362,7 @@ class ModelField(WritableField):
 
 class BooleanField(WritableField):
     type_name = 'BooleanField'
+    type_label = 'boolean'
     form_field_class = forms.BooleanField
     widget = widgets.CheckboxInput
     default_error_messages = {
@@ -397,6 +385,7 @@ class BooleanField(WritableField):
 
 class CharField(WritableField):
     type_name = 'CharField'
+    type_label = 'string'
     form_field_class = forms.CharField
 
     def __init__(self, max_length=None, min_length=None, *args, **kwargs):
@@ -415,6 +404,7 @@ class CharField(WritableField):
 
 class URLField(CharField):
     type_name = 'URLField'
+    type_label = 'url'
 
     def __init__(self, **kwargs):
         kwargs['validators'] = [validators.URLValidator()]
@@ -423,14 +413,15 @@ class URLField(CharField):
 
 class SlugField(CharField):
     type_name = 'SlugField'
+    type_label = 'slug'
     form_field_class = forms.SlugField
-    
+
     default_error_messages = {
         'invalid': _("Enter a valid 'slug' consisting of letters, numbers,"
                      " underscores or hyphens."),
     }
     default_validators = [validators.validate_slug]
-    
+
     def __init__(self, *args, **kwargs):
         super(SlugField, self).__init__(*args, **kwargs)
 
@@ -440,10 +431,11 @@ class SlugField(CharField):
         #result.widget = copy.deepcopy(self.widget, memo)
         result.validators = self.validators[:]
         return result
-    
-  
+
+
 class ChoiceField(WritableField):
     type_name = 'ChoiceField'
+    type_label = 'multiple choice'
     form_field_class = forms.ChoiceField
     widget = widgets.Select
     default_error_messages = {
@@ -494,6 +486,7 @@ class ChoiceField(WritableField):
 
 class EmailField(CharField):
     type_name = 'EmailField'
+    type_label = 'email'
     form_field_class = forms.EmailField
 
     default_error_messages = {
@@ -517,6 +510,7 @@ class EmailField(CharField):
 
 class RegexField(CharField):
     type_name = 'RegexField'
+    type_label = 'regex'
     form_field_class = forms.RegexField
 
     def __init__(self, regex, max_length=None, min_length=None, *args, **kwargs):
@@ -546,6 +540,7 @@ class RegexField(CharField):
 
 class DateField(WritableField):
     type_name = 'DateField'
+    type_label = 'date'
     widget = widgets.DateInput
     form_field_class = forms.DateField
 
@@ -609,6 +604,7 @@ class DateField(WritableField):
 
 class DateTimeField(WritableField):
     type_name = 'DateTimeField'
+    type_label = 'datetime'
     widget = widgets.DateTimeInput
     form_field_class = forms.DateTimeField
 
@@ -678,6 +674,7 @@ class DateTimeField(WritableField):
 
 class TimeField(WritableField):
     type_name = 'TimeField'
+    type_label = 'time'
     widget = widgets.TimeInput
     form_field_class = forms.TimeField
 
@@ -734,6 +731,7 @@ class TimeField(WritableField):
 
 class IntegerField(WritableField):
     type_name = 'IntegerField'
+    type_label = 'integer'
     form_field_class = forms.IntegerField
 
     default_error_messages = {
@@ -764,6 +762,7 @@ class IntegerField(WritableField):
 
 class FloatField(WritableField):
     type_name = 'FloatField'
+    type_label = 'float'
     form_field_class = forms.FloatField
 
     default_error_messages = {
@@ -783,6 +782,7 @@ class FloatField(WritableField):
 
 class DecimalField(WritableField):
     type_name = 'DecimalField'
+    type_label = 'decimal'
     form_field_class = forms.DecimalField
 
     default_error_messages = {
@@ -853,6 +853,7 @@ class DecimalField(WritableField):
 class FileField(WritableField):
     use_files = True
     type_name = 'FileField'
+    type_label = 'file upload'
     form_field_class = forms.FileField
     widget = widgets.FileInput
 
@@ -896,6 +897,8 @@ class FileField(WritableField):
 
 class ImageField(FileField):
     use_files = True
+    type_name = 'ImageField'
+    type_label = 'image upload'
     form_field_class = forms.ImageField
 
     default_error_messages = {
diff --git a/rest_framework/generics.py b/rest_framework/generics.py
index 05ec93d37..afcb8a9ff 100644
--- a/rest_framework/generics.py
+++ b/rest_framework/generics.py
@@ -3,13 +3,13 @@ Generic views that provide commonly needed behaviour.
 """
 from __future__ import unicode_literals
 
-from django.core.exceptions import ImproperlyConfigured
+from django.core.exceptions import ImproperlyConfigured, PermissionDenied
 from django.core.paginator import Paginator, InvalidPage
 from django.http import Http404
 from django.shortcuts import get_object_or_404
 from django.utils.translation import ugettext as _
-from rest_framework import views, mixins
-from rest_framework.exceptions import ConfigurationError
+from rest_framework import views, mixins, exceptions
+from rest_framework.request import clone_request
 from rest_framework.settings import api_settings
 import warnings
 
@@ -274,7 +274,7 @@ class GenericAPIView(views.APIView):
             )
             filter_kwargs = {self.slug_field: slug}
         else:
-            raise ConfigurationError(
+            raise exceptions.ConfigurationError(
                 'Expected view %s to be called with a URL keyword argument '
                 'named "%s". Fix your URL conf, or set the `.lookup_field` '
                 'attribute on the view correctly.' %
@@ -310,6 +310,41 @@ class GenericAPIView(views.APIView):
         """
         pass
 
+    def metadata(self, request):
+        """
+        Return a dictionary of metadata about the view.
+        Used to return responses for OPTIONS requests.
+
+        We override the default behavior, and add some extra information
+        about the required request body for POST and PUT operations.
+        """
+        ret = super(GenericAPIView, self).metadata(request)
+
+        actions = {}
+        for method in ('PUT', 'POST'):
+            if method not in self.allowed_methods:
+                continue
+
+            cloned_request = clone_request(request, method)
+            try:
+                # Test global permissions
+                self.check_permissions(cloned_request)
+                # Test object permissions
+                if method == 'PUT':
+                    self.get_object()
+            except (exceptions.APIException, PermissionDenied, Http404):
+                pass
+            else:
+                # If user has appropriate permissions for the view, include
+                # appropriate metadata about the fields that should be supplied.
+                serializer = self.get_serializer()
+                actions[method] = serializer.metadata()
+
+        if actions:
+            ret['actions'] = actions
+
+        return ret
+
 
 ##########################################################
 ### Concrete view classes that provide method handlers ###
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 17da8c253..5be07fb79 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -521,12 +521,16 @@ class BaseSerializer(WritableField):
 
         return self.object
 
-    @property
-    def humanized(self):
-        humanized_fields = SortedDict(
-            [(name, field.humanized)
-             for name, field in self.fields.iteritems()])
-        return humanized_fields
+    def metadata(self):
+        """
+        Return a dictionary of metadata about the fields on the serializer.
+        Useful for things like responding to OPTIONS requests, or generating
+        API schemas for auto-documentation.
+        """
+        return SortedDict(
+            [(field_name, field.metadata())
+            for field_name, field in six.iteritems(self.fields)]
+        )
 
 
 class Serializer(six.with_metaclass(SerializerMetaclass, BaseSerializer)):
diff --git a/rest_framework/tests/fields.py b/rest_framework/tests/fields.py
index 22c515a93..bff4400b1 100644
--- a/rest_framework/tests/fields.py
+++ b/rest_framework/tests/fields.py
@@ -3,17 +3,13 @@ General serializer field tests.
 """
 from __future__ import unicode_literals
 
-from collections import namedtuple
+import datetime
 from decimal import Decimal
 from uuid import uuid4
-
-import datetime
-from django import forms
 from django.core import validators
 from django.db import models
 from django.test import TestCase
 from django.utils.datastructures import SortedDict
-
 from rest_framework import serializers
 from rest_framework.fields import Field, CharField
 from rest_framework.serializers import Serializer
@@ -784,12 +780,12 @@ class SlugFieldTests(TestCase):
         """
         class SlugFieldSerializer(serializers.ModelSerializer):
             slug_field = serializers.SlugField(source='slug_field', max_length=20, required=True)
-        
+
             class Meta:
                 model = self.SlugFieldModel
-                
+
         s = SlugFieldSerializer(data={'slug_field': 'a b'})
-        
+
         self.assertEqual(s.is_valid(), False)
         self.assertEqual(s.errors,  {'slug_field': ["Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."]})
 
@@ -839,7 +835,7 @@ class URLFieldTests(TestCase):
                          'max_length'), 20)
 
 
-class HumanizedField(TestCase):
+class FieldMetadata(TestCase):
     def setUp(self):
         self.required_field = Field()
         self.required_field.label = uuid4().hex
@@ -849,41 +845,35 @@ class HumanizedField(TestCase):
         self.optional_field.label = uuid4().hex
         self.optional_field.required = False
 
-    def test_type(self):
-        for field in (self.required_field, self.optional_field):
-            self.assertEqual(field.humanized['type'], field.type_name)
-
     def test_required(self):
-        self.assertEqual(self.required_field.humanized['required'], True)
+        self.assertEqual(self.required_field.metadata()['required'], True)
 
     def test_optional(self):
-        self.assertEqual(self.optional_field.humanized['required'], False)
+        self.assertEqual(self.optional_field.metadata()['required'], False)
 
     def test_label(self):
         for field in (self.required_field, self.optional_field):
-            self.assertEqual(field.humanized['label'], field.label)
+            self.assertEqual(field.metadata()['label'], field.label)
 
 
-class HumanizableSerializer(Serializer):
+class MetadataSerializer(Serializer):
     field1 = CharField(3, required=True)
     field2 = CharField(10, required=False)
 
 
-class HumanizedSerializer(TestCase):
+class MetadataSerializerTestCase(TestCase):
     def setUp(self):
-        self.serializer = HumanizableSerializer()
+        self.serializer = MetadataSerializer()
 
-    def test_humanized(self):
-        humanized = self.serializer.humanized
+    def test_serializer_metadata(self):
+        metadata = self.serializer.metadata()
         expected = {
-            'field1': {u'required': True,
-                       u'max_length': 3,
-                       u'type': u'CharField',
-                       u'read_only': False},
-            'field2': {u'required': False,
-                       u'max_length': 10,
-                       u'type': u'CharField',
-                       u'read_only': False}}
-        self.assertEqual(set(expected.keys()), set(humanized.keys()))
-        for k, v in humanized.iteritems():
-            self.assertEqual(v, expected[k])
+            'field1': {'required': True,
+                       'max_length': 3,
+                       'type': 'string',
+                       'read_only': False},
+            'field2': {'required': False,
+                       'max_length': 10,
+                       'type': 'string',
+                       'read_only': False}}
+        self.assertEqual(expected, metadata)
diff --git a/rest_framework/tests/generics.py b/rest_framework/tests/generics.py
index a2f8fb4b3..f091d0db5 100644
--- a/rest_framework/tests/generics.py
+++ b/rest_framework/tests/generics.py
@@ -122,21 +122,24 @@ class TestRootView(TestCase):
             ],
             'name': 'Root',
             'description': 'Example description for OPTIONS.',
-            'actions': {}
-        }
-        expected['actions']['GET'] = {}
-        expected['actions']['POST'] = {
-            'text': {
-                'max_length': 100,
-                'read_only': False,
-                'required': True,
-                'type': 'String',
-            },
-            'id': {
-                'read_only': True,
-                'required': False,
-                'type': 'Integer',
-            },
+            'actions': {
+                'POST': {
+                    'text': {
+                        'max_length': 100,
+                        'read_only': False,
+                        'required': True,
+                        'type': 'string',
+                        "label": "Text comes here",
+                        "help_text": "Text description."
+                    },
+                    'id': {
+                        'read_only': True,
+                        'required': False,
+                        'type': 'integer',
+                        'label': 'ID',
+                    },
+                }
+            }
         }
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.data, expected)
@@ -239,9 +242,9 @@ class TestInstanceView(TestCase):
         """
         OPTIONS requests to RetrieveUpdateDestroyAPIView should return metadata
         """
-        request = factory.options('/')
-        with self.assertNumQueries(0):
-            response = self.view(request).render()
+        request = factory.options('/1')
+        with self.assertNumQueries(1):
+            response = self.view(request, pk=1).render()
         expected = {
             'parses': [
                 'application/json',
@@ -254,24 +257,25 @@ class TestInstanceView(TestCase):
             ],
             'name': 'Instance',
             'description': 'Example description for OPTIONS.',
-            'actions': {}
-        }
-        for method in ('GET', 'DELETE'):
-            expected['actions'][method] = {}
-        for method in ('PATCH', 'PUT'):
-            expected['actions'][method] = {
-                'text': {
-                    'max_length': 100,
-                    'read_only': False,
-                    'required': True,
-                    'type': 'String',
-                },
-                'id': {
-                    'read_only': True,
-                    'required': False,
-                    'type': 'Integer',
-                },
+            'actions': {
+                'PUT': {
+                    'text': {
+                        'max_length': 100,
+                        'read_only': False,
+                        'required': True,
+                        'type': 'string',
+                        'label': 'Text comes here',
+                        'help_text': 'Text description.'
+                    },
+                    'id': {
+                        'read_only': True,
+                        'required': False,
+                        'type': 'integer',
+                        'label': 'ID',
+                    },
+                }
             }
+        }
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.data, expected)
 
diff --git a/rest_framework/tests/permissions.py b/rest_framework/tests/permissions.py
index 5a18182bf..6caaf65b0 100644
--- a/rest_framework/tests/permissions.py
+++ b/rest_framework/tests/permissions.py
@@ -114,44 +114,41 @@ class ModelPermissionsIntegrationTests(TestCase):
         response = root_view(request, pk='1')
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertIn('actions', response.data)
-        self.assertEquals(response.data['actions'].keys(), ['POST', 'GET',])
+        self.assertEqual(list(response.data['actions'].keys()), ['POST'])
 
         request = factory.options('/1', content_type='application/json',
                                HTTP_AUTHORIZATION=self.permitted_credentials)
         response = instance_view(request, pk='1')
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertIn('actions', response.data)
-        self.assertEquals(response.data['actions'].keys(), ['PUT', 'PATCH', 'DELETE', 'GET',])
+        self.assertEqual(list(response.data['actions'].keys()), ['PUT'])
 
     def test_options_disallowed(self):
         request = factory.options('/', content_type='application/json',
                                HTTP_AUTHORIZATION=self.disallowed_credentials)
         response = root_view(request, pk='1')
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertIn('actions', response.data)
-        self.assertEquals(response.data['actions'].keys(), ['GET',])
+        self.assertNotIn('actions', response.data)
 
         request = factory.options('/1', content_type='application/json',
                                HTTP_AUTHORIZATION=self.disallowed_credentials)
         response = instance_view(request, pk='1')
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertIn('actions', response.data)
-        self.assertEquals(response.data['actions'].keys(), ['GET',])
+        self.assertNotIn('actions', response.data)
 
     def test_options_updateonly(self):
         request = factory.options('/', content_type='application/json',
                                HTTP_AUTHORIZATION=self.updateonly_credentials)
         response = root_view(request, pk='1')
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertIn('actions', response.data)
-        self.assertEquals(response.data['actions'].keys(), ['GET',])
+        self.assertNotIn('actions', response.data)
 
         request = factory.options('/1', content_type='application/json',
                                HTTP_AUTHORIZATION=self.updateonly_credentials)
         response = instance_view(request, pk='1')
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertIn('actions', response.data)
-        self.assertEquals(response.data['actions'].keys(), ['PUT', 'PATCH', 'GET',])
+        self.assertEqual(list(response.data['actions'].keys()), ['PUT'])
 
 
 class OwnerModel(models.Model):
diff --git a/rest_framework/tests/renderers.py b/rest_framework/tests/renderers.py
index 9096c82df..cf3f4b466 100644
--- a/rest_framework/tests/renderers.py
+++ b/rest_framework/tests/renderers.py
@@ -6,6 +6,7 @@ from django.core.cache import cache
 from django.test import TestCase
 from django.test.client import RequestFactory
 from django.utils import unittest
+from django.utils.translation import ugettext_lazy as _
 from rest_framework import status, permissions
 from rest_framework.compat import yaml, etree, patterns, url, include
 from rest_framework.response import Response
@@ -238,6 +239,13 @@ class JSONRendererTests(TestCase):
     Tests specific to the JSON Renderer
     """
 
+    def test_render_lazy_strings(self):
+        """
+        JSONRenderer should deal with lazy translated strings.
+        """
+        ret = JSONRenderer().render(_('test'))
+        self.assertEqual(ret, b'"test"')
+
     def test_without_content_type_args(self):
         """
         Test basic JSON rendering.
diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py
index b6de18a81..b26a2085a 100644
--- a/rest_framework/utils/encoders.py
+++ b/rest_framework/utils/encoders.py
@@ -3,7 +3,8 @@ Helper classes for parsers.
 """
 from __future__ import unicode_literals
 from django.utils.datastructures import SortedDict
-from rest_framework.compat import timezone
+from django.utils.functional import Promise
+from rest_framework.compat import timezone, force_text
 from rest_framework.serializers import DictWithMetadata, SortedDictWithMetadata
 import datetime
 import decimal
@@ -19,7 +20,9 @@ class JSONEncoder(json.JSONEncoder):
     def default(self, o):
         # For Date Time string spec, see ECMA 262
         # http://ecma-international.org/ecma-262/5.1/#sec-15.9.1.15
-        if isinstance(o, datetime.datetime):
+        if isinstance(o, Promise):
+            return force_text(o)
+        elif isinstance(o, datetime.datetime):
             r = o.isoformat()
             if o.microsecond:
                 r = r[:23] + r[26:]
diff --git a/rest_framework/views.py b/rest_framework/views.py
index d1afbe894..e1b6705b6 100644
--- a/rest_framework/views.py
+++ b/rest_framework/views.py
@@ -5,12 +5,11 @@ from __future__ import unicode_literals
 
 from django.core.exceptions import PermissionDenied
 from django.http import Http404, HttpResponse
+from django.utils.datastructures import SortedDict
 from django.views.decorators.csrf import csrf_exempt
-
 from rest_framework import status, exceptions
 from rest_framework.compat import View
-from rest_framework.fields import humanize_form_fields
-from rest_framework.request import clone_request, Request
+from rest_framework.request import Request
 from rest_framework.response import Response
 from rest_framework.settings import api_settings
 from rest_framework.utils.formatting import get_view_name, get_view_description
@@ -54,53 +53,6 @@ class APIView(View):
             'Vary': 'Accept'
         }
 
-    def metadata(self, request):
-        content = {
-            'name': get_view_name(self.__class__),
-            'description': get_view_description(self.__class__),
-            'renders': [renderer.media_type for renderer in self.renderer_classes],
-            'parses': [parser.media_type for parser in self.parser_classes],
-        }
-        content['actions'] = self.action_metadata(request)
-
-        return content
-
-    def action_metadata(self, request):
-        """Return a dictionary with the fields required fo reach allowed method. If no method is allowed,
-        return an empty dictionary.
-
-        :param request: Request for which to return the metadata of the allowed methods.
-        :return: A dictionary of the form {method: {field: {field attribute: value}}}
-        """
-        actions = {}
-        for method in self.allowed_methods:
-            # skip HEAD and OPTIONS
-            if method in ('HEAD', 'OPTIONS'):
-                continue
-
-            cloned_request = clone_request(request, method)
-            try:
-                self.check_permissions(cloned_request)
-
-                # TODO: discuss whether and how to expose parameters like e.g. filter or paginate
-                if method in ('GET', 'DELETE'):
-                    actions[method] = {}
-                    continue
-
-                if not hasattr(self, 'get_serializer'):
-                    continue
-                serializer = self.get_serializer()
-                if serializer is not None:
-                    actions[method] = serializer.humanized
-            except exceptions.PermissionDenied:
-                # don't add this method
-                pass
-            except exceptions.NotAuthenticated:
-                # don't add this method
-                pass
-
-        return actions if len(actions) > 0 else None
-
     def http_method_not_allowed(self, request, *args, **kwargs):
         """
         If `request.method` does not correspond to a handler method,
@@ -383,3 +335,15 @@ class APIView(View):
         a less useful default implementation.
         """
         return Response(self.metadata(request), status=status.HTTP_200_OK)
+
+    def metadata(self, request):
+        """
+        Return a dictionary of metadata about the view.
+        Used to return responses for OPTIONS requests.
+        """
+        ret = SortedDict()
+        ret['name'] = get_view_name(self.__class__)
+        ret['description'] = get_view_description(self.__class__)
+        ret['renders'] = [renderer.media_type for renderer in self.renderer_classes]
+        ret['parses'] = [parser.media_type for parser in self.parser_classes]
+        return ret

From 2a38aa7291575aeb8b5444496ffad0b70dca3945 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Fri, 24 May 2013 23:55:59 +0100
Subject: [PATCH 158/197] Version 2.3.4

---
 docs/topics/release-notes.md | 4 +++-
 rest_framework/__init__.py   | 2 +-
 rest_framework/renderers.py  | 5 +----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 348b3a608..d3a95f1a9 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -40,7 +40,9 @@ You can determine your currently installed version using `pip freeze`:
 
 ## 2.3.x series
 
-### Master
+### 2.3.4
+
+**Date**: 24th May 2013
 
 * Serializer fields now support `label` and `help_text`.
 * Added `UnicodeJSONRenderer`.
diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py
index 0b1e67fbc..59046733b 100644
--- a/rest_framework/__init__.py
+++ b/rest_framework/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '2.3.3'
+__version__ = '2.3.4'
 
 VERSION = __version__  # synonym
 
diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py
index c42b086fd..b2fe43eac 100644
--- a/rest_framework/renderers.py
+++ b/rest_framework/renderers.py
@@ -507,10 +507,7 @@ class BrowsableAPIRenderer(BaseRenderer):
 
     def render(self, data, accepted_media_type=None, renderer_context=None):
         """
-        Renders *obj* using the :attr:`template` set on the class.
-
-        The context used in the template contains all the information
-        needed to self-document the response to this request.
+        Render the HTML for the browsable API representation.
         """
         accepted_media_type = accepted_media_type or ''
         renderer_context = renderer_context or {}

From b0201bcfbf57cd3abf75746c149e1eb70ba19c55 Mon Sep 17 00:00:00 2001
From: Sebastien Beal <sebastibe@gmail.com>
Date: Sun, 26 May 2013 11:52:45 +0900
Subject: [PATCH 159/197] Fix doc typo in UserViewSet example

---
 docs/api-guide/viewsets.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md
index cd92dc585..31570d743 100644
--- a/docs/api-guide/viewsets.md
+++ b/docs/api-guide/viewsets.md
@@ -65,7 +65,7 @@ Both of these come with a trade-off.  Using regular views and URL confs is more
 
 The default routers included with REST framework will provide routes for a standard set of create/retrieve/update/destroy style operations, as shown below:
 
-    class UserViewSet(viewsets.VietSet):
+    class UserViewSet(viewsets.ViewSet):
         """
         Example empty viewset demonstrating the standard
         actions that will be handled by a router class.

From 138f0cacdb0f093a4dc65ef98bf48ddbc27e18b2 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Tue, 28 May 2013 11:57:11 +0100
Subject: [PATCH 160/197] Raise 404 on incorrect lookup type in URL, not 500.
 Closes #890.

---
 rest_framework/generics.py       | 13 ++++++++++++-
 rest_framework/tests/generics.py | 10 ++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/rest_framework/generics.py b/rest_framework/generics.py
index afcb8a9ff..9ccc78980 100644
--- a/rest_framework/generics.py
+++ b/rest_framework/generics.py
@@ -6,7 +6,7 @@ from __future__ import unicode_literals
 from django.core.exceptions import ImproperlyConfigured, PermissionDenied
 from django.core.paginator import Paginator, InvalidPage
 from django.http import Http404
-from django.shortcuts import get_object_or_404
+from django.shortcuts import get_object_or_404 as _get_object_or_404
 from django.utils.translation import ugettext as _
 from rest_framework import views, mixins, exceptions
 from rest_framework.request import clone_request
@@ -14,6 +14,17 @@ from rest_framework.settings import api_settings
 import warnings
 
 
+def get_object_or_404(queryset, **filter_kwargs):
+    """
+    Same as Django's standard shortcut, but make sure to raise 404
+    if the filter_kwargs don't match the required types.
+    """
+    try:
+        return _get_object_or_404(queryset, **filter_kwargs)
+    except (TypeError, ValueError):
+        raise Http404
+
+
 class GenericAPIView(views.APIView):
     """
     Base class for all other generic views.
diff --git a/rest_framework/tests/generics.py b/rest_framework/tests/generics.py
index f091d0db5..37734195a 100644
--- a/rest_framework/tests/generics.py
+++ b/rest_framework/tests/generics.py
@@ -279,6 +279,16 @@ class TestInstanceView(TestCase):
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.data, expected)
 
+    def test_get_instance_view_incorrect_arg(self):
+        """
+        GET requests with an incorrect pk type, should raise 404, not 500.
+        Regression test for #890.
+        """
+        request = factory.get('/a')
+        with self.assertNumQueries(0):
+            response = self.view(request, pk='a').render()
+        self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
+
     def test_put_cannot_set_id(self):
         """
         PUT requests to create a new object should not be able to set the id.

From 22e1950e1cca237e6edeea3ddc9c798b975c6183 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Tue, 28 May 2013 12:08:36 +0100
Subject: [PATCH 161/197] Backwards compatible approach to
 HyperlinkedIdentityField URLs.  Closes #892

---
 rest_framework/relations.py | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/rest_framework/relations.py b/rest_framework/relations.py
index c4271e337..41707efce 100644
--- a/rest_framework/relations.py
+++ b/rest_framework/relations.py
@@ -518,8 +518,6 @@ class HyperlinkedIdentityField(Field):
         request = self.context.get('request', None)
         format = self.context.get('format', None)
         view_name = self.view_name or self.parent.opts.view_name
-        lookup_field = getattr(obj, self.lookup_field)
-        kwargs = {self.lookup_field: lookup_field}
 
         if request is None:
             warnings.warn("Using `HyperlinkedIdentityField` without including the "
@@ -539,27 +537,30 @@ class HyperlinkedIdentityField(Field):
         if format and self.format and self.format != format:
             format = self.format
 
+        lookup_field = getattr(obj, self.lookup_field)
+        kwargs = {self.lookup_field: lookup_field}
         try:
             return reverse(view_name, kwargs=kwargs, request=request, format=format)
         except NoReverseMatch:
             pass
 
+        if self.pk_url_kwarg != 'pk':
+            # Only try pk lookup if it has been explicitly set.
+            # Otherwise, the default `lookup_field = 'pk'` has us covered.
+            kwargs = {self.pk_url_kwarg: obj.pk}
+            try:
+                return reverse(view_name, kwargs=kwargs, request=request, format=format)
+            except NoReverseMatch:
+                pass
+
         slug = getattr(obj, self.slug_field, None)
-
-        if not slug:
-            raise Exception('Could not resolve URL for field using view name "%s"' % view_name)
-
-        kwargs = {self.slug_url_kwarg: slug}
-        try:
-            return reverse(view_name, kwargs=kwargs, request=request, format=format)
-        except NoReverseMatch:
-            pass
-
-        kwargs = {self.pk_url_kwarg: obj.pk, self.slug_url_kwarg: slug}
-        try:
-            return reverse(view_name, kwargs=kwargs, request=request, format=format)
-        except NoReverseMatch:
-            pass
+        if slug:
+            # Only use slug lookup if a slug field exists on the model
+            kwargs = {self.slug_url_kwarg: slug}
+            try:
+                return reverse(view_name, kwargs=kwargs, request=request, format=format)
+            except NoReverseMatch:
+                pass
 
         raise Exception('Could not resolve URL for field using view name "%s"' % view_name)
 

From 1f03b267cf3c2974d3a59125d9fe97b3aa74f573 Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy <xordoquy@linovia.com>
Date: Tue, 28 May 2013 14:49:27 +0200
Subject: [PATCH 162/197] Added Django 1.6a1 to the test matrix.

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 3a7c2d7ad..94f69cae5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ python:
   - "3.3"
 
 env:
+  - DJANGO="https://www.djangoproject.com/download/1.6a1/tarball/"
   - DJANGO="django==1.5.1 --use-mirrors"
   - DJANGO="django==1.4.5 --use-mirrors"
   - DJANGO="django==1.3.7 --use-mirrors"

From 8f35ac4f93c608eaced3f48a46e8922104e09182 Mon Sep 17 00:00:00 2001
From: Pascal Borreli <pascal@borreli.com>
Date: Tue, 28 May 2013 15:09:23 +0100
Subject: [PATCH 163/197] Fixed typos

---
 docs/api-guide/fields.md                          | 4 ++--
 docs/api-guide/generic-views.md                   | 2 +-
 docs/api-guide/relations.md                       | 2 +-
 docs/api-guide/renderers.md                       | 6 +++---
 docs/api-guide/routers.md                         | 2 +-
 docs/api-guide/serializers.md                     | 2 +-
 docs/api-guide/settings.md                        | 2 +-
 docs/api-guide/viewsets.md                        | 4 ++--
 docs/topics/2.2-announcement.md                   | 6 +++---
 docs/topics/2.3-announcement.md                   | 2 +-
 docs/topics/browser-enhancements.md               | 2 +-
 docs/topics/contributing.md                       | 4 ++--
 docs/topics/release-notes.md                      | 4 ++--
 docs/topics/rest-framework-2-announcement.md      | 4 ++--
 docs/tutorial/4-authentication-and-permissions.md | 4 ++--
 docs/tutorial/quickstart.md                       | 4 ++--
 rest_framework/decorators.py                      | 4 ++--
 rest_framework/response.py                        | 2 +-
 rest_framework/serializers.py                     | 4 ++--
 rest_framework/templatetags/rest_framework.py     | 2 +-
 20 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md
index b3208eb15..92d2066d0 100644
--- a/docs/api-guide/fields.md
+++ b/docs/api-guide/fields.md
@@ -204,7 +204,7 @@ If you want to override this behavior, you'll need to declare the `DateTimeField
         class Meta:
             model = Comment
 
-Note that by default, datetime representations are deteremined by the renderer in use, although this can be explicitly overridden as detailed below.
+Note that by default, datetime representations are determined by the renderer in use, although this can be explicitly overridden as detailed below.
 
 In the case of JSON this means the default datetime representation uses the [ECMA 262 date time string specification][ecma262].  This is a subset of ISO 8601 which uses millisecond precision, and includes the 'Z' suffix for the UTC timezone, for example: `2013-01-29T12:34:56.123Z`.
 
@@ -226,7 +226,7 @@ Corresponds to `django.db.models.fields.DateField`
 * `format` - A string representing the output format.  If not specified, this defaults to `None`, which indicates that python `date` objects should be returned by `to_native`.  In this case the date encoding will be determined by the renderer.
 * `input_formats` - A list of strings representing the input formats which may be used to parse the date. If not specified, the `DATE_INPUT_FORMATS` setting will be used, which defaults to `['iso-8601']`. 
 
-Date format strings may either be [python strftime formats][strftime] which explicitly specifiy the format, or the special string `'iso-8601'`, which indicates that [ISO 8601][iso8601] style dates should be used. (eg `'2013-01-29'`)
+Date format strings may either be [python strftime formats][strftime] which explicitly specify the format, or the special string `'iso-8601'`, which indicates that [ISO 8601][iso8601] style dates should be used. (eg `'2013-01-29'`)
 
 ## TimeField
 
diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md
index 1a060a324..20b9440ba 100755
--- a/docs/api-guide/generic-views.md
+++ b/docs/api-guide/generic-views.md
@@ -71,7 +71,7 @@ The following attributes control the basic view behavior.
 The following attibutes are used to control pagination when used with list views.
 
 * `paginate_by` - The size of pages to use with paginated data.  If set to `None` then pagination is turned off.  If unset this uses the same value as the `PAGINATE_BY` setting, which defaults to `None`.
-* `paginate_by_param` - The name of a query parameter, which can be used by the client to overide the default page size to use for pagination.  If unset this uses the same value as the `PAGINATE_BY_PARAM` setting, which defaults to `None`.
+* `paginate_by_param` - The name of a query parameter, which can be used by the client to override the default page size to use for pagination.  If unset this uses the same value as the `PAGINATE_BY_PARAM` setting, which defaults to `None`.
 * `pagination_serializer_class` - The pagination serializer class to use when determining the style of paginated responses.  Defaults to the same value as the `DEFAULT_PAGINATION_SERIALIZER_CLASS` setting.
 * `page_kwarg` - The name of a URL kwarg or URL query parameter which can be used by the client to control which page is requested.  Defaults to `'page'`.
 
diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md
index 99fe10834..af0687b94 100644
--- a/docs/api-guide/relations.md
+++ b/docs/api-guide/relations.md
@@ -237,7 +237,7 @@ Would serialize to a nested representation like this:
         'album_name': 'The Grey Album',
         'artist': 'Danger Mouse'
         'tracks': [
-            {'order': 1, 'title': 'Public Service Annoucement'},
+            {'order': 1, 'title': 'Public Service Announcement'},
             {'order': 2, 'title': 'What More Can I Say'},
             {'order': 3, 'title': 'Encore'},
             ...
diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md
index 0161b54d1..7e78318b6 100644
--- a/docs/api-guide/renderers.md
+++ b/docs/api-guide/renderers.md
@@ -14,7 +14,7 @@ The set of valid renderers for a view is always defined as a list of classes.  W
 
 The basic process of content negotiation involves examining the request's `Accept` header, to determine which media types it expects in the response.  Optionally, format suffixes on the URL may be used to explicitly request a particular representation.  For example the URL `http://example.com/api/users_count.json` might be an endpoint that always returns JSON data.
 
-For more information see the documentation on [content negotation][conneg].
+For more information see the documentation on [content negotiation][conneg].
 
 ## Setting the renderers
 
@@ -69,7 +69,7 @@ If your API includes views that can serve both regular webpages and API response
 
 Renders the request data into `JSON`, using utf-8 encoding.
 
-Note that non-ascii charaters will be rendered using JSON's `\uXXXX` character escape.  For example:
+Note that non-ascii characters will be rendered using JSON's `\uXXXX` character escape.  For example:
 
     {"unicode black star": "\u2605"}
 
@@ -89,7 +89,7 @@ The client may additionally include an `'indent'` media type parameter, in which
 
 Renders the request data into `JSON`, using utf-8 encoding.
 
-Note that non-ascii charaters will not be character escaped.  For example:
+Note that non-ascii characters will not be character escaped.  For example:
 
     {"unicode black star": "★"}
 
diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md
index 6588d7e51..fd3a15d51 100644
--- a/docs/api-guide/routers.md
+++ b/docs/api-guide/routers.md
@@ -85,7 +85,7 @@ This router is similar to `SimpleRouter` as above, but additionally includes a d
 
 # Custom Routers
 
-Implementing a custom router isn't something you'd need to do very often, but it can be useful if you have specfic requirements about how the your URLs for your API are strutured.  Doing so allows you to encapsulate the URL structure in a reusable way that ensures you don't have to write your URL patterns explicitly for each new view.
+Implementing a custom router isn't something you'd need to do very often, but it can be useful if you have specific requirements about how the your URLs for your API are strutured.  Doing so allows you to encapsulate the URL structure in a reusable way that ensures you don't have to write your URL patterns explicitly for each new view.
 
 The simplest way to implement a custom router is to subclass one of the existing router classes.  The `.routes` attribute is used to template the URL patterns that will be mapped to each viewset. 
 
diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md
index c83a0967e..053a5eaf0 100644
--- a/docs/api-guide/serializers.md
+++ b/docs/api-guide/serializers.md
@@ -104,7 +104,7 @@ When deserializing a list of items, errors will be returned as a list of diction
 
 #### Field-level validation
 
-You can specify custom field-level validation by adding `.validate_<fieldname>` methods to your `Serializer` subclass. These are analagous to `.clean_<fieldname>` methods on Django forms, but accept slightly different arguments.
+You can specify custom field-level validation by adding `.validate_<fieldname>` methods to your `Serializer` subclass. These are analogous to `.clean_<fieldname>` methods on Django forms, but accept slightly different arguments.
 
 They take a dictionary of deserialized attributes as a first argument, and the field name in that dictionary as a second argument (which will be either the name of the field or the value of the `source` argument to the field, if one was provided).
 
diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md
index b00ab4c1d..8d8c00cf3 100644
--- a/docs/api-guide/settings.md
+++ b/docs/api-guide/settings.md
@@ -125,7 +125,7 @@ Default: `None`
 
 #### PAGINATE_BY_PARAM
 
-The name of a query parameter, which can be used by the client to overide the default page size to use for pagination.  If set to `None`, clients may not override the default page size.
+The name of a query parameter, which can be used by the client to override the default page size to use for pagination.  If set to `None`, clients may not override the default page size.
 
 Default: `None`
 
diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md
index 31570d743..793646260 100644
--- a/docs/api-guide/viewsets.md
+++ b/docs/api-guide/viewsets.md
@@ -34,7 +34,7 @@ Let's define a simple viewset that can be used to list or retrieve all the users
             serializer = UserSerializer(user)
             return Response(serializer.data)
 
-If we need to, we can bind this viewset into two seperate views, like so:
+If we need to, we can bind this viewset into two separate views, like so:
 
     user_list = UserViewSet.as_view({'get': 'list'})
     user_detail = UserViewSet.as_view({'get': 'retrieve'})
@@ -92,7 +92,7 @@ The default routers included with REST framework will provide routes for a stand
         def destroy(self, request, pk=None):
             pass
 
-If you have ad-hoc methods that you need to be routed to, you can mark them as requiring routing using the `@link` or `@action` decorators.  The `@link` decorator will route `GET` requests, and the `@action` decroator will route `POST` requests.
+If you have ad-hoc methods that you need to be routed to, you can mark them as requiring routing using the `@link` or `@action` decorators.  The `@link` decorator will route `GET` requests, and the `@action` decorator will route `POST` requests.
 
 For example:
 
diff --git a/docs/topics/2.2-announcement.md b/docs/topics/2.2-announcement.md
index d7164ce46..02cac1295 100644
--- a/docs/topics/2.2-announcement.md
+++ b/docs/topics/2.2-announcement.md
@@ -75,7 +75,7 @@ This more explicit behavior on serializing and deserializing data [makes integra
 
 The implicit to-many behavior on serializers, and the `ManyRelatedField` style classes will continue to function, but will raise a `PendingDeprecationWarning`, which can be made visible using the `-Wd` flag.
 
-**Note**: If you need to forcibly turn off the implict "`many=True` for `__iter__` objects" behavior, you can now do so by specifying `many=False`.  This will become the default (instead of the current default of `None`) once the deprecation of the implicit behavior is finalised in version 2.4.
+**Note**: If you need to forcibly turn off the implicit "`many=True` for `__iter__` objects" behavior, you can now do so by specifying `many=False`.  This will become the default (instead of the current default of `None`) once the deprecation of the implicit behavior is finalised in version 2.4.
 
 ### Cleaner optional relationships
 
@@ -103,9 +103,9 @@ The `blank` keyword argument will continue to function, but will raise a `Pendin
 
 ### Simpler object-level permissions
 
-Custom permissions classes previously used the signatute `.has_permission(self, request, view, obj=None)`.  This method would be called twice, firstly for the global permissions check, with the `obj` parameter set to `None`, and again for the object-level permissions check when appropriate, with the `obj` parameter set to the relevant model instance.
+Custom permissions classes previously used the signature `.has_permission(self, request, view, obj=None)`.  This method would be called twice, firstly for the global permissions check, with the `obj` parameter set to `None`, and again for the object-level permissions check when appropriate, with the `obj` parameter set to the relevant model instance.
 
-The global permissions check and object-level permissions check are now seperated into two seperate methods, which gives a cleaner, more obvious API.
+The global permissions check and object-level permissions check are now separated into two separate methods, which gives a cleaner, more obvious API.
 
 * Global permission checks now use the `.has_permission(self, request, view)` signature.
 * Object-level permission checks use a new method `.has_object_permission(self, request, view, obj)`.
diff --git a/docs/topics/2.3-announcement.md b/docs/topics/2.3-announcement.md
index 4df9c819c..d51037b78 100644
--- a/docs/topics/2.3-announcement.md
+++ b/docs/topics/2.3-announcement.md
@@ -51,7 +51,7 @@ This improvement is reflected in improved documentation for the `GenericAPIView`
 
 ## Easier Serializers
 
-REST framework lets you be totally explict regarding how you want to represent relationships, allowing you to choose between styles such as hyperlinking or primary key relationships.
+REST framework lets you be totally explicit regarding how you want to represent relationships, allowing you to choose between styles such as hyperlinking or primary key relationships.
 
 The ability to specify exactly how you want to represent relationships is powerful, but it also introduces complexity.  In order to keep things more simple, REST framework now allows you to include reverse relationships simply by including the field name in the `fields` metadata of the serializer class.
 
diff --git a/docs/topics/browser-enhancements.md b/docs/topics/browser-enhancements.md
index ce07fe95b..31b94841f 100644
--- a/docs/topics/browser-enhancements.md
+++ b/docs/topics/browser-enhancements.md
@@ -60,7 +60,7 @@ have any control over what is sent in the `Accept` header.
 ## URL based format suffixes
 
 REST framework can take `?format=json` style URL parameters, which can be a
-useful shortcut for determing which content type should be returned from
+useful shortcut for determining which content type should be returned from
 the view.
 
 This is a more concise than using the `accept` override, but it also gives
diff --git a/docs/topics/contributing.md b/docs/topics/contributing.md
index 1d1fe8920..fd60daea9 100644
--- a/docs/topics/contributing.md
+++ b/docs/topics/contributing.md
@@ -22,9 +22,9 @@ It's really helpful if you make sure you address issues to the correct channel.
 
 Some tips on good issue reporting:
 
-* When decribing issues try to phrase your ticket in terms of the *behavior* you think needs changing rather than the *code* you think need changing.
+* When describing issues try to phrase your ticket in terms of the *behavior* you think needs changing rather than the *code* you think need changing.
 * Search the issue list first for related items, and make sure you're running the latest version of REST framework before reporting an issue.
-* If reporting a bug, then try to include a pull request with a failing test case.  This'll help us quickly identify if there is a valid issue, and make sure that it gets fixed more quickly if there is one. 
+* If reporting a bug, then try to include a pull request with a failing test case. This will help us quickly identify if there is a valid issue, and make sure that it gets fixed more quickly if there is one.
 
 
 
diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index d3a95f1a9..16ac961d9 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -106,14 +106,14 @@ You can determine your currently installed version using `pip freeze`:
 **Date**: 17th April 2013
 
 * Loud failure when view does not return a `Response` or `HttpResponse`.
-* Bugfix: Fix for Django 1.3 compatiblity.
+* Bugfix: Fix for Django 1.3 compatibility.
 * Bugfix: Allow overridden `get_object()` to work correctly.
 
 ### 2.2.6
 
 **Date**: 4th April 2013
 
-* OAuth2 authentication no longer requires unneccessary URL parameters in addition to the token.
+* OAuth2 authentication no longer requires unnecessary URL parameters in addition to the token.
 * URL hyperlinking in browsable API now handles more cases correctly.
 * Long HTTP headers in browsable API are broken in multiple lines when possible.
 * Bugfix: Fix regression with DjangoFilterBackend not worthing correctly with single object views.
diff --git a/docs/topics/rest-framework-2-announcement.md b/docs/topics/rest-framework-2-announcement.md
index 309548d00..c527937fe 100644
--- a/docs/topics/rest-framework-2-announcement.md
+++ b/docs/topics/rest-framework-2-announcement.md
@@ -60,7 +60,7 @@ REST framework 2 also allows you to work with both function-based and class-base
 
 ## API Design
 
-Pretty much every aspect of REST framework has been reworked, with the aim of ironing out some of the design flaws of the previous versions.  Each of the components of REST framework are cleanly decoupled, and can be used independantly of each-other, and there are no monolithic resource classes, overcomplicated mixin combinations, or opinionated serialization or URL routing decisions.
+Pretty much every aspect of REST framework has been reworked, with the aim of ironing out some of the design flaws of the previous versions.  Each of the components of REST framework are cleanly decoupled, and can be used independently of each-other, and there are no monolithic resource classes, overcomplicated mixin combinations, or opinionated serialization or URL routing decisions.
 
 ## The Browsable API
 
@@ -70,7 +70,7 @@ Browsable Web APIs are easier to work with, visualize and debug, and generally m
 
 With REST framework 2, the browsable API gets a snazzy new bootstrap-based theme that looks great and is even nicer to work with.
 
-There are also some functionality improvments - actions such as as `POST` and `DELETE` will only display if the user has the appropriate permissions.
+There are also some functionality improvements - actions such as as `POST` and `DELETE` will only display if the user has the appropriate permissions.
 
 ![Browsable API][image]
 
diff --git a/docs/tutorial/4-authentication-and-permissions.md b/docs/tutorial/4-authentication-and-permissions.md
index f6c3efb03..1c127fac5 100644
--- a/docs/tutorial/4-authentication-and-permissions.md
+++ b/docs/tutorial/4-authentication-and-permissions.md
@@ -17,7 +17,7 @@ Add the following two fields to the model.
     owner = models.ForeignKey('auth.User', related_name='snippets')
     highlighted = models.TextField()
 
-We'd also need to make sure that when the model is saved, that we populate the highlighted field, using the `pygments` code higlighting library.
+We'd also need to make sure that when the model is saved, that we populate the highlighted field, using the `pygments` code highlighting library.
 
 We'll need some extra imports:
 
@@ -137,7 +137,7 @@ And, at the end of the file, add a pattern to include the login and logout views
 
 The `r'^api-auth/'` part of pattern can actually be whatever URL you want to use.  The only restriction is that the included urls must use the `'rest_framework'` namespace.
 
-Now if you open up the browser again and refresh the page you'll see a 'Login' link in the top right of the page.  If you log in as one of the users you created earier, you'll be able to create code snippets again.
+Now if you open up the browser again and refresh the page you'll see a 'Login' link in the top right of the page.  If you log in as one of the users you created earlier, you'll be able to create code snippets again.
 
 Once you've created a few code snippets, navigate to the '/users/' endpoint, and notice that the representation includes a list of the snippet pks that are associated with each user, in each user's 'snippets' field.
 
diff --git a/docs/tutorial/quickstart.md b/docs/tutorial/quickstart.md
index c41cb63fb..a80e31c0c 100644
--- a/docs/tutorial/quickstart.md
+++ b/docs/tutorial/quickstart.md
@@ -10,7 +10,7 @@ Create a new Django project named `tutorial`, then start a new app called `quick
     django-admin.py startproject tutorial
     cd tutorial
 
-    # Create a virtualenv to isolate our package dependancies locally
+    # Create a virtualenv to isolate our package dependencies locally
     virtualenv env
     source env/bin/activate
 
@@ -36,7 +36,7 @@ Next you'll need to get a database set up and synced.  If you just want to use S
 
 The run `syncdb` like so:
 
-    python manange.py syncdb
+    python manage.py syncdb
 
 Once you've set up a database and got everything synced and ready to go, open up the app's directory and we'll get coding...
 
diff --git a/rest_framework/decorators.py b/rest_framework/decorators.py
index 81e585e1c..25bbbb17c 100644
--- a/rest_framework/decorators.py
+++ b/rest_framework/decorators.py
@@ -1,5 +1,5 @@
 """
-The most imporant decorator in this module is `@api_view`, which is used
+The most important decorator in this module is `@api_view`, which is used
 for writing function-based views with REST framework.
 
 There are also various decorators for setting the API policies on function
@@ -40,7 +40,7 @@ def api_view(http_method_names):
 
         # api_view applied with eg. string instead of list of strings
         assert isinstance(http_method_names, (list, tuple)), \
-            '@api_view expected a list of strings, recieved %s' % type(http_method_names).__name__
+            '@api_view expected a list of strings, received %s' % type(http_method_names).__name__
 
         allowed_methods = set(http_method_names) | set(('options',))
         WrappedAPIView.http_method_names = [method.lower() for method in allowed_methods]
diff --git a/rest_framework/response.py b/rest_framework/response.py
index 110ccb133..3ee52ae01 100644
--- a/rest_framework/response.py
+++ b/rest_framework/response.py
@@ -1,5 +1,5 @@
 """
-The Response class in REST framework is similiar to HTTPResponse, except that
+The Response class in REST framework is similar to HTTPResponse, except that
 it is initialized with unrendered data, instead of a pre-rendered string.
 
 The appropriate renderer is called during Django's template response rendering.
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 5be07fb79..3e5c366ec 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -25,7 +25,7 @@ from rest_framework.compat import get_concrete_model, six
 #
 #     example_field = serializers.CharField(...)
 #
-# This helps keep the seperation between model fields, form fields, and
+# This helps keep the separation between model fields, form fields, and
 # serializer fields more explicit.
 
 from rest_framework.relations import *
@@ -58,7 +58,7 @@ class DictWithMetadata(dict):
     def __getstate__(self):
         """
         Used by pickle (e.g., caching).
-        Overriden to remove the metadata from the dict, since it shouldn't be
+        Overridden to remove the metadata from the dict, since it shouldn't be
         pickled and may in some instances be unpickleable.
         """
         return dict(self)
diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py
index c86b64568..e9c1cdd54 100644
--- a/rest_framework/templatetags/rest_framework.py
+++ b/rest_framework/templatetags/rest_framework.py
@@ -15,7 +15,7 @@ register = template.Library()
 
 # When 1.3 becomes unsupported by REST framework, we can instead start to
 # use the {% load staticfiles %} tag, remove the following code,
-# and add a dependancy that `django.contrib.staticfiles` must be installed.
+# and add a dependency that `django.contrib.staticfiles` must be installed.
 
 # Note: We can't put this into the `compat` module because the compat import
 # from rest_framework.compat import ...

From d7bf02e09ea85778c0a3fad572ad33d637c0602f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20Gro=C3=9F?= <stephan@minddust.com>
Date: Tue, 28 May 2013 16:43:08 +0200
Subject: [PATCH 164/197] Add @pborreli for #897

---
 docs/topics/credits.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index 4b39d4529..1271fe45d 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -136,6 +136,7 @@ The following people have helped make REST framework great.
 * Andrew Tarzwell - [atarzwell]
 * Michal Dvořák - [mikee2185]
 * Markus Törnqvist - [mjtorn]
+* Pascal Borreli - [pborreli]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -308,3 +309,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [atarzwell]: https://github.com/atarzwell
 [mikee2185]: https://github.com/mikee2185
 [mjtorn]: https://github.com/mjtorn
+[pborreli]: https://github.com/pborreli

From 7a570e16e97a42d58855b5c06ea7b4d2cc0745e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20Gro=C3=9F?= <stephan@minddust.com>
Date: Tue, 28 May 2013 17:13:12 +0200
Subject: [PATCH 165/197] Fix md formatting and typos

---
 docs/api-guide/authentication.md              | 16 +++++++-------
 docs/api-guide/fields.md                      | 20 ++++++++---------
 docs/api-guide/filtering.md                   |  2 +-
 docs/api-guide/format-suffixes.md             |  4 ++--
 docs/api-guide/permissions.md                 |  4 ++--
 docs/api-guide/relations.md                   |  4 ++--
 docs/api-guide/renderers.md                   |  6 ++---
 docs/api-guide/responses.md                   |  2 +-
 docs/api-guide/routers.md                     |  2 +-
 docs/api-guide/serializers.md                 | 14 ++++++------
 docs/api-guide/status-codes.md                |  6 ++---
 docs/api-guide/views.md                       |  6 ++---
 docs/index.md                                 |  2 +-
 docs/topics/2.3-announcement.md               |  6 ++---
 docs/topics/ajax-csrf-cors.md                 |  2 +-
 docs/topics/browsable-api.md                  | 22 +++++++++----------
 docs/topics/browser-enhancements.md           |  2 +-
 docs/topics/contributing.md                   |  5 +++--
 docs/topics/release-notes.md                  |  2 +-
 docs/topics/rest-framework-2-announcement.md  |  6 ++---
 docs/topics/rest-hypermedia-hateoas.md        |  2 +-
 docs/tutorial/1-serialization.md              |  8 +++----
 docs/tutorial/2-requests-and-responses.md     |  4 ++--
 docs/tutorial/3-class-based-views.md          |  2 +-
 .../4-authentication-and-permissions.md       |  4 ++--
 .../5-relationships-and-hyperlinked-apis.md   |  2 +-
 26 files changed, 78 insertions(+), 77 deletions(-)

diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md
index c2f739018..6888ac4e8 100755
--- a/docs/api-guide/authentication.md
+++ b/docs/api-guide/authentication.md
@@ -86,7 +86,7 @@ Note that when a request may successfully authenticate, but still be denied perm
 
 Note that if deploying to [Apache using mod_wsgi][mod_wsgi_official], the authorization header is not passed through to a WSGI application by default, as it is assumed that authentication will be handled by Apache, rather than at an application level.
 
-If you are deploying to Apache, and using any non-session based authentication, you will need to explicitly configure mod_wsgi to pass the required headers through to the application. This can be done by specifying the `WSGIPassAuthorization` directive in the appropriate context and setting it to `'On'`.
+If you are deploying to Apache, and using any non-session based authentication, you will need to explicitly configure mod_wsgi to pass the required headers through to the application.  This can be done by specifying the `WSGIPassAuthorization` directive in the appropriate context and setting it to `'On'`.
 
     # this can go in either server config, virtual host, directory or .htaccess 
     WSGIPassAuthorization On
@@ -216,9 +216,9 @@ If you're using an AJAX style API with SessionAuthentication, you'll need to mak
 
 ## OAuthAuthentication
 
-This authentication uses [OAuth 1.0a][oauth-1.0a] authentication scheme. OAuth 1.0a provides signature validation which provides a reasonable level of security over plain non-HTTPS connections.  However, it may also be considered more complicated than OAuth2, as it requires clients to sign their requests.
+This authentication uses [OAuth 1.0a][oauth-1.0a] authentication scheme.  OAuth 1.0a provides signature validation which provides a reasonable level of security over plain non-HTTPS connections.  However, it may also be considered more complicated than OAuth2, as it requires clients to sign their requests.
 
-This authentication class depends on the optional `django-oauth-plus` and `oauth2` packages. In order to make it work you must install these packages and add `oauth_provider` to your `INSTALLED_APPS`:
+This authentication class depends on the optional `django-oauth-plus` and `oauth2` packages.  In order to make it work you must install these packages and add `oauth_provider` to your `INSTALLED_APPS`:
 
     INSTALLED_APPS = (
         ...
@@ -231,7 +231,7 @@ Don't forget to run `syncdb` once you've added the package.
 
 #### Getting started with django-oauth-plus
 
-The OAuthAuthentication class only provides token verification and signature validation for requests. It doesn't provide authorization flow for your clients. You still need to implement your own views for accessing and authorizing tokens.
+The OAuthAuthentication class only provides token verification and signature validation for requests.  It doesn't provide authorization flow for your clients.  You still need to implement your own views for accessing and authorizing tokens.
 
 The `django-oauth-plus` package provides simple foundation for classic 'three-legged' oauth flow.  Please refer to [the documentation][django-oauth-plus] for more details.
 
@@ -239,7 +239,7 @@ The `django-oauth-plus` package provides simple foundation for classic 'three-le
 
 This authentication uses [OAuth 2.0][rfc6749] authentication scheme.  OAuth2 is more simple to work with than OAuth1, and provides much better security than simple token authentication.  It is an unauthenticated scheme, and requires you to use an HTTPS connection.
 
-This authentication class depends on the optional [django-oauth2-provider][django-oauth2-provider] project. In order to make it work you must install this package and add `provider` and `provider.oauth2` to your `INSTALLED_APPS`:
+This authentication class depends on the optional [django-oauth2-provider][django-oauth2-provider] project.  In order to make it work you must install this package and add `provider` and `provider.oauth2` to your `INSTALLED_APPS`:
 
     INSTALLED_APPS = (
         ...
@@ -266,9 +266,9 @@ Finally, sync your database.
 
 #### Getting started with django-oauth2-provider
 
-The `OAuth2Authentication` class only provides token verification for requests. It doesn't provide authorization flow for your clients.
+The `OAuth2Authentication` class only provides token verification for requests.  It doesn't provide authorization flow for your clients.
 
-The OAuth 2 authorization flow is taken care by the [django-oauth2-provider][django-oauth2-provider] dependency. A walkthrough is given here, but for more details you should refer to [the documentation][django-oauth2-provider-docs]. 
+The OAuth 2 authorization flow is taken care by the [django-oauth2-provider][django-oauth2-provider] dependency.  A walkthrough is given here, but for more details you should refer to [the documentation][django-oauth2-provider-docs].
 
 To get started:
 
@@ -276,7 +276,7 @@ To get started:
 
 You can create a client, either through the shell, or by using the Django admin.
 
-Go to the admin panel and create a new `Provider.Client` entry. It will create the `client_id` and `client_secret` properties for you.
+Go to the admin panel and create a new `Provider.Client` entry.  It will create the `client_id` and `client_secret` properties for you.
 
 ##### 2. Request an access token
 
diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md
index 92d2066d0..9820cb403 100644
--- a/docs/api-guide/fields.md
+++ b/docs/api-guide/fields.md
@@ -16,7 +16,7 @@ Serializer fields handle converting between primitive values and internal dataty
 
 ## Core arguments
 
-Each serializer field class constructor takes at least these arguments. Some Field classes take additional, field-specific arguments, but the following should always be accepted:
+Each serializer field class constructor takes at least these arguments.  Some Field classes take additional, field-specific arguments, but the following should always be accepted:
 
 ### `source`
 
@@ -119,7 +119,7 @@ A generic field that can be tied to any arbitrary model field.  The `ModelField`
 
 ## SerializerMethodField
 
-This is a read-only field. It gets its value by calling a method on the serializer class it is attached to. It can be used to add any sort of data to the serialized representation of your object. The field's constructor accepts a single argument, which is the name of the method on the serializer to be called. The method should accept a single argument (in addition to `self`), which is the object being serialized. It should return whatever you want to be included in the serialized representation of the object. For example:
+This is a read-only field.  It gets its value by calling a method on the serializer class it is attached to.  It can be used to add any sort of data to the serialized representation of your object.  The field's constructor accepts a single argument, which is the name of the method on the serializer to be called.  The method should accept a single argument (in addition to `self`), which is the object being serialized.  It should return whatever you want to be included in the serialized representation of the object.  For example:
 
     from rest_framework import serializers
     from django.contrib.auth.models import User
@@ -158,7 +158,7 @@ or `django.db.models.fields.TextField`.
 
 ## URLField
 
-Corresponds to `django.db.models.fields.URLField`. Uses Django's `django.core.validators.URLValidator` for validation.
+Corresponds to `django.db.models.fields.URLField`.  Uses Django's `django.core.validators.URLValidator` for validation.
 
 **Signature:** `CharField(max_length=200, min_length=None)`
 
@@ -211,9 +211,9 @@ In the case of JSON this means the default datetime representation uses the [ECM
 **Signature:** `DateTimeField(format=None, input_formats=None)`
 
 * `format` - A string representing the output format.  If not specified, this defaults to `None`, which indicates that python `datetime` objects should be returned by `to_native`.  In this case the datetime encoding will be determined by the renderer. 
-* `input_formats` - A list of strings representing the input formats which may be used to parse the date. If not specified, the `DATETIME_INPUT_FORMATS` setting will be used, which defaults to `['iso-8601']`.
+* `input_formats` - A list of strings representing the input formats which may be used to parse the date.  If not specified, the `DATETIME_INPUT_FORMATS` setting will be used, which defaults to `['iso-8601']`.
 
-DateTime format strings may either be [python strftime formats][strftime] which explicitly specifiy the format, or the special string `'iso-8601'`, which indicates that [ISO 8601][iso8601] style datetimes should be used. (eg `'2013-01-29T12:34:56.000000Z'`)
+DateTime format strings may either be [python strftime formats][strftime] which explicitly specify the format, or the special string `'iso-8601'`, which indicates that [ISO 8601][iso8601] style datetimes should be used. (eg `'2013-01-29T12:34:56.000000Z'`)
 
 ## DateField
 
@@ -224,7 +224,7 @@ Corresponds to `django.db.models.fields.DateField`
 **Signature:** `DateField(format=None, input_formats=None)`
 
 * `format` - A string representing the output format.  If not specified, this defaults to `None`, which indicates that python `date` objects should be returned by `to_native`.  In this case the date encoding will be determined by the renderer.
-* `input_formats` - A list of strings representing the input formats which may be used to parse the date. If not specified, the `DATE_INPUT_FORMATS` setting will be used, which defaults to `['iso-8601']`. 
+* `input_formats` - A list of strings representing the input formats which may be used to parse the date.  If not specified, the `DATE_INPUT_FORMATS` setting will be used, which defaults to `['iso-8601']`.
 
 Date format strings may either be [python strftime formats][strftime] which explicitly specify the format, or the special string `'iso-8601'`, which indicates that [ISO 8601][iso8601] style dates should be used. (eg `'2013-01-29'`)
 
@@ -239,9 +239,9 @@ Corresponds to `django.db.models.fields.TimeField`
 **Signature:** `TimeField(format=None, input_formats=None)`
 
 * `format` - A string representing the output format.  If not specified, this defaults to `None`, which indicates that python `time` objects should be returned by `to_native`.  In this case the time encoding will be determined by the renderer.
-* `input_formats` - A list of strings representing the input formats which may be used to parse the date. If not specified, the `TIME_INPUT_FORMATS` setting will be used, which defaults to `['iso-8601']`.
+* `input_formats` - A list of strings representing the input formats which may be used to parse the date.  If not specified, the `TIME_INPUT_FORMATS` setting will be used, which defaults to `['iso-8601']`.
 
-Time format strings may either be [python strftime formats][strftime] which explicitly specifiy the format, or the special string `'iso-8601'`, which indicates that [ISO 8601][iso8601] style times should be used. (eg `'12:34:56.000000'`)
+Time format strings may either be [python strftime formats][strftime] which explicitly specify the format, or the special string `'iso-8601'`, which indicates that [ISO 8601][iso8601] style times should be used. (eg `'12:34:56.000000'`)
 
 ## IntegerField
 
@@ -263,7 +263,7 @@ Corresponds to `django.db.models.fields.DecimalField`.
 
 ## FileField
 
-A file representation. Performs Django's standard FileField validation. 
+A file representation.  Performs Django's standard FileField validation.
 
 Corresponds to `django.forms.fields.FileField`.
 
@@ -292,7 +292,7 @@ Django's regular [FILE_UPLOAD_HANDLERS] are used for handling uploaded files.
 
 # Custom fields
 
-If you want to create a custom field, you'll probably want to override either one or both of the `.to_native()` and `.from_native()` methods.  These two methods are used to convert between the intial datatype, and a primative, serializable datatype.  Primative datatypes may be any of a number, string, date/time/datetime or None.  They may also be any list or dictionary like object that only contains other primative objects.
+If you want to create a custom field, you'll probably want to override either one or both of the `.to_native()` and `.from_native()` methods.  These two methods are used to convert between the initial datatype, and a primative, serializable datatype.  Primative datatypes may be any of a number, string, date/time/datetime or None.  They may also be any list or dictionary like object that only contains other primative objects.
 
 The `.to_native()` method is called to convert the initial datatype into a primative, serializable datatype.  The `from_native()` method is called to restore a primative datatype into it's initial representation.
 
diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md
index dd4cf8d76..4242f40dd 100644
--- a/docs/api-guide/filtering.md
+++ b/docs/api-guide/filtering.md
@@ -2,7 +2,7 @@
 
 # Filtering
 
-> The root QuerySet provided by the Manager describes all objects in the database table. Usually, though, you'll need to select only a subset of the complete set of objects.
+> The root QuerySet provided by the Manager describes all objects in the database table.  Usually, though, you'll need to select only a subset of the complete set of objects.
 >
 > &mdash; [Django documentation][cite]
 
diff --git a/docs/api-guide/format-suffixes.md b/docs/api-guide/format-suffixes.md
index dae3dea37..529738e3b 100644
--- a/docs/api-guide/format-suffixes.md
+++ b/docs/api-guide/format-suffixes.md
@@ -58,11 +58,11 @@ Also note that `format_suffix_patterns` does not support descending into `includ
         
 ## Accept headers vs. format suffixes
 
-There seems to be a view among some of the Web community that filename extensions are not a RESTful pattern, and that `HTTP Accept` headers should always be used instead.  
+There seems to be a view among some of the Web community that filename extensions are not a RESTful pattern, and that `HTTP Accept` headers should always be used instead.
 
 It is actually a misconception.  For example, take the following quote from Roy Fielding discussing the relative merits of query parameter media-type indicators vs. file extension media-type indicators: 
 
-&ldquo;That's why I always prefer extensions. Neither choice has anything to do with REST.&rdquo; &mdash; Roy Fielding, [REST discuss mailing list][cite2]
+&ldquo;That's why I always prefer extensions.  Neither choice has anything to do with REST.&rdquo; &mdash; Roy Fielding, [REST discuss mailing list][cite2]
 
 The quote does not mention Accept headers, but it does make it clear that format suffixes should be considered an acceptable pattern.
 
diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md
index db0d4b26a..2c0a055c8 100644
--- a/docs/api-guide/permissions.md
+++ b/docs/api-guide/permissions.md
@@ -2,7 +2,7 @@
 
 # Permissions
 
-> Authentication or identification by itself is not usually sufficient to gain access to information or code. For that, the entity requesting access must have authorization.
+> Authentication or identification by itself is not usually sufficient to gain access to information or code.  For that, the entity requesting access must have authorization.
 >
 > &mdash; [Apple Developer Documentation][cite]
 
@@ -147,7 +147,7 @@ If you need to test if a request is a read operation or a write operation, you s
 
 **Note**: In versions 2.0 and 2.1, the signature for the permission checks always included an optional `obj` parameter, like so: `.has_permission(self, request, view, obj=None)`.  The method would be called twice, first for the global permission checks, with no object supplied, and second for the object-level check when required.
 
-As of version 2.2 this signature has now been replaced with two seperate method calls, which is more explict and obvious.  The old style signature continues to work, but it's use will result in a `PendingDeprecationWarning`, which is silent by default.  In 2.3 this will be escalated to a `DeprecationWarning`, and in 2.4 the old-style signature will be removed.
+As of version 2.2 this signature has now been replaced with two separate method calls, which is more explict and obvious.  The old style signature continues to work, but it's use will result in a `PendingDeprecationWarning`, which is silent by default.  In 2.3 this will be escalated to a `DeprecationWarning`, and in 2.4 the old-style signature will be removed.
 
 For more details see the [2.2 release announcement][2.2-announcement].
 
diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md
index af0687b94..50c9bc546 100644
--- a/docs/api-guide/relations.md
+++ b/docs/api-guide/relations.md
@@ -138,7 +138,7 @@ By default this field is read-write, although you can change this behavior using
 * `many` - If applied to a to-many relationship, you should set this argument to `True`.
 * `required` - If set to `False`, the field will accept values of `None` or the empty-string for nullable relationships.
 * `queryset` - By default `ModelSerializer` classes will use the default queryset for the relationship.  `Serializer` classes must either set a queryset explicitly, or set `read_only=True`.
-* `lookup_field` - The field on the target that should be used for the lookup.  Should correspond to a URL keyword argument on the referenced view. Default is `'pk'`.
+* `lookup_field` - The field on the target that should be used for the lookup.  Should correspond to a URL keyword argument on the referenced view.  Default is `'pk'`.
 * `format` - If using format suffixes, hyperlinked fields will use the same format suffix for the target unless overridden by using the `format` argument.
 
 ## SlugRelatedField
@@ -202,7 +202,7 @@ This field is always read-only.
 **Arguments**:
 
 * `view_name` - The view name that should be used as the target of the relationship.  **required**.
-* `lookup_field` - The field on the target that should be used for the lookup.  Should correspond to a URL keyword argument on the referenced view. Default is `'pk'`.
+* `lookup_field` - The field on the target that should be used for the lookup.  Should correspond to a URL keyword argument on the referenced view.  Default is `'pk'`.
 * `format` - If using format suffixes, hyperlinked fields will use the same format suffix for the target unless overridden by using the `format` argument.
 
 ---
diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md
index 7e78318b6..b627c9306 100644
--- a/docs/api-guide/renderers.md
+++ b/docs/api-guide/renderers.md
@@ -233,13 +233,13 @@ The request data, as set by the `Response()` instantiation.
 
 ### `media_type=None`
 
-Optional. If provided, this is the accepted media type, as determined by the content negotiation stage.
+Optional.  If provided, this is the accepted media type, as determined by the content negotiation stage.
 
 Depending on the client's `Accept:` header, this may be more specific than the renderer's `media_type` attribute, and may include media type parameters.  For example `"application/json; nested=true"`.
 
 ### `renderer_context=None`
 
-Optional. If provided, this is a dictionary of contextual information provided by the view.
+Optional.  If provided, this is a dictionary of contextual information provided by the view.
 
 By default this will include the following keys: `view`, `request`, `response`, `args`, `kwargs`.
 
@@ -325,7 +325,7 @@ For example:
 In some cases you might want a renderer to serve a range of media types.
 In this case you can underspecify the media types it should respond to, by using a `media_type` value such as `image/*`, or `*/*`.
 
-If you underspecify the renderer's media type, you should make sure to specify the media type explictly when you return the response, using the `content_type` attribute.  For example:
+If you underspecify the renderer's media type, you should make sure to specify the media type explicitly when you return the response, using the `content_type` attribute.  For example:
 
     return Response(data, content_type='image/png')
 
diff --git a/docs/api-guide/responses.md b/docs/api-guide/responses.md
index 59632ad51..374276dc2 100644
--- a/docs/api-guide/responses.md
+++ b/docs/api-guide/responses.md
@@ -2,7 +2,7 @@
 
 # Responses
 
-> Unlike basic HttpResponse objects, TemplateResponse objects retain the details of the context that was provided by the view to compute the response. The final output of the response is not computed until it is needed, later in the response process.
+> Unlike basic HttpResponse objects, TemplateResponse objects retain the details of the context that was provided by the view to compute the response.  The final output of the response is not computed until it is needed, later in the response process.
 >
 > &mdash; [Django documentation][cite]
 
diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md
index fd3a15d51..3c3a6ae3f 100644
--- a/docs/api-guide/routers.md
+++ b/docs/api-guide/routers.md
@@ -2,7 +2,7 @@
 
 # Routers
 
-> Resource routing allows you to quickly declare all of the common routes for a given resourceful controller. Instead of declaring separate routes for your index... a resourceful route declares them in a single line of code.
+> Resource routing allows you to quickly declare all of the common routes for a given resourceful controller.  Instead of declaring separate routes for your index... a resourceful route declares them in a single line of code.
 >
 > &mdash; [Ruby on Rails Documentation][cite]
 
diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md
index 053a5eaf0..71f0abb73 100644
--- a/docs/api-guide/serializers.md
+++ b/docs/api-guide/serializers.md
@@ -3,7 +3,7 @@
 # Serializers
 
 > Expanding the usefulness of the serializers is something that we would
-like to address. However, it's not a trivial problem, and it
+like to address.  However, it's not a trivial problem, and it
 will take some serious design work.
 >
 > &mdash; Russell Keith-Magee, [Django users group][cite]
@@ -104,11 +104,11 @@ When deserializing a list of items, errors will be returned as a list of diction
 
 #### Field-level validation
 
-You can specify custom field-level validation by adding `.validate_<fieldname>` methods to your `Serializer` subclass. These are analogous to `.clean_<fieldname>` methods on Django forms, but accept slightly different arguments.
+You can specify custom field-level validation by adding `.validate_<fieldname>` methods to your `Serializer` subclass.  These are analogous to `.clean_<fieldname>` methods on Django forms, but accept slightly different arguments.
 
 They take a dictionary of deserialized attributes as a first argument, and the field name in that dictionary as a second argument (which will be either the name of the field or the value of the `source` argument to the field, if one was provided).
 
-Your `validate_<fieldname>` methods should either just return the `attrs` dictionary or raise a `ValidationError`. For example:
+Your `validate_<fieldname>` methods should either just return the `attrs` dictionary or raise a `ValidationError`.  For example:
 
     from rest_framework import serializers
 
@@ -127,7 +127,7 @@ Your `validate_<fieldname>` methods should either just return the `attrs` dictio
 
 #### Object-level validation
 
-To do any other validation that requires access to multiple fields, add a method called `.validate()` to your `Serializer` subclass. This method takes a single argument, which is the `attrs` dictionary. It should raise a `ValidationError` if necessary, or just return `attrs`.  For example:
+To do any other validation that requires access to multiple fields, add a method called `.validate()` to your `Serializer` subclass.  This method takes a single argument, which is the `attrs` dictionary.  It should raise a `ValidationError` if necessary, or just return `attrs`.  For example:
 
     from rest_framework import serializers
 
@@ -285,7 +285,7 @@ To map the incoming data items to their corresponding object instances, the `.ge
 
 There are some cases where you need to provide extra context to the serializer in addition to the object being serialized.  One common case is if you're using a serializer that includes hyperlinked relations, which requires the serializer to have access to the current request so that it can properly generate fully qualified URLs.
 
-You can provide arbitrary additional context by passing a `context` argument when instantiating the serializer. For example:
+You can provide arbitrary additional context by passing a `context` argument when instantiating the serializer.  For example:
 
     serializer = AccountSerializer(account, context={'request': request})
     serializer.data
@@ -333,7 +333,7 @@ The `depth` option should be set to an integer value that indicates the depth of
 
 ## Specifying which fields should be read-only 
 
-You may wish to specify multiple fields as read-only. Instead of adding each field explicitly with the `read_only=True` attribute, you may use the `read_only_fields` Meta option, like so:
+You may wish to specify multiple fields as read-only.  Instead of adding each field explicitly with the `read_only=True` attribute, you may use the `read_only_fields` Meta option, like so:
 
     class AccountSerializer(serializers.ModelSerializer):
         class Meta:
@@ -425,7 +425,7 @@ Doing so should be considered advanced usage, and will only be needed if you hav
 
 The `field_mapping` attribute is a dictionary that maps model classes to serializer classes.  Overriding the attribute will let you set a different set of default serializer classes. 
 
-For more advanced customization than simply changing the default serializer class you can override various `get_<field_type>_field` methods.  Doing so will allow you to customize the arguments that each serializer field is initialized with. Each of these methods may either return a field or serializer instance, or `None`.
+For more advanced customization than simply changing the default serializer class you can override various `get_<field_type>_field` methods.  Doing so will allow you to customize the arguments that each serializer field is initialized with.  Each of these methods may either return a field or serializer instance, or `None`.
 
 ### get_pk_field
 
diff --git a/docs/api-guide/status-codes.md b/docs/api-guide/status-codes.md
index b50c96ae3..db2e059c3 100644
--- a/docs/api-guide/status-codes.md
+++ b/docs/api-guide/status-codes.md
@@ -2,7 +2,7 @@
 
 # Status Codes
 
-> 418 I'm a teapot - Any attempt to brew coffee with a teapot should result in the error code "418 I'm a teapot". The resulting entity body MAY be short and stout.
+> 418 I'm a teapot - Any attempt to brew coffee with a teapot should result in the error code "418 I'm a teapot".  The resulting entity body MAY be short and stout.
 >
 > &mdash; [RFC 2324][rfc2324], Hyper Text Coffee Pot Control Protocol
 
@@ -53,7 +53,7 @@ This class of status code indicates that further action needs to be taken by the
 
 ## Client Error - 4xx
 
-The 4xx class of status code is intended for cases in which the client seems to have erred. Except when responding to a HEAD request, the server SHOULD include an entity containing an explanation of the error situation, and whether it is a temporary or permanent condition.
+The 4xx class of status code is intended for cases in which the client seems to have erred.  Except when responding to a HEAD request, the server SHOULD include an entity containing an explanation of the error situation, and whether it is a temporary or permanent condition.
 
     HTTP_400_BAD_REQUEST
     HTTP_401_UNAUTHORIZED
@@ -79,7 +79,7 @@ The 4xx class of status code is intended for cases in which the client seems to
 
 ## Server Error - 5xx
 
-Response status codes beginning with the digit "5" indicate cases in which the server is aware that it has erred or is incapable of performing the request. Except when responding to a HEAD request, the server SHOULD include an entity containing an explanation of the error situation, and whether it is a temporary or permanent condition.
+Response status codes beginning with the digit "5" indicate cases in which the server is aware that it has erred or is incapable of performing the request.  Except when responding to a HEAD request, the server SHOULD include an entity containing an explanation of the error situation, and whether it is a temporary or permanent condition.
 
     HTTP_500_INTERNAL_SERVER_ERROR
     HTTP_501_NOT_IMPLEMENTED
diff --git a/docs/api-guide/views.md b/docs/api-guide/views.md
index 8b26b3e35..37ebd55f5 100644
--- a/docs/api-guide/views.md
+++ b/docs/api-guide/views.md
@@ -122,13 +122,13 @@ You won't typically need to override this method.
 >
 > &mdash; [Nick Coghlan][cite2]
 
-REST framework also allows you to work with regular function based views. It provides a set of simple decorators that wrap your function based views to ensure they receive an instance of `Request` (rather than the usual Django `HttpRequest`) and allows them to return a `Response` (instead of a Django `HttpResponse`), and allow you to configure how the request is processed.
+REST framework also allows you to work with regular function based views.  It provides a set of simple decorators that wrap your function based views to ensure they receive an instance of `Request` (rather than the usual Django `HttpRequest`) and allows them to return a `Response` (instead of a Django `HttpResponse`), and allow you to configure how the request is processed.
 
 ## @api_view()
 
 **Signature:** `@api_view(http_method_names)`
 
-The core of this functionality is the `api_view` decorator, which takes a list of HTTP methods that your view should respond to. For example, this is how you would write a very simple view that just manually returns some data:
+The core of this functionality is the `api_view` decorator, which takes a list of HTTP methods that your view should respond to.  For example, this is how you would write a very simple view that just manually returns some data:
 
     from rest_framework.decorators import api_view
 
@@ -141,7 +141,7 @@ This view will use the default renderers, parsers, authentication classes etc sp
 
 ## API policy decorators
 
-To override the default settings, REST framework provides a set of additional decorators which can be added to your views. These must come *after* (below) the `@api_view` decorator. For example, to create a view that uses a [throttle](throttling) to ensure it can only be called once per day by a particular user, use the `@throttle_classes` decorator, passing a list of throttle classes:
+To override the default settings, REST framework provides a set of additional decorators which can be added to your views.  These must come *after* (below) the `@api_view` decorator.  For example, to create a view that uses a [throttle](throttling) to ensure it can only be called once per day by a particular user, use the `@throttle_classes` decorator, passing a list of throttle classes:
 
     from rest_framework.decorators import api_view, throttle_classes
     from rest_framework.throttling import UserRateThrottle
diff --git a/docs/index.md b/docs/index.md
index 222bb7399..78259a004 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -15,7 +15,7 @@ Django REST framework is a powerful and flexible toolkit that makes it easy to b
 
 Some reasons you might want to use REST framework:
 
-* The Web browseable API is a huge useability win for your developers.
+* The Web browseable API is a huge usability win for your developers.
 * Authentication policies including OAuth1a and OAuth2 out of the box.
 * Serialization that supports both ORM and non-ORM data sources.
 * Customizable all the way down - just use regular function-based views if you don't need the more powerful features.
diff --git a/docs/topics/2.3-announcement.md b/docs/topics/2.3-announcement.md
index d51037b78..9fdebcd90 100644
--- a/docs/topics/2.3-announcement.md
+++ b/docs/topics/2.3-announcement.md
@@ -45,7 +45,7 @@ The best place to get started with ViewSets and Routers is to take a look at the
 
 ## Simpler views
 
-This release rationalises the API and implementation of the generic views, dropping the dependancy on Django's `SingleObjectMixin` and `MultipleObjectMixin` classes, removing a number of unneeded attributes, and generally making the implementation more obvious and easy to work with.
+This release rationalises the API and implementation of the generic views, dropping the dependency on Django's `SingleObjectMixin` and `MultipleObjectMixin` classes, removing a number of unneeded attributes, and generally making the implementation more obvious and easy to work with.
 
 This improvement is reflected in improved documentation for the `GenericAPIView` base class, and should make it easier to determine how to override methods on the base class if you need to write customized subclasses.
 
@@ -108,7 +108,7 @@ Using the `SingleObjectAPIView` and `MultipleObjectAPIView` base classes continu
 
 ### Removed attributes
 
-The following attributes and methods, were previously present as part of Django's generic view implementations, but were unneeded and unusedand have now been entirely removed.
+The following attributes and methods, were previously present as part of Django's generic view implementations, but were unneeded and unused and have now been entirely removed.
 
 * context_object_name
 * get_context_data()
@@ -173,7 +173,7 @@ For example:
                 raise Http404
             return queryset
 
-In our opinion removing lesser-used attributes like `allow_empty` helps us move towards simpler generic view implementations, making them more obvious to use and override, and re-inforcing the preferred style of developers writing their own base classes and mixins for custom behavior rather than relying on the configurability of the generic views.
+In our opinion removing lesser-used attributes like `allow_empty` helps us move towards simpler generic view implementations, making them more obvious to use and override, and re-enforcing the preferred style of developers writing their own base classes and mixins for custom behavior rather than relying on the configurability of the generic views.
 
 ## Simpler URL lookups
 
diff --git a/docs/topics/ajax-csrf-cors.md b/docs/topics/ajax-csrf-cors.md
index f7d12940d..4566f38b0 100644
--- a/docs/topics/ajax-csrf-cors.md
+++ b/docs/topics/ajax-csrf-cors.md
@@ -1,6 +1,6 @@
 # Working with AJAX, CSRF & CORS
 
-> "Take a close look at possible CSRF / XSRF vulnerabilities on your own websites. They're the worst kind of vulnerability &mdash; very easy to exploit by attackers, yet not so intuitively easy to understand for software developers, at least until you've been bitten by one."
+> "Take a close look at possible CSRF / XSRF vulnerabilities on your own websites.  They're the worst kind of vulnerability &mdash; very easy to exploit by attackers, yet not so intuitively easy to understand for software developers, at least until you've been bitten by one."
 >
 >  &mdash; [Jeff Atwood][cite]
 
diff --git a/docs/topics/browsable-api.md b/docs/topics/browsable-api.md
index 65f76abcf..dcba9b0af 100644
--- a/docs/topics/browsable-api.md
+++ b/docs/topics/browsable-api.md
@@ -1,20 +1,20 @@
 # The Browsable API
 
-> It is a profoundly erroneous truism... that we should cultivate the habit of thinking of what we are doing. The precise opposite is the case. Civilization advances by extending the number of important operations which we can perform without thinking about them.
+> It is a profoundly erroneous truism... that we should cultivate the habit of thinking of what we are doing.  The precise opposite is the case.  Civilization advances by extending the number of important operations which we can perform without thinking about them.
 >
 > &mdash; [Alfred North Whitehead][cite], An Introduction to Mathematics (1911)
 
 
-API may stand for Application *Programming* Interface, but humans have to be able to read the APIs, too; someone has to do the programming. Django REST Framework supports generating human-friendly HTML output for each resource when the `HTML` format is requested. These pages allow for easy browsing of resources, as well as forms for submitting data to the resources using `POST`, `PUT`, and `DELETE`.
+API may stand for Application *Programming* Interface, but humans have to be able to read the APIs, too; someone has to do the programming.  Django REST Framework supports generating human-friendly HTML output for each resource when the `HTML` format is requested.  These pages allow for easy browsing of resources, as well as forms for submitting data to the resources using `POST`, `PUT`, and `DELETE`.
 
 ## URLs
 
-If you include fully-qualified URLs in your resource output, they will be 'urlized' and made clickable for easy browsing by humans. The `rest_framework` package includes a [`reverse`][drfreverse] helper for this purpose.
+If you include fully-qualified URLs in your resource output, they will be 'urlized' and made clickable for easy browsing by humans.  The `rest_framework` package includes a [`reverse`][drfreverse] helper for this purpose.
 
 
 ## Formats
 
-By default, the API will return the format specified by the headers, which in the case of the browser is HTML. The format can be specified using `?format=` in the request, so you can look at the raw JSON response in a browser by adding `?format=json` to the URL. There are helpful extensions for viewing JSON in [Firefox][ffjsonview] and [Chrome][chromejsonview].
+By default, the API will return the format specified by the headers, which in the case of the browser is HTML.  The format can be specified using `?format=` in the request, so you can look at the raw JSON response in a browser by adding `?format=json` to the URL.  There are helpful extensions for viewing JSON in [Firefox][ffjsonview] and [Chrome][chromejsonview].
 
 
 ## Customizing
@@ -25,15 +25,15 @@ The included browsable API template is built with [Bootstrap (2.1.1)][bootstrap]
 
 ### Theme
 
-To replace the theme wholesale, add a `bootstrap_theme` block to your `api.html` and insert a `link` to the desired Bootstrap theme css file. This will completely replace the included theme.
+To replace the theme wholesale, add a `bootstrap_theme` block to your `api.html` and insert a `link` to the desired Bootstrap theme css file.  This will completely replace the included theme.
 
     {% block bootstrap_theme %}
         <link rel="stylesheet" href="/path/to/my/bootstrap.css" type="text/css">
     {% endblock %}
 
-A suitable replacement theme can be generated using Bootstrap's [Customize Tool][bcustomize]. Also, there are pre-made themes available at [Bootswatch][bswatch]. To use any of the Bootswatch themes, simply download the theme's `bootstrap.min.css` file, add it to your project, and replace the default one as described above.
+A suitable replacement theme can be generated using Bootstrap's [Customize Tool][bcustomize].  Also, there are pre-made themes available at [Bootswatch][bswatch].  To use any of the Bootswatch themes, simply download the theme's `bootstrap.min.css` file, add it to your project, and replace the default one as described above.
 
-You can also change the navbar variant, which by default is `navbar-inverse`, using the `bootstrap_navbar_variant` block. The empty `{% block bootstrap_navbar_variant %}{% endblock %}` will use the original Bootstrap navbar style.
+You can also change the navbar variant, which by default is `navbar-inverse`, using the `bootstrap_navbar_variant` block.  The empty `{% block bootstrap_navbar_variant %}{% endblock %}` will use the original Bootstrap navbar style.
 
 Full Example
 
@@ -57,11 +57,11 @@ All of the blocks available in the browsable API base template that can be used
 * `bootstrap_theme`            - CSS for the Bootstrap theme
 * `bootstrap_navbar_variant`   - CSS class for the navbar
 * `branding`                   - section of the navbar, see [Bootstrap components][bcomponentsnav]
-* `breadcrumbs`                - Links showing resource nesting, allowing the user to go back up the resources. It's recommended to preserve these, but they can be overridden using the breadcrumbs block.
+* `breadcrumbs`                - Links showing resource nesting, allowing the user to go back up the resources.  It's recommended to preserve these, but they can be overridden using the breadcrumbs block.
 * `footer`                     - Any copyright notices or similar footer materials can go here (by default right-aligned)
 * `style`                      - CSS stylesheets for the page
 * `title`                      - title of the page
-* `userlinks`                  - This is a list of links on the right of the header, by default containing login/logout links. To add links instead of replace, use {{ block.super }} to preserve the authentication links.
+* `userlinks`                  - This is a list of links on the right of the header, by default containing login/logout links.  To add links instead of replace, use {{ block.super }} to preserve the authentication links.
 
 #### Components
 
@@ -69,7 +69,7 @@ All of the [Bootstrap components][bcomponents] are available.
 
 ##### Tooltips
 
-The browsable API makes use of the Bootstrap tooltips component. Any element with the `js-tooltip` class and a `title` attribute has that title content displayed in a tooltip on hover after a 1000ms delay.
+The browsable API makes use of the Bootstrap tooltips component.  Any element with the `js-tooltip` class and a `title` attribute has that title content displayed in a tooltip on hover after a 1000ms delay.
 
 ### Login Template
 
@@ -107,7 +107,7 @@ The context that's available to the template:
 
 #### Not using base.html
 
-For more advanced customization, such as not having a Bootstrap basis or tighter integration with the rest of your site, you can simply choose not to have `api.html` extend `base.html`. Then the page content and capabilities are entirely up to you.
+For more advanced customization, such as not having a Bootstrap basis or tighter integration with the rest of your site, you can simply choose not to have `api.html` extend `base.html`.  Then the page content and capabilities are entirely up to you.
 
 [cite]: http://en.wikiquote.org/wiki/Alfred_North_Whitehead
 [drfreverse]: ../api-guide/reverse.md
diff --git a/docs/topics/browser-enhancements.md b/docs/topics/browser-enhancements.md
index 31b94841f..5a1726201 100644
--- a/docs/topics/browser-enhancements.md
+++ b/docs/topics/browser-enhancements.md
@@ -21,7 +21,7 @@ For example, given the following form:
 
 ## HTTP header based method overriding
 
-REST framework also supports method overriding via the semi-standard `X-HTTP-Method-Override` header. This can be useful if you are working with non-form content such as JSON and are working with an older web server and/or hosting provider that doesn't recognise particular HTTP methods such as `PATCH`. For example [Amazon Web Services ELB][aws_elb].
+REST framework also supports method overriding via the semi-standard `X-HTTP-Method-Override` header.  This can be useful if you are working with non-form content such as JSON and are working with an older web server and/or hosting provider that doesn't recognise particular HTTP methods such as `PATCH`.  For example [Amazon Web Services ELB][aws_elb].
 
 To use it, make a `POST` request, setting the `X-HTTP-Method-Override` header.
 
diff --git a/docs/topics/contributing.md b/docs/topics/contributing.md
index fd60daea9..123e4a8a1 100644
--- a/docs/topics/contributing.md
+++ b/docs/topics/contributing.md
@@ -1,6 +1,6 @@
 # Contributing to REST framework
 
-> The world can only really be changed one piece at a time. The art is picking that piece.
+> The world can only really be changed one piece at a time.  The art is picking that piece.
 >
 > &mdash; [Tim Berners-Lee][cite]
 
@@ -24,7 +24,7 @@ Some tips on good issue reporting:
 
 * When describing issues try to phrase your ticket in terms of the *behavior* you think needs changing rather than the *code* you think need changing.
 * Search the issue list first for related items, and make sure you're running the latest version of REST framework before reporting an issue.
-* If reporting a bug, then try to include a pull request with a failing test case. This will help us quickly identify if there is a valid issue, and make sure that it gets fixed more quickly if there is one.
+* If reporting a bug, then try to include a pull request with a failing test case.  This will help us quickly identify if there is a valid issue, and make sure that it gets fixed more quickly if there is one.
 
 
 
@@ -32,6 +32,7 @@ Some tips on good issue reporting:
 
 # Development
 
+
 * git clone & PYTHONPATH
 * Pep8
 * Recommend editor that runs pep8
diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 16ac961d9..fb14cf5f3 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -225,7 +225,7 @@ The security vulnerabilities only affect APIs which use the `XMLParser` class, b
 * Bugfix: Validation errors instead of exceptions when related fields receive incorrect types.
 * Bugfix: Handle ObjectDoesNotExist exception when serializing null reverse one-to-one
 
-**Note**: Prior to 2.1.16, The Decimals would render in JSON using floating point if `simplejson` was installed, but otherwise render using string notation. Now that use of `simplejson` has been deprecated, Decimals will consistently render using string notation.  See [#582] for more details. 
+**Note**: Prior to 2.1.16, The Decimals would render in JSON using floating point if `simplejson` was installed, but otherwise render using string notation.  Now that use of `simplejson` has been deprecated, Decimals will consistently render using string notation.  See [#582] for more details.
 
 ### 2.1.15
 
diff --git a/docs/topics/rest-framework-2-announcement.md b/docs/topics/rest-framework-2-announcement.md
index c527937fe..f1060d90b 100644
--- a/docs/topics/rest-framework-2-announcement.md
+++ b/docs/topics/rest-framework-2-announcement.md
@@ -2,7 +2,7 @@
 
 What it is, and why you should care.
 
-> Most people just make the mistake that it should be simple to design simple things. In reality, the effort required to design something is inversely proportional to the simplicity of the result.
+> Most people just make the mistake that it should be simple to design simple things.  In reality, the effort required to design something is inversely proportional to the simplicity of the result.
 >
 > &mdash; [Roy Fielding][cite]
 
@@ -22,9 +22,9 @@ This article is intended to give you a flavor of what REST framework 2 is, and w
 
 Before we get cracking, let's start with the hard sell, with a few bits of feedback from some early adopters…
 
-"Django REST framework 2 is beautiful. Some of the API design is worthy of @kennethreitz." - [Kit La Touche][quote1]
+"Django REST framework 2 is beautiful.  Some of the API design is worthy of @kennethreitz." - [Kit La Touche][quote1]
 
-"Since it's pretty much just Django, controlling things like URLs has been a breeze... I think [REST framework 2] has definitely got the right approach here; even simple things like being able to override a function called post to do custom work during rather than having to intimately know what happens during a post make a huge difference to your productivity." - [Ian Strachan][quote2]
+"Since it's pretty much just Django, controlling things like URLs has been a breeze...  I think [REST framework 2] has definitely got the right approach here; even simple things like being able to override a function called post to do custom work during rather than having to intimately know what happens during a post make a huge difference to your productivity." - [Ian Strachan][quote2]
 
 "I switched to the 2.0 branch and I don't regret it - fully refactored my code in another &half; day and it's *much* more to my tastes" - [Bruno Desthuilliers][quote3]
 
diff --git a/docs/topics/rest-hypermedia-hateoas.md b/docs/topics/rest-hypermedia-hateoas.md
index aeba579fe..b4899a364 100644
--- a/docs/topics/rest-hypermedia-hateoas.md
+++ b/docs/topics/rest-hypermedia-hateoas.md
@@ -1,6 +1,6 @@
 # REST, Hypermedia & HATEOAS
 
-> You keep using that word "REST". I do not think it means what you think it means.
+> You keep using that word "REST".  I do not think it means what you think it means.
 >
 > &mdash; Mike Amundsen, [REST fest 2012 keynote][cite].
 
diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md
index ed54a8765..3382deeac 100644
--- a/docs/tutorial/1-serialization.md
+++ b/docs/tutorial/1-serialization.md
@@ -2,13 +2,13 @@
 
 ## Introduction
 
-This tutorial will cover creating a simple pastebin code highlighting Web API. Along the way it will introduce the various components that make up REST framework, and give you a comprehensive understanding of how everything fits together.
+This tutorial will cover creating a simple pastebin code highlighting Web API.  Along the way it will introduce the various components that make up REST framework, and give you a comprehensive understanding of how everything fits together.
 
 The tutorial is fairly in-depth, so you should probably get a cookie and a cup of your favorite brew before getting started.  If you just want a quick overview, you should head over to the [quickstart] documentation instead.
 
 ---
 
-**Note**: The code for this tutorial is available in the [tomchristie/rest-framework-tutorial][repo] repository on GitHub. The completed implementation is also online as a sandbox version for testing, [available here][sandbox].
+**Note**: The code for this tutorial is available in the [tomchristie/rest-framework-tutorial][repo] repository on GitHub.  The completed implementation is also online as a sandbox version for testing, [available here][sandbox].
 
 ---
 
@@ -73,7 +73,7 @@ Okay, we're ready to roll.
 
 ## Creating a model to work with
 
-For the purposes of this tutorial we're going to start by creating a simple `Snippet` model that is used to store code snippets.  Go ahead and edit the  `snippets` app's `models.py` file. Note: Good programming practices include comments. Although you will find them in our repository version of this tutorial code, we have omitted them here to focus on the code itself.
+For the purposes of this tutorial we're going to start by creating a simple `Snippet` model that is used to store code snippets.  Go ahead and edit the `snippets` app's `models.py` file.  Note: Good programming practices include comments.  Although you will find them in our repository version of this tutorial code, we have omitted them here to focus on the code itself.
 
     from django.db import models
     from pygments.lexers import get_all_lexers
@@ -293,7 +293,7 @@ We'll also need a view which corresponds to an individual snippet, and can be us
             snippet.delete()
             return HttpResponse(status=204)
 
-Finally we need to wire these views up. Create the `snippets/urls.py` file:
+Finally we need to wire these views up.  Create the `snippets/urls.py` file:
 
     from django.conf.urls import patterns, url
 
diff --git a/docs/tutorial/2-requests-and-responses.md b/docs/tutorial/2-requests-and-responses.md
index 260c4d832..30966a106 100644
--- a/docs/tutorial/2-requests-and-responses.md
+++ b/docs/tutorial/2-requests-and-responses.md
@@ -98,7 +98,7 @@ Notice that we're no longer explicitly tying our requests or responses to a give
 
 ## Adding optional format suffixes to our URLs
 
-To take advantage of the fact that our responses are no longer hardwired to a single content type let's add support for format suffixes to our API endpoints. Using format suffixes gives us URLs that explicitly refer to a given format, and means our API will be able to handle URLs such as [http://example.com/api/items/4.json][json-url].
+To take advantage of the fact that our responses are no longer hardwired to a single content type let's add support for format suffixes to our API endpoints.  Using format suffixes gives us URLs that explicitly refer to a given format, and means our API will be able to handle URLs such as [http://example.com/api/items/4.json][json-url].
 
 Start by adding a `format` keyword argument to both of the views, like so.
 
@@ -158,7 +158,7 @@ Now go and open the API in a web browser, by visiting [http://127.0.0.1:8000/sni
 
 ### Browsability
 
-Because the API chooses the content type of the response based on the client request, it will, by default, return an HTML-formatted representation of the resource when that resource is requested by a web browser. This allows for the API to return a fully web-browsable HTML representation.
+Because the API chooses the content type of the response based on the client request, it will, by default, return an HTML-formatted representation of the resource when that resource is requested by a web browser.  This allows for the API to return a fully web-browsable HTML representation.
 
 Having a web-browsable API is a huge usability win, and makes developing and using your API much easier.  It also dramatically lowers the barrier-to-entry for other developers wanting to inspect and work with your API.
 
diff --git a/docs/tutorial/3-class-based-views.md b/docs/tutorial/3-class-based-views.md
index 70cf2c546..c1b3d8f23 100644
--- a/docs/tutorial/3-class-based-views.md
+++ b/docs/tutorial/3-class-based-views.md
@@ -102,7 +102,7 @@ Let's take a look at how we can compose our views by using the mixin classes.
         def post(self, request, *args, **kwargs):
             return self.create(request, *args, **kwargs)
 
-We'll take a moment to examine exactly what's happening here. We're building our view using `GenericAPIView`, and adding in `ListModelMixin` and `CreateModelMixin`.
+We'll take a moment to examine exactly what's happening here.  We're building our view using `GenericAPIView`, and adding in `ListModelMixin` and `CreateModelMixin`.
 
 The base class provides the core functionality, and the mixin classes provide the `.list()` and `.create()` actions.  We're then explicitly binding the `get` and `post` methods to the appropriate actions.  Simple enough stuff so far.
 
diff --git a/docs/tutorial/4-authentication-and-permissions.md b/docs/tutorial/4-authentication-and-permissions.md
index 1c127fac5..393d879a4 100644
--- a/docs/tutorial/4-authentication-and-permissions.md
+++ b/docs/tutorial/4-authentication-and-permissions.md
@@ -94,7 +94,7 @@ On **both** the `SnippetList` and `SnippetDetail` view classes, add the followin
 
 ## Updating our serializer
 
-Now that snippets are associated with the user that created them, let's update our `SnippetSerializer` to reflect that. Add the following field to the serializer definition:
+Now that snippets are associated with the user that created them, let's update our `SnippetSerializer` to reflect that.  Add the following field to the serializer definition:
 
     owner = serializers.Field(source='owner.username')
 
@@ -120,7 +120,7 @@ Then, add the following property to **both** the `SnippetList` and `SnippetDetai
 
 ## Adding login to the Browsable API
 
-If you open a browser and navigate to the browsable API at the moment, you'll find that you're no longer able to create new code snippets. In order to do so we'd need to be able to login as a user.
+If you open a browser and navigate to the browsable API at the moment, you'll find that you're no longer able to create new code snippets.  In order to do so we'd need to be able to login as a user.
 
 We can add a login view for use with the browsable API, by editing our URLconf once more.
 
diff --git a/docs/tutorial/5-relationships-and-hyperlinked-apis.md b/docs/tutorial/5-relationships-and-hyperlinked-apis.md
index cb2e092c3..2e013a946 100644
--- a/docs/tutorial/5-relationships-and-hyperlinked-apis.md
+++ b/docs/tutorial/5-relationships-and-hyperlinked-apis.md
@@ -29,7 +29,7 @@ Unlike all our other API endpoints, we don't want to use JSON, but instead just
 
 The other thing we need to consider when creating the code highlight view is that there's no existing concrete generic view that we can use.  We're not returning an object instance, but instead a property of an object instance.
 
-Instead of using a concrete generic view, we'll use the base class for representing instances, and create our own `.get()` method. In your snippets.views add:
+Instead of using a concrete generic view, we'll use the base class for representing instances, and create our own `.get()` method.  In your snippets.views add:
 
     from rest_framework import renderers
     from rest_framework.response import Response

From cb49c5d3c01493ddb9b06b8ab0bdcca01cb7c633 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Wed, 29 May 2013 08:57:11 +0100
Subject: [PATCH 166/197] Rename test modules to 1.6 style

---
 .../tests/{authentication.py => test_authentication.py}           | 0
 rest_framework/tests/{breadcrumbs.py => test_breadcrumbs.py}      | 0
 rest_framework/tests/{decorators.py => test_decorators.py}        | 0
 rest_framework/tests/{description.py => test_description.py}      | 0
 rest_framework/tests/{fields.py => test_fields.py}                | 0
 rest_framework/tests/{files.py => test_files.py}                  | 0
 rest_framework/tests/{filters.py => test_filters.py}              | 0
 .../tests/{genericrelations.py => test_genericrelations.py}       | 0
 rest_framework/tests/{generics.py => test_generics.py}            | 0
 rest_framework/tests/{htmlrenderer.py => test_htmlrenderer.py}    | 0
 .../{hyperlinkedserializers.py => test_hyperlinkedserializers.py} | 0
 .../{multitable_inheritance.py => test_multitable_inheritance.py} | 0
 rest_framework/tests/{negotiation.py => test_negotiation.py}      | 0
 rest_framework/tests/{pagination.py => test_pagination.py}        | 0
 rest_framework/tests/{parsers.py => test_parsers.py}              | 0
 rest_framework/tests/{permissions.py => test_permissions.py}      | 0
 rest_framework/tests/{relations.py => test_relations.py}          | 0
 .../tests/{relations_hyperlink.py => test_relations_hyperlink.py} | 0
 .../tests/{relations_nested.py => test_relations_nested.py}       | 0
 rest_framework/tests/{relations_pk.py => test_relations_pk.py}    | 0
 .../tests/{relations_slug.py => test_relations_slug.py}           | 0
 rest_framework/tests/{renderers.py => test_renderers.py}          | 0
 rest_framework/tests/{request.py => test_request.py}              | 0
 rest_framework/tests/{response.py => test_response.py}            | 0
 rest_framework/tests/{reverse.py => test_reverse.py}              | 0
 rest_framework/tests/{routers.py => test_routers.py}              | 0
 rest_framework/tests/{serializer.py => test_serializer.py}        | 0
 .../{serializer_bulk_update.py => test_serializer_bulk_update.py} | 0
 .../tests/{serializer_nested.py => test_serializer_nested.py}     | 0
 rest_framework/tests/{settings.py => test_settings.py}            | 0
 rest_framework/tests/{testcases.py => test_testcases.py}          | 0
 rest_framework/tests/{throttling.py => test_throttling.py}        | 0
 rest_framework/tests/{urlpatterns.py => test_urlpatterns.py}      | 0
 rest_framework/tests/{validation.py => test_validation.py}        | 0
 rest_framework/tests/{views.py => test_views.py}                  | 0
 35 files changed, 0 insertions(+), 0 deletions(-)
 rename rest_framework/tests/{authentication.py => test_authentication.py} (100%)
 rename rest_framework/tests/{breadcrumbs.py => test_breadcrumbs.py} (100%)
 rename rest_framework/tests/{decorators.py => test_decorators.py} (100%)
 rename rest_framework/tests/{description.py => test_description.py} (100%)
 rename rest_framework/tests/{fields.py => test_fields.py} (100%)
 rename rest_framework/tests/{files.py => test_files.py} (100%)
 rename rest_framework/tests/{filters.py => test_filters.py} (100%)
 rename rest_framework/tests/{genericrelations.py => test_genericrelations.py} (100%)
 rename rest_framework/tests/{generics.py => test_generics.py} (100%)
 rename rest_framework/tests/{htmlrenderer.py => test_htmlrenderer.py} (100%)
 rename rest_framework/tests/{hyperlinkedserializers.py => test_hyperlinkedserializers.py} (100%)
 rename rest_framework/tests/{multitable_inheritance.py => test_multitable_inheritance.py} (100%)
 rename rest_framework/tests/{negotiation.py => test_negotiation.py} (100%)
 rename rest_framework/tests/{pagination.py => test_pagination.py} (100%)
 rename rest_framework/tests/{parsers.py => test_parsers.py} (100%)
 rename rest_framework/tests/{permissions.py => test_permissions.py} (100%)
 rename rest_framework/tests/{relations.py => test_relations.py} (100%)
 rename rest_framework/tests/{relations_hyperlink.py => test_relations_hyperlink.py} (100%)
 rename rest_framework/tests/{relations_nested.py => test_relations_nested.py} (100%)
 rename rest_framework/tests/{relations_pk.py => test_relations_pk.py} (100%)
 rename rest_framework/tests/{relations_slug.py => test_relations_slug.py} (100%)
 rename rest_framework/tests/{renderers.py => test_renderers.py} (100%)
 rename rest_framework/tests/{request.py => test_request.py} (100%)
 rename rest_framework/tests/{response.py => test_response.py} (100%)
 rename rest_framework/tests/{reverse.py => test_reverse.py} (100%)
 rename rest_framework/tests/{routers.py => test_routers.py} (100%)
 rename rest_framework/tests/{serializer.py => test_serializer.py} (100%)
 rename rest_framework/tests/{serializer_bulk_update.py => test_serializer_bulk_update.py} (100%)
 rename rest_framework/tests/{serializer_nested.py => test_serializer_nested.py} (100%)
 rename rest_framework/tests/{settings.py => test_settings.py} (100%)
 rename rest_framework/tests/{testcases.py => test_testcases.py} (100%)
 rename rest_framework/tests/{throttling.py => test_throttling.py} (100%)
 rename rest_framework/tests/{urlpatterns.py => test_urlpatterns.py} (100%)
 rename rest_framework/tests/{validation.py => test_validation.py} (100%)
 rename rest_framework/tests/{views.py => test_views.py} (100%)

diff --git a/rest_framework/tests/authentication.py b/rest_framework/tests/test_authentication.py
similarity index 100%
rename from rest_framework/tests/authentication.py
rename to rest_framework/tests/test_authentication.py
diff --git a/rest_framework/tests/breadcrumbs.py b/rest_framework/tests/test_breadcrumbs.py
similarity index 100%
rename from rest_framework/tests/breadcrumbs.py
rename to rest_framework/tests/test_breadcrumbs.py
diff --git a/rest_framework/tests/decorators.py b/rest_framework/tests/test_decorators.py
similarity index 100%
rename from rest_framework/tests/decorators.py
rename to rest_framework/tests/test_decorators.py
diff --git a/rest_framework/tests/description.py b/rest_framework/tests/test_description.py
similarity index 100%
rename from rest_framework/tests/description.py
rename to rest_framework/tests/test_description.py
diff --git a/rest_framework/tests/fields.py b/rest_framework/tests/test_fields.py
similarity index 100%
rename from rest_framework/tests/fields.py
rename to rest_framework/tests/test_fields.py
diff --git a/rest_framework/tests/files.py b/rest_framework/tests/test_files.py
similarity index 100%
rename from rest_framework/tests/files.py
rename to rest_framework/tests/test_files.py
diff --git a/rest_framework/tests/filters.py b/rest_framework/tests/test_filters.py
similarity index 100%
rename from rest_framework/tests/filters.py
rename to rest_framework/tests/test_filters.py
diff --git a/rest_framework/tests/genericrelations.py b/rest_framework/tests/test_genericrelations.py
similarity index 100%
rename from rest_framework/tests/genericrelations.py
rename to rest_framework/tests/test_genericrelations.py
diff --git a/rest_framework/tests/generics.py b/rest_framework/tests/test_generics.py
similarity index 100%
rename from rest_framework/tests/generics.py
rename to rest_framework/tests/test_generics.py
diff --git a/rest_framework/tests/htmlrenderer.py b/rest_framework/tests/test_htmlrenderer.py
similarity index 100%
rename from rest_framework/tests/htmlrenderer.py
rename to rest_framework/tests/test_htmlrenderer.py
diff --git a/rest_framework/tests/hyperlinkedserializers.py b/rest_framework/tests/test_hyperlinkedserializers.py
similarity index 100%
rename from rest_framework/tests/hyperlinkedserializers.py
rename to rest_framework/tests/test_hyperlinkedserializers.py
diff --git a/rest_framework/tests/multitable_inheritance.py b/rest_framework/tests/test_multitable_inheritance.py
similarity index 100%
rename from rest_framework/tests/multitable_inheritance.py
rename to rest_framework/tests/test_multitable_inheritance.py
diff --git a/rest_framework/tests/negotiation.py b/rest_framework/tests/test_negotiation.py
similarity index 100%
rename from rest_framework/tests/negotiation.py
rename to rest_framework/tests/test_negotiation.py
diff --git a/rest_framework/tests/pagination.py b/rest_framework/tests/test_pagination.py
similarity index 100%
rename from rest_framework/tests/pagination.py
rename to rest_framework/tests/test_pagination.py
diff --git a/rest_framework/tests/parsers.py b/rest_framework/tests/test_parsers.py
similarity index 100%
rename from rest_framework/tests/parsers.py
rename to rest_framework/tests/test_parsers.py
diff --git a/rest_framework/tests/permissions.py b/rest_framework/tests/test_permissions.py
similarity index 100%
rename from rest_framework/tests/permissions.py
rename to rest_framework/tests/test_permissions.py
diff --git a/rest_framework/tests/relations.py b/rest_framework/tests/test_relations.py
similarity index 100%
rename from rest_framework/tests/relations.py
rename to rest_framework/tests/test_relations.py
diff --git a/rest_framework/tests/relations_hyperlink.py b/rest_framework/tests/test_relations_hyperlink.py
similarity index 100%
rename from rest_framework/tests/relations_hyperlink.py
rename to rest_framework/tests/test_relations_hyperlink.py
diff --git a/rest_framework/tests/relations_nested.py b/rest_framework/tests/test_relations_nested.py
similarity index 100%
rename from rest_framework/tests/relations_nested.py
rename to rest_framework/tests/test_relations_nested.py
diff --git a/rest_framework/tests/relations_pk.py b/rest_framework/tests/test_relations_pk.py
similarity index 100%
rename from rest_framework/tests/relations_pk.py
rename to rest_framework/tests/test_relations_pk.py
diff --git a/rest_framework/tests/relations_slug.py b/rest_framework/tests/test_relations_slug.py
similarity index 100%
rename from rest_framework/tests/relations_slug.py
rename to rest_framework/tests/test_relations_slug.py
diff --git a/rest_framework/tests/renderers.py b/rest_framework/tests/test_renderers.py
similarity index 100%
rename from rest_framework/tests/renderers.py
rename to rest_framework/tests/test_renderers.py
diff --git a/rest_framework/tests/request.py b/rest_framework/tests/test_request.py
similarity index 100%
rename from rest_framework/tests/request.py
rename to rest_framework/tests/test_request.py
diff --git a/rest_framework/tests/response.py b/rest_framework/tests/test_response.py
similarity index 100%
rename from rest_framework/tests/response.py
rename to rest_framework/tests/test_response.py
diff --git a/rest_framework/tests/reverse.py b/rest_framework/tests/test_reverse.py
similarity index 100%
rename from rest_framework/tests/reverse.py
rename to rest_framework/tests/test_reverse.py
diff --git a/rest_framework/tests/routers.py b/rest_framework/tests/test_routers.py
similarity index 100%
rename from rest_framework/tests/routers.py
rename to rest_framework/tests/test_routers.py
diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/test_serializer.py
similarity index 100%
rename from rest_framework/tests/serializer.py
rename to rest_framework/tests/test_serializer.py
diff --git a/rest_framework/tests/serializer_bulk_update.py b/rest_framework/tests/test_serializer_bulk_update.py
similarity index 100%
rename from rest_framework/tests/serializer_bulk_update.py
rename to rest_framework/tests/test_serializer_bulk_update.py
diff --git a/rest_framework/tests/serializer_nested.py b/rest_framework/tests/test_serializer_nested.py
similarity index 100%
rename from rest_framework/tests/serializer_nested.py
rename to rest_framework/tests/test_serializer_nested.py
diff --git a/rest_framework/tests/settings.py b/rest_framework/tests/test_settings.py
similarity index 100%
rename from rest_framework/tests/settings.py
rename to rest_framework/tests/test_settings.py
diff --git a/rest_framework/tests/testcases.py b/rest_framework/tests/test_testcases.py
similarity index 100%
rename from rest_framework/tests/testcases.py
rename to rest_framework/tests/test_testcases.py
diff --git a/rest_framework/tests/throttling.py b/rest_framework/tests/test_throttling.py
similarity index 100%
rename from rest_framework/tests/throttling.py
rename to rest_framework/tests/test_throttling.py
diff --git a/rest_framework/tests/urlpatterns.py b/rest_framework/tests/test_urlpatterns.py
similarity index 100%
rename from rest_framework/tests/urlpatterns.py
rename to rest_framework/tests/test_urlpatterns.py
diff --git a/rest_framework/tests/validation.py b/rest_framework/tests/test_validation.py
similarity index 100%
rename from rest_framework/tests/validation.py
rename to rest_framework/tests/test_validation.py
diff --git a/rest_framework/tests/views.py b/rest_framework/tests/test_views.py
similarity index 100%
rename from rest_framework/tests/views.py
rename to rest_framework/tests/test_views.py

From 85fe7197bfecd80774f15db26833a44ba5f5d570 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Wed, 29 May 2013 09:00:30 +0100
Subject: [PATCH 167/197] Change test urls to match 1.6 test module name style

---
 rest_framework/tests/test_authentication.py         | 10 +++++-----
 rest_framework/tests/test_breadcrumbs.py            |  2 +-
 rest_framework/tests/test_filters.py                |  2 +-
 rest_framework/tests/test_htmlrenderer.py           |  4 ++--
 rest_framework/tests/test_hyperlinkedserializers.py | 12 ++++++------
 rest_framework/tests/test_relations_hyperlink.py    | 10 +++++-----
 rest_framework/tests/test_renderers.py              |  6 +++---
 rest_framework/tests/test_request.py                |  2 +-
 rest_framework/tests/test_response.py               |  8 ++++----
 rest_framework/tests/test_reverse.py                |  2 +-
 rest_framework/tests/test_throttling.py             |  2 +-
 11 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/rest_framework/tests/test_authentication.py b/rest_framework/tests/test_authentication.py
index 8e6d3e51a..90e1f5c40 100644
--- a/rest_framework/tests/test_authentication.py
+++ b/rest_framework/tests/test_authentication.py
@@ -63,7 +63,7 @@ if oauth2_provider is not None:
 
 class BasicAuthTests(TestCase):
     """Basic authentication"""
-    urls = 'rest_framework.tests.authentication'
+    urls = 'rest_framework.tests.test_authentication'
 
     def setUp(self):
         self.csrf_client = Client(enforce_csrf_checks=True)
@@ -102,7 +102,7 @@ class BasicAuthTests(TestCase):
 
 class SessionAuthTests(TestCase):
     """User session authentication"""
-    urls = 'rest_framework.tests.authentication'
+    urls = 'rest_framework.tests.test_authentication'
 
     def setUp(self):
         self.csrf_client = Client(enforce_csrf_checks=True)
@@ -149,7 +149,7 @@ class SessionAuthTests(TestCase):
 
 class TokenAuthTests(TestCase):
     """Token authentication"""
-    urls = 'rest_framework.tests.authentication'
+    urls = 'rest_framework.tests.test_authentication'
 
     def setUp(self):
         self.csrf_client = Client(enforce_csrf_checks=True)
@@ -243,7 +243,7 @@ class IncorrectCredentialsTests(TestCase):
 
 class OAuthTests(TestCase):
     """OAuth 1.0a authentication"""
-    urls = 'rest_framework.tests.authentication'
+    urls = 'rest_framework.tests.test_authentication'
 
     def setUp(self):
         # these imports are here because oauth is optional and hiding them in try..except block or compat
@@ -429,7 +429,7 @@ class OAuthTests(TestCase):
 
 class OAuth2Tests(TestCase):
     """OAuth 2.0 authentication"""
-    urls = 'rest_framework.tests.authentication'
+    urls = 'rest_framework.tests.test_authentication'
 
     def setUp(self):
         self.csrf_client = Client(enforce_csrf_checks=True)
diff --git a/rest_framework/tests/test_breadcrumbs.py b/rest_framework/tests/test_breadcrumbs.py
index d9ed647e2..41ddf2cea 100644
--- a/rest_framework/tests/test_breadcrumbs.py
+++ b/rest_framework/tests/test_breadcrumbs.py
@@ -36,7 +36,7 @@ urlpatterns = patterns('',
 class BreadcrumbTests(TestCase):
     """Tests the breadcrumb functionality used by the HTML renderer."""
 
-    urls = 'rest_framework.tests.breadcrumbs'
+    urls = 'rest_framework.tests.test_breadcrumbs'
 
     def test_root_breadcrumbs(self):
         url = '/'
diff --git a/rest_framework/tests/test_filters.py b/rest_framework/tests/test_filters.py
index 8ae6d5303..aaed62478 100644
--- a/rest_framework/tests/test_filters.py
+++ b/rest_framework/tests/test_filters.py
@@ -243,7 +243,7 @@ class IntegrationTestDetailFiltering(CommonFilteringTestCase):
     """
     Integration tests for filtered detail views.
     """
-    urls = 'rest_framework.tests.filters'
+    urls = 'rest_framework.tests.test_filters'
 
     def _get_url(self, item):
         return reverse('detail-view', kwargs=dict(pk=item.pk))
diff --git a/rest_framework/tests/test_htmlrenderer.py b/rest_framework/tests/test_htmlrenderer.py
index 5d18a6e83..8957a43c7 100644
--- a/rest_framework/tests/test_htmlrenderer.py
+++ b/rest_framework/tests/test_htmlrenderer.py
@@ -42,7 +42,7 @@ urlpatterns = patterns('',
 
 
 class TemplateHTMLRendererTests(TestCase):
-    urls = 'rest_framework.tests.htmlrenderer'
+    urls = 'rest_framework.tests.test_htmlrenderer'
 
     def setUp(self):
         """
@@ -82,7 +82,7 @@ class TemplateHTMLRendererTests(TestCase):
 
 
 class TemplateHTMLRendererExceptionTests(TestCase):
-    urls = 'rest_framework.tests.htmlrenderer'
+    urls = 'rest_framework.tests.test_htmlrenderer'
 
     def setUp(self):
         """
diff --git a/rest_framework/tests/test_hyperlinkedserializers.py b/rest_framework/tests/test_hyperlinkedserializers.py
index 8fc6ba773..1894ddb27 100644
--- a/rest_framework/tests/test_hyperlinkedserializers.py
+++ b/rest_framework/tests/test_hyperlinkedserializers.py
@@ -106,7 +106,7 @@ urlpatterns = patterns('',
 
 
 class TestBasicHyperlinkedView(TestCase):
-    urls = 'rest_framework.tests.hyperlinkedserializers'
+    urls = 'rest_framework.tests.test_hyperlinkedserializers'
 
     def setUp(self):
         """
@@ -143,7 +143,7 @@ class TestBasicHyperlinkedView(TestCase):
 
 
 class TestManyToManyHyperlinkedView(TestCase):
-    urls = 'rest_framework.tests.hyperlinkedserializers'
+    urls = 'rest_framework.tests.test_hyperlinkedserializers'
 
     def setUp(self):
         """
@@ -191,7 +191,7 @@ class TestManyToManyHyperlinkedView(TestCase):
 
 
 class TestHyperlinkedIdentityFieldLookup(TestCase):
-    urls = 'rest_framework.tests.hyperlinkedserializers'
+    urls = 'rest_framework.tests.test_hyperlinkedserializers'
 
     def setUp(self):
         """
@@ -221,7 +221,7 @@ class TestHyperlinkedIdentityFieldLookup(TestCase):
 
 
 class TestCreateWithForeignKeys(TestCase):
-    urls = 'rest_framework.tests.hyperlinkedserializers'
+    urls = 'rest_framework.tests.test_hyperlinkedserializers'
 
     def setUp(self):
         """
@@ -246,7 +246,7 @@ class TestCreateWithForeignKeys(TestCase):
 
 
 class TestCreateWithForeignKeysAndCustomSlug(TestCase):
-    urls = 'rest_framework.tests.hyperlinkedserializers'
+    urls = 'rest_framework.tests.test_hyperlinkedserializers'
 
     def setUp(self):
         """
@@ -271,7 +271,7 @@ class TestCreateWithForeignKeysAndCustomSlug(TestCase):
 
 
 class TestOptionalRelationHyperlinkedView(TestCase):
-    urls = 'rest_framework.tests.hyperlinkedserializers'
+    urls = 'rest_framework.tests.test_hyperlinkedserializers'
 
     def setUp(self):
         """
diff --git a/rest_framework/tests/test_relations_hyperlink.py b/rest_framework/tests/test_relations_hyperlink.py
index b3efbf524..2ca7f4f2b 100644
--- a/rest_framework/tests/test_relations_hyperlink.py
+++ b/rest_framework/tests/test_relations_hyperlink.py
@@ -71,7 +71,7 @@ class NullableOneToOneTargetSerializer(serializers.HyperlinkedModelSerializer):
 # TODO: Add test that .data cannot be accessed prior to .is_valid
 
 class HyperlinkedManyToManyTests(TestCase):
-    urls = 'rest_framework.tests.relations_hyperlink'
+    urls = 'rest_framework.tests.test_relations_hyperlink'
 
     def setUp(self):
         for idx in range(1, 4):
@@ -179,7 +179,7 @@ class HyperlinkedManyToManyTests(TestCase):
 
 
 class HyperlinkedForeignKeyTests(TestCase):
-    urls = 'rest_framework.tests.relations_hyperlink'
+    urls = 'rest_framework.tests.test_relations_hyperlink'
 
     def setUp(self):
         target = ForeignKeyTarget(name='target-1')
@@ -307,7 +307,7 @@ class HyperlinkedForeignKeyTests(TestCase):
 
 
 class HyperlinkedNullableForeignKeyTests(TestCase):
-    urls = 'rest_framework.tests.relations_hyperlink'
+    urls = 'rest_framework.tests.test_relations_hyperlink'
 
     def setUp(self):
         target = ForeignKeyTarget(name='target-1')
@@ -435,7 +435,7 @@ class HyperlinkedNullableForeignKeyTests(TestCase):
 
 
 class HyperlinkedNullableOneToOneTests(TestCase):
-    urls = 'rest_framework.tests.relations_hyperlink'
+    urls = 'rest_framework.tests.test_relations_hyperlink'
 
     def setUp(self):
         target = OneToOneTarget(name='target-1')
@@ -458,7 +458,7 @@ class HyperlinkedNullableOneToOneTests(TestCase):
 # Regression tests for #694 (`source` attribute on related fields)
 
 class HyperlinkedRelatedFieldSourceTests(TestCase):
-    urls = 'rest_framework.tests.relations_hyperlink'
+    urls = 'rest_framework.tests.test_relations_hyperlink'
 
     def test_related_manager_source(self):
         """
diff --git a/rest_framework/tests/test_renderers.py b/rest_framework/tests/test_renderers.py
index cf3f4b466..95b597411 100644
--- a/rest_framework/tests/test_renderers.py
+++ b/rest_framework/tests/test_renderers.py
@@ -133,7 +133,7 @@ class RendererEndToEndTests(TestCase):
     End-to-end testing of renderers using an RendererMixin on a generic view.
     """
 
-    urls = 'rest_framework.tests.renderers'
+    urls = 'rest_framework.tests.test_renderers'
 
     def test_default_renderer_serializes_content(self):
         """If the Accept header is not set the default renderer should serialize the response."""
@@ -288,7 +288,7 @@ class JSONPRendererTests(TestCase):
     Tests specific to the JSONP Renderer
     """
 
-    urls = 'rest_framework.tests.renderers'
+    urls = 'rest_framework.tests.test_renderers'
 
     def test_without_callback_with_json_renderer(self):
         """
@@ -461,7 +461,7 @@ class CacheRenderTest(TestCase):
     Tests specific to caching responses
     """
 
-    urls = 'rest_framework.tests.renderers'
+    urls = 'rest_framework.tests.test_renderers'
 
     cache_key = 'just_a_cache_key'
 
diff --git a/rest_framework/tests/test_request.py b/rest_framework/tests/test_request.py
index 97e5af207..a5c5e84ce 100644
--- a/rest_framework/tests/test_request.py
+++ b/rest_framework/tests/test_request.py
@@ -254,7 +254,7 @@ urlpatterns = patterns('',
 
 
 class TestContentParsingWithAuthentication(TestCase):
-    urls = 'rest_framework.tests.request'
+    urls = 'rest_framework.tests.test_request'
 
     def setUp(self):
         self.csrf_client = Client(enforce_csrf_checks=True)
diff --git a/rest_framework/tests/test_response.py b/rest_framework/tests/test_response.py
index 4e04ac5c0..eea3c6418 100644
--- a/rest_framework/tests/test_response.py
+++ b/rest_framework/tests/test_response.py
@@ -118,7 +118,7 @@ class RendererIntegrationTests(TestCase):
     End-to-end testing of renderers using an ResponseMixin on a generic view.
     """
 
-    urls = 'rest_framework.tests.response'
+    urls = 'rest_framework.tests.test_response'
 
     def test_default_renderer_serializes_content(self):
         """If the Accept header is not set the default renderer should serialize the response."""
@@ -198,7 +198,7 @@ class Issue122Tests(TestCase):
     """
     Tests that covers #122.
     """
-    urls = 'rest_framework.tests.response'
+    urls = 'rest_framework.tests.test_response'
 
     def test_only_html_renderer(self):
         """
@@ -218,7 +218,7 @@ class Issue467Tests(TestCase):
     Tests for #467
     """
 
-    urls = 'rest_framework.tests.response'
+    urls = 'rest_framework.tests.test_response'
 
     def test_form_has_label_and_help_text(self):
         resp = self.client.get('/html_new_model')
@@ -232,7 +232,7 @@ class Issue807Tests(TestCase):
     Covers #807
     """
 
-    urls = 'rest_framework.tests.response'
+    urls = 'rest_framework.tests.test_response'
 
     def test_does_not_append_charset_by_default(self):
         """
diff --git a/rest_framework/tests/test_reverse.py b/rest_framework/tests/test_reverse.py
index cb8d81325..93ef56377 100644
--- a/rest_framework/tests/test_reverse.py
+++ b/rest_framework/tests/test_reverse.py
@@ -19,7 +19,7 @@ class ReverseTests(TestCase):
     """
     Tests for fully qualified URLs when using `reverse`.
     """
-    urls = 'rest_framework.tests.reverse'
+    urls = 'rest_framework.tests.test_reverse'
 
     def test_reversed_urls_are_fully_qualified(self):
         request = factory.get('/view')
diff --git a/rest_framework/tests/test_throttling.py b/rest_framework/tests/test_throttling.py
index 11cbd8eba..da400b2fc 100644
--- a/rest_framework/tests/test_throttling.py
+++ b/rest_framework/tests/test_throttling.py
@@ -36,7 +36,7 @@ class MockView_MinuteThrottling(APIView):
 
 
 class ThrottlingTests(TestCase):
-    urls = 'rest_framework.tests.throttling'
+    urls = 'rest_framework.tests.test_throttling'
 
     def setUp(self):
         """

From 732269160f81f69dbf323c33b44e019599f330b6 Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy <xordoquy@linovia.com>
Date: Wed, 29 May 2013 10:18:38 +0200
Subject: [PATCH 168/197] Use absolute name imports for tests if django version
 is 1.6+.

---
 rest_framework/runtests/runtests.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/rest_framework/runtests/runtests.py b/rest_framework/runtests/runtests.py
index 4a333fb3e..da36d23fc 100755
--- a/rest_framework/runtests/runtests.py
+++ b/rest_framework/runtests/runtests.py
@@ -10,6 +10,7 @@ import sys
 sys.path.append(os.path.join(os.path.dirname(__file__), "../.."))
 os.environ['DJANGO_SETTINGS_MODULE'] = 'rest_framework.runtests.settings'
 
+import django
 from django.conf import settings
 from django.test.utils import get_runner
 
@@ -35,7 +36,11 @@ def main():
     else:
         print(usage())
         sys.exit(1)
-    failures = test_runner.run_tests(['tests' + test_case])
+    test_module_name = 'rest_framework.tests'
+    if django.VERSION[0] == 1 and django.VERSION[1] < 6:
+        test_module_name = 'tests'
+
+    failures = test_runner.run_tests([test_module_name + test_case])
 
     sys.exit(failures)
 

From d11b55648ca657d7036a312cafe6c76db491d3cc Mon Sep 17 00:00:00 2001
From: David Medina <davidmedina9@gmail.com>
Date: Wed, 29 May 2013 12:47:43 +0200
Subject: [PATCH 169/197] Bugfix: Fix run validation layer with invalid data

---
 rest_framework/serializers.py           |  3 ++-
 rest_framework/tests/test_validation.py | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 3e5c366ec..e7b8fdc02 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -315,7 +315,8 @@ class BaseSerializer(WritableField):
         self._errors = {}
         if data is not None or files is not None:
             attrs = self.restore_fields(data, files)
-            attrs = self.perform_validation(attrs)
+            if attrs is not None:
+                attrs = self.perform_validation(attrs)
         else:
             self._errors['non_field_errors'] = ['No input provided']
 
diff --git a/rest_framework/tests/test_validation.py b/rest_framework/tests/test_validation.py
index cbdd6515e..5202ebe43 100644
--- a/rest_framework/tests/test_validation.py
+++ b/rest_framework/tests/test_validation.py
@@ -63,3 +63,16 @@ class TestPreSaveValidationExclusions(TestCase):
         # does not have `blank=True`, so this serializer should not validate.
         serializer = ShouldValidateModelSerializer(data={'renamed': ''})
         self.assertEqual(serializer.is_valid(), False)
+
+
+class FieldValidationSerializer(serializers.Serializer):
+    foo = serializers.CharField()
+
+    def validate_foo(self, attrs, source):
+        raise StandardError("validate_foo was called")
+
+
+class TestFieldValidationWithInvalidData(TestCase):
+    def test_validate_foo_was_not_called(self):
+        serializer = FieldValidationSerializer(data='invalid data')
+        self.assertFalse(serializer.is_valid())

From c98ac3e83e537577cb90b2840c022e13e1c3c2b1 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Wed, 29 May 2013 14:08:48 +0100
Subject: [PATCH 170/197] Added get_url hook to HyperlinkedIdentityField in
 line with HyperlinedRelatedField.  Closes #883

---
 rest_framework/relations.py | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/rest_framework/relations.py b/rest_framework/relations.py
index 41707efce..42abf3ca7 100644
--- a/rest_framework/relations.py
+++ b/rest_framework/relations.py
@@ -537,6 +537,25 @@ class HyperlinkedIdentityField(Field):
         if format and self.format and self.format != format:
             format = self.format
 
+        # Return the hyperlink, or error if incorrectly configured.
+        try:
+            return self.get_url(obj, view_name, request, format)
+        except NoReverseMatch:
+            msg = (
+                'Could not resolve URL for hyperlinked relationship using '
+                'view name "%s". You may have failed to include the related '
+                'model in your API, or incorrectly configured the '
+                '`lookup_field` attribute on this field.'
+            )
+            raise Exception(msg % view_name)
+
+    def get_url(self, obj, view_name, request, format):
+        """
+        Given an object, return the URL that hyperlinks to the object.
+
+        May raise a `NoReverseMatch` if the `view_name` and `lookup_field`
+        attributes are not configured to correctly match the URL conf.
+        """
         lookup_field = getattr(obj, self.lookup_field)
         kwargs = {self.lookup_field: lookup_field}
         try:
@@ -562,7 +581,7 @@ class HyperlinkedIdentityField(Field):
             except NoReverseMatch:
                 pass
 
-        raise Exception('Could not resolve URL for field using view name "%s"' % view_name)
+        raise NoReverseMatch()
 
 
 ### Old-style many classes for backwards compat

From de1cc5f8c1393149781a8f9365449693af18af4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustavo=20Andr=C3=A9s=20Angulo?= <woakas@gmail.com>
Date: Wed, 29 May 2013 11:45:54 -0500
Subject: [PATCH 171/197] Fix default field when is a simple callable function.

---
 rest_framework/fields.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 1534eecad..30bbafc41 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -250,6 +250,9 @@ class WritableField(Field):
         self.validators = self.default_validators + validators
         self.default = default if default is not None else self.default
 
+        if is_simple_callable(self.default):
+            self.default = self.default()
+
         # Widgets are ony used for HTML forms.
         widget = widget or self.widget
         if isinstance(widget, type):

From c176af35e5ad18e8aced7156af7f4791e8f23ca2 Mon Sep 17 00:00:00 2001
From: David Medina <davidmedina9@gmail.com>
Date: Thu, 30 May 2013 09:07:30 +0200
Subject: [PATCH 172/197] Improve avoid validation test: #900

---
 rest_framework/tests/test_validation.py | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/rest_framework/tests/test_validation.py b/rest_framework/tests/test_validation.py
index 5202ebe43..a6ec0e993 100644
--- a/rest_framework/tests/test_validation.py
+++ b/rest_framework/tests/test_validation.py
@@ -65,14 +65,23 @@ class TestPreSaveValidationExclusions(TestCase):
         self.assertEqual(serializer.is_valid(), False)
 
 
-class FieldValidationSerializer(serializers.Serializer):
+class ValidationSerializer(serializers.Serializer):
     foo = serializers.CharField()
 
     def validate_foo(self, attrs, source):
-        raise StandardError("validate_foo was called")
+        raise serializers.ValidationError("foo invalid")
+
+    def validate(self, attrs):
+        raise serializers.ValidationError("serializer invalid")
 
 
-class TestFieldValidationWithInvalidData(TestCase):
-    def test_validate_foo_was_not_called(self):
-        serializer = FieldValidationSerializer(data='invalid data')
+class TestAvoidValidation(TestCase):
+    """
+    If serializer was initialized with invalid data (None or non dict-like), it
+    should avoid validation layer (validate_<field> and validate methods)
+    """
+    def test_serializer_errors_has_only_invalid_data_error(self):
+        serializer = ValidationSerializer(data='invalid data')
         self.assertFalse(serializer.is_valid())
+        self.assertDictEqual(serializer.errors,
+                             {'non_field_errors': ['Invalid data']})

From 8d4bcb4b4c837f9deb5f81d7af6a397405aa07fa Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Thu, 30 May 2013 11:11:42 +0100
Subject: [PATCH 173/197] Fix quickstart urls module name. Closes #902

---
 docs/tutorial/quickstart.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorial/quickstart.md b/docs/tutorial/quickstart.md
index a80e31c0c..f15e75c04 100644
--- a/docs/tutorial/quickstart.md
+++ b/docs/tutorial/quickstart.md
@@ -91,7 +91,7 @@ We can easily break these down into individual views if we need to, but using vi
 
 ## URLs
 
-Okay, now let's wire up the API URLs.  On to `quickstart/urls.py`...
+Okay, now let's wire up the API URLs.  On to `tutorial/urls.py`...
 
     from django.conf.urls import patterns, url, include
     from rest_framework import routers

From 441cdf80653446254703dc23e831b21036f22b31 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Thu, 30 May 2013 11:34:09 +0100
Subject: [PATCH 174/197] Note widget attribute on serializer field. Closes
 #836.

---
 docs/tutorial/1-serialization.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md
index 3382deeac..780ad4b7a 100644
--- a/docs/tutorial/1-serialization.md
+++ b/docs/tutorial/1-serialization.md
@@ -146,6 +146,8 @@ The first thing we need to get started on our Web API is provide a way of serial
 
 The first part of serializer class defines the fields that get serialized/deserialized.  The `restore_object` method defines how fully fledged instances get created when deserializing data.
 
+Notice that we can also use various attributes that would typcially be used on form fields, such as `widget=widgets.Testarea`.  These can be used to control how the serializer should render when displayed as an HTML form.
+
 We can actually also save ourselves some time by using the `ModelSerializer` class, as we'll see later, but for now we'll keep our serializer definition explicit.  
 
 ## Working with Serializers

From 2e566ade39d68819cbd6685adadb49cfd81644ba Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Thu, 30 May 2013 11:47:21 +0100
Subject: [PATCH 175/197] Release notes

---
 docs/topics/release-notes.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index fb14cf5f3..2c6a1a8a8 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -40,6 +40,12 @@ You can determine your currently installed version using `pip freeze`:
 
 ## 2.3.x series
 
+### Master
+
+* Added `get_url` hook to `HyperlinkedIdentityField`.
+* Bugfix: `HyperlinkedIdentityField` should continue to support `pk_url_kwarg`, `slug_url_kwarg`, `slug_field`, in a pending deprecation state.
+* Bugfix: Ensure we always return 404 instead of 500 if a lookup field cannot be converted to the correct lookup type.  (Eg non-numeric `AutoInteger` pk lookup)
+
 ### 2.3.4
 
 **Date**: 24th May 2013

From 233320691e3b75d164e39ede7d63c29ac6c554d4 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Thu, 30 May 2013 11:47:41 +0100
Subject: [PATCH 176/197] Rephrase serializer -> form notes in tutorial

---
 docs/tutorial/1-serialization.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md
index 780ad4b7a..bbb9b73ce 100644
--- a/docs/tutorial/1-serialization.md
+++ b/docs/tutorial/1-serialization.md
@@ -146,7 +146,7 @@ The first thing we need to get started on our Web API is provide a way of serial
 
 The first part of serializer class defines the fields that get serialized/deserialized.  The `restore_object` method defines how fully fledged instances get created when deserializing data.
 
-Notice that we can also use various attributes that would typcially be used on form fields, such as `widget=widgets.Testarea`.  These can be used to control how the serializer should render when displayed as an HTML form.
+Notice that we can also use various attributes that would typically be used on form fields, such as `widget=widgets.Testarea`.  These can be used to control how the serializer should render when displayed as an HTML form.  This is particularly useful for controlling how the browsable API should be displayed, as we'll see later in the tutorial.
 
 We can actually also save ourselves some time by using the `ModelSerializer` class, as we'll see later, but for now we'll keep our serializer definition explicit.  
 

From fdf9a267405d585f37412c004e289a0a8e9b0a5c Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Fri, 31 May 2013 11:14:37 +0100
Subject: [PATCH 177/197] Remove unused test helper module

---
 rest_framework/tests/test_testcases.py | 66 --------------------------
 1 file changed, 66 deletions(-)
 delete mode 100644 rest_framework/tests/test_testcases.py

diff --git a/rest_framework/tests/test_testcases.py b/rest_framework/tests/test_testcases.py
deleted file mode 100644
index f8c2579e6..000000000
--- a/rest_framework/tests/test_testcases.py
+++ /dev/null
@@ -1,66 +0,0 @@
-# http://djangosnippets.org/snippets/1011/
-from __future__ import unicode_literals
-from django.conf import settings
-from django.core.management import call_command
-from django.db.models import loading
-from django.test import TestCase
-
-NO_SETTING = ('!', None)
-
-
-class TestSettingsManager(object):
-    """
-    A class which can modify some Django settings temporarily for a
-    test and then revert them to their original values later.
-
-    Automatically handles resyncing the DB if INSTALLED_APPS is
-    modified.
-
-    """
-    def __init__(self):
-        self._original_settings = {}
-
-    def set(self, **kwargs):
-        for k, v in kwargs.iteritems():
-            self._original_settings.setdefault(k, getattr(settings, k,
-                                                          NO_SETTING))
-            setattr(settings, k, v)
-        if 'INSTALLED_APPS' in kwargs:
-            self.syncdb()
-
-    def syncdb(self):
-        loading.cache.loaded = False
-        call_command('syncdb', verbosity=0)
-
-    def revert(self):
-        for k, v in self._original_settings.iteritems():
-            if v == NO_SETTING:
-                delattr(settings, k)
-            else:
-                setattr(settings, k, v)
-        if 'INSTALLED_APPS' in self._original_settings:
-            self.syncdb()
-        self._original_settings = {}
-
-
-class SettingsTestCase(TestCase):
-    """
-    A subclass of the Django TestCase with a settings_manager
-    attribute which is an instance of TestSettingsManager.
-
-    Comes with a tearDown() method that calls
-    self.settings_manager.revert().
-
-    """
-    def __init__(self, *args, **kwargs):
-        super(SettingsTestCase, self).__init__(*args, **kwargs)
-        self.settings_manager = TestSettingsManager()
-
-    def tearDown(self):
-        self.settings_manager.revert()
-
-
-class TestModelsTestCase(SettingsTestCase):
-    def setUp(self, *args, **kwargs):
-        installed_apps = tuple(settings.INSTALLED_APPS) + ('rest_framework.tests',)
-        self.settings_manager.set(INSTALLED_APPS=installed_apps)

From c36ff4e052f0a6a188100908b03d2c3328fd97bc Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Fri, 31 May 2013 11:17:33 +0100
Subject: [PATCH 178/197] Cleaning up imports and whitespace

---
 rest_framework/tests/models.py              | 2 +-
 rest_framework/tests/test_authentication.py | 4 ++--
 rest_framework/tests/test_routers.py        | 4 ----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/rest_framework/tests/models.py b/rest_framework/tests/models.py
index abf50a2de..e2d4eacdc 100644
--- a/rest_framework/tests/models.py
+++ b/rest_framework/tests/models.py
@@ -162,8 +162,8 @@ class NullableOneToOneSource(RESTFrameworkModel):
     target = models.OneToOneField(OneToOneTarget, null=True, blank=True,
                                   related_name='nullable_source')
 
+
 # Serializer used to test BasicModel
 class BasicModelSerializer(serializers.ModelSerializer):
     class Meta:
         model = BasicModel
-
diff --git a/rest_framework/tests/test_authentication.py b/rest_framework/tests/test_authentication.py
index 90e1f5c40..05e9fbc30 100644
--- a/rest_framework/tests/test_authentication.py
+++ b/rest_framework/tests/test_authentication.py
@@ -48,7 +48,7 @@ urlpatterns = patterns('',
     (r'^token/$', MockView.as_view(authentication_classes=[TokenAuthentication])),
     (r'^auth-token/$', 'rest_framework.authtoken.views.obtain_auth_token'),
     (r'^oauth/$', MockView.as_view(authentication_classes=[OAuthAuthentication])),
-    (r'^oauth-with-scope/$', MockView.as_view(authentication_classes=[OAuthAuthentication], 
+    (r'^oauth-with-scope/$', MockView.as_view(authentication_classes=[OAuthAuthentication],
         permission_classes=[permissions.TokenHasReadWriteScope]))
 )
 
@@ -56,7 +56,7 @@ if oauth2_provider is not None:
     urlpatterns += patterns('',
         url(r'^oauth2/', include('provider.oauth2.urls', namespace='oauth2')),
         url(r'^oauth2-test/$', MockView.as_view(authentication_classes=[OAuth2Authentication])),
-        url(r'^oauth2-with-scope-test/$', MockView.as_view(authentication_classes=[OAuth2Authentication], 
+        url(r'^oauth2-with-scope-test/$', MockView.as_view(authentication_classes=[OAuth2Authentication],
             permission_classes=[permissions.TokenHasReadWriteScope])),
     )
 
diff --git a/rest_framework/tests/test_routers.py b/rest_framework/tests/test_routers.py
index 4e4765cb2..c73f5e726 100644
--- a/rest_framework/tests/test_routers.py
+++ b/rest_framework/tests/test_routers.py
@@ -1,12 +1,10 @@
 from __future__ import unicode_literals
 from django.test import TestCase
 from django.test.client import RequestFactory
-from rest_framework import status
 from rest_framework.response import Response
 from rest_framework import viewsets
 from rest_framework.decorators import link, action
 from rest_framework.routers import SimpleRouter
-import copy
 
 factory = RequestFactory()
 
@@ -51,5 +49,3 @@ class TestSimpleRouter(TestCase):
             else:
                 method_map = 'get'
             self.assertEqual(route.mapping[method_map], endpoint)
-
-

From d7753123f60c6e76c732e02b9caddd57b0683a5a Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Fri, 31 May 2013 11:50:37 +0100
Subject: [PATCH 179/197] HyperlinkedModelSerializer lookup_field option should
 apply to HyperlinkedIdentityField

---
 rest_framework/relations.py          |  5 ++-
 rest_framework/serializers.py        |  2 +
 rest_framework/tests/test_routers.py | 67 +++++++++++++++++++++++++++-
 3 files changed, 70 insertions(+), 4 deletions(-)

diff --git a/rest_framework/relations.py b/rest_framework/relations.py
index 42abf3ca7..4ecf795cb 100644
--- a/rest_framework/relations.py
+++ b/rest_framework/relations.py
@@ -493,8 +493,9 @@ class HyperlinkedIdentityField(Field):
         self.view_name = kwargs.pop('view_name', None)
         # Optionally the format of the target hyperlink may be specified
         self.format = kwargs.pop('format', None)
-
-        self.lookup_field = kwargs.pop('lookup_field', self.lookup_field)
+        lookup_field = kwargs.pop('lookup_field', None)
+        if lookup_field is not None:
+            self.lookup_field = lookup_field
 
         # These are pending deprecation
         if 'pk_url_kwarg' in kwargs:
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 3e5c366ec..4dde0d7c1 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -907,6 +907,8 @@ class HyperlinkedModelSerializer(ModelSerializer):
 
     def __init__(self, *args, **kwargs):
         super(HyperlinkedModelSerializer, self).__init__(*args, **kwargs)
+        lookup_field = self.opts.lookup_field
+        self.fields['url'] = HyperlinkedIdentityField(lookup_field=lookup_field)
         if self.opts.view_name is None:
             self.opts.view_name = self._get_default_view_name(self.opts.model)
 
diff --git a/rest_framework/tests/test_routers.py b/rest_framework/tests/test_routers.py
index c73f5e726..fc3a87e99 100644
--- a/rest_framework/tests/test_routers.py
+++ b/rest_framework/tests/test_routers.py
@@ -1,13 +1,17 @@
 from __future__ import unicode_literals
+from django.db import models
 from django.test import TestCase
 from django.test.client import RequestFactory
-from rest_framework.response import Response
-from rest_framework import viewsets
+from rest_framework import serializers, viewsets
+from rest_framework.compat import include, patterns, url
 from rest_framework.decorators import link, action
+from rest_framework.response import Response
 from rest_framework.routers import SimpleRouter
 
 factory = RequestFactory()
 
+urlpatterns = patterns('',)
+
 
 class BasicViewSet(viewsets.ViewSet):
     def list(self, request, *args, **kwargs):
@@ -49,3 +53,62 @@ class TestSimpleRouter(TestCase):
             else:
                 method_map = 'get'
             self.assertEqual(route.mapping[method_map], endpoint)
+
+
+class RouterTestModel(models.Model):
+    uuid = models.CharField(max_length=20)
+    text = models.CharField(max_length=200)
+
+
+class TestCustomLookupFields(TestCase):
+    """
+    Ensure that custom lookup fields are correctly routed.
+    """
+    urls = 'rest_framework.tests.test_routers'
+
+    def setUp(self):
+        class NoteSerializer(serializers.HyperlinkedModelSerializer):
+            class Meta:
+                model = RouterTestModel
+                lookup_field = 'uuid'
+                fields = ('url', 'uuid', 'text')
+
+        class NoteViewSet(viewsets.ModelViewSet):
+            queryset = RouterTestModel.objects.all()
+            serializer_class = NoteSerializer
+            lookup_field = 'uuid'
+
+        RouterTestModel.objects.create(uuid='123', text='foo bar')
+
+        self.router = SimpleRouter()
+        self.router.register(r'notes', NoteViewSet)
+
+        from rest_framework.tests import test_routers
+        urls = getattr(test_routers, 'urlpatterns')
+        urls += patterns('',
+            url(r'^', include(self.router.urls)),
+        )
+
+    def test_custom_lookup_field_route(self):
+        detail_route = self.router.urls[-1]
+        detail_url_pattern = detail_route.regex.pattern
+        self.assertIn('<uuid>', detail_url_pattern)
+
+    def test_retrieve_lookup_field_list_view(self):
+        response = self.client.get('/notes/')
+        self.assertEquals(response.data,
+            [{
+                "url": "http://testserver/notes/123/",
+                "uuid": "123", "text": "foo bar"
+            }]
+        )
+
+    def test_retrieve_lookup_field_detail_view(self):
+        response = self.client.get('/notes/123/')
+        self.assertEquals(response.data,
+            {
+                "url": "http://testserver/notes/123/",
+                "uuid": "123", "text": "foo bar"
+            }
+        )
+

From 363b342548a41bfdcc3358595cd9d1de288c4962 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Fri, 31 May 2013 12:24:36 +0100
Subject: [PATCH 180/197] Update release notes

---
 docs/topics/release-notes.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 2c6a1a8a8..77cd4f9ea 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -43,6 +43,7 @@ You can determine your currently installed version using `pip freeze`:
 ### Master
 
 * Added `get_url` hook to `HyperlinkedIdentityField`.
+* Bugfix: The `lookup_field` option on `HyperlinkedIdentityField` should apply by default to the url field on the serializer.
 * Bugfix: `HyperlinkedIdentityField` should continue to support `pk_url_kwarg`, `slug_url_kwarg`, `slug_field`, in a pending deprecation state.
 * Bugfix: Ensure we always return 404 instead of 500 if a lookup field cannot be converted to the correct lookup type.  (Eg non-numeric `AutoInteger` pk lookup)
 

From 9154b09eb98593411605a35e6aa342e3c00d63ce Mon Sep 17 00:00:00 2001
From: Craig Teegarden <craig.teegarden@gmail.com>
Date: Fri, 31 May 2013 18:02:47 -0400
Subject: [PATCH 181/197] fix typo

---
 docs/api-guide/filtering.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md
index 4242f40dd..05c997a39 100644
--- a/docs/api-guide/filtering.md
+++ b/docs/api-guide/filtering.md
@@ -231,7 +231,7 @@ Multiple orderings may also be specified:
 
 If an `ordering` attribute is set on the view, this will be used as the default ordering.
 
-Typicaly you'd instead control this by setting `order_by` on the initial queryset, but using the `ordering` parameter on the view allows you to specify the ordering in a way that it can then be passed automatically as context to a rendered template.  This makes it possible to automatically render column headers differently if they are being used to order the results.
+Typically you'd instead control this by setting `order_by` on the initial queryset, but using the `ordering` parameter on the view allows you to specify the ordering in a way that it can then be passed automatically as context to a rendered template.  This makes it possible to automatically render column headers differently if they are being used to order the results.
 
     class UserListView(generics.ListAPIView):
         queryset = User.objects.all()

From b8aec1277c3bfd6d8fdcdd637f06ac6958a03871 Mon Sep 17 00:00:00 2001
From: Menghan <menghan412@gmail.com>
Date: Sun, 2 Jun 2013 12:12:14 +0800
Subject: [PATCH 182/197] fix doc typo

---
 rest_framework/response.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rest_framework/response.py b/rest_framework/response.py
index 3ee52ae01..5877c8a3e 100644
--- a/rest_framework/response.py
+++ b/rest_framework/response.py
@@ -12,7 +12,7 @@ from rest_framework.compat import six
 
 class Response(SimpleTemplateResponse):
     """
-    An HttpResponse that allows it's data to be rendered into
+    An HttpResponse that allows its data to be rendered into
     arbitrary media types.
     """
 

From 8b73dce51da9f87940a6c18aef31020ba7ee14aa Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Sun, 2 Jun 2013 19:50:24 +0100
Subject: [PATCH 183/197] view_name argument to HyperlinkedModelSerializer is
 now properly enforced.  Closes #471

---
 rest_framework/relations.py   | 16 ++++++++--------
 rest_framework/serializers.py | 15 ++++++++++++---
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/rest_framework/relations.py b/rest_framework/relations.py
index 4ecf795cb..e3675b512 100644
--- a/rest_framework/relations.py
+++ b/rest_framework/relations.py
@@ -72,7 +72,6 @@ class RelatedField(WritableField):
                 else:  # Reverse
                     self.queryset = manager.field.rel.to._default_manager.all()
             except Exception:
-                raise
                 msg = ('Serializer related fields must include a `queryset`' +
                        ' argument or set `read_only=True')
                 raise Exception(msg)
@@ -488,14 +487,15 @@ class HyperlinkedIdentityField(Field):
     slug_url_kwarg = None  # Defaults to same as `slug_field` unless overridden
 
     def __init__(self, *args, **kwargs):
-        # TODO: Make view_name mandatory, and have the
-        # HyperlinkedModelSerializer set it on-the-fly
-        self.view_name = kwargs.pop('view_name', None)
-        # Optionally the format of the target hyperlink may be specified
+        try:
+            self.view_name = kwargs.pop('view_name')
+        except KeyError:
+            msg = "HyperlinkedIdentityField requires 'view_name' argument"
+            raise ValueError(msg)
+
         self.format = kwargs.pop('format', None)
         lookup_field = kwargs.pop('lookup_field', None)
-        if lookup_field is not None:
-            self.lookup_field = lookup_field
+        self.lookup_field = lookup_field or self.lookup_field
 
         # These are pending deprecation
         if 'pk_url_kwarg' in kwargs:
@@ -518,7 +518,7 @@ class HyperlinkedIdentityField(Field):
     def field_to_native(self, obj, field_name):
         request = self.context.get('request', None)
         format = self.context.get('format', None)
-        view_name = self.view_name or self.parent.opts.view_name
+        view_name = self.view_name
 
         if request is None:
             warnings.warn("Using `HyperlinkedIdentityField` without including the "
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 4dde0d7c1..a4969f607 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -903,15 +903,24 @@ class HyperlinkedModelSerializer(ModelSerializer):
     _default_view_name = '%(model_name)s-detail'
     _hyperlink_field_class = HyperlinkedRelatedField
 
-    url = HyperlinkedIdentityField()
+    # Just a placeholder to ensure 'url' is the first field
+    # The field itself is actually created on initialization,
+    # when the view_name and lookup_field arguments are available.
+    url = Field()
 
     def __init__(self, *args, **kwargs):
         super(HyperlinkedModelSerializer, self).__init__(*args, **kwargs)
-        lookup_field = self.opts.lookup_field
-        self.fields['url'] = HyperlinkedIdentityField(lookup_field=lookup_field)
+
         if self.opts.view_name is None:
             self.opts.view_name = self._get_default_view_name(self.opts.model)
 
+        url_field = HyperlinkedIdentityField(
+            view_name=self.opts.view_name,
+            lookup_field=self.opts.lookup_field
+        )
+        url_field.initialize(self, 'url')
+        self.fields['url'] = url_field
+
     def _get_default_view_name(self, model):
         """
         Return the view name to use if 'view_name' is not specified in 'Meta'

From 372ad01b74abb3e7872a128719bde4386c98cda4 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Sun, 2 Jun 2013 19:56:15 +0100
Subject: [PATCH 184/197] Test cleanup

---
 rest_framework/tests/test_fields.py     | 41 +++++--------------------
 rest_framework/tests/test_serializer.py | 28 +++++++++++++++++
 2 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/rest_framework/tests/test_fields.py b/rest_framework/tests/test_fields.py
index bff4400b1..3f9560516 100644
--- a/rest_framework/tests/test_fields.py
+++ b/rest_framework/tests/test_fields.py
@@ -11,8 +11,6 @@ from django.db import models
 from django.test import TestCase
 from django.utils.datastructures import SortedDict
 from rest_framework import serializers
-from rest_framework.fields import Field, CharField
-from rest_framework.serializers import Serializer
 from rest_framework.tests.models import RESTFrameworkModel
 
 
@@ -590,7 +588,7 @@ class DecimalFieldTest(TestCase):
         """
         Make sure the serializer works correctly
         """
-        class DecimalSerializer(Serializer):
+        class DecimalSerializer(serializers.Serializer):
             decimal_field = serializers.DecimalField(max_value=9010,
                                                      min_value=9000,
                                                      max_digits=6,
@@ -608,7 +606,7 @@ class DecimalFieldTest(TestCase):
         """
         Make sure max_value violations raises ValidationError
         """
-        class DecimalSerializer(Serializer):
+        class DecimalSerializer(serializers.Serializer):
             decimal_field = serializers.DecimalField(max_value=100)
 
         s = DecimalSerializer(data={'decimal_field': '123'})
@@ -620,7 +618,7 @@ class DecimalFieldTest(TestCase):
         """
         Make sure min_value violations raises ValidationError
         """
-        class DecimalSerializer(Serializer):
+        class DecimalSerializer(serializers.Serializer):
             decimal_field = serializers.DecimalField(min_value=100)
 
         s = DecimalSerializer(data={'decimal_field': '99'})
@@ -632,7 +630,7 @@ class DecimalFieldTest(TestCase):
         """
         Make sure max_digits violations raises ValidationError
         """
-        class DecimalSerializer(Serializer):
+        class DecimalSerializer(serializers.Serializer):
             decimal_field = serializers.DecimalField(max_digits=5)
 
         s = DecimalSerializer(data={'decimal_field': '123.456'})
@@ -644,7 +642,7 @@ class DecimalFieldTest(TestCase):
         """
         Make sure max_decimal_places violations raises ValidationError
         """
-        class DecimalSerializer(Serializer):
+        class DecimalSerializer(serializers.Serializer):
             decimal_field = serializers.DecimalField(decimal_places=3)
 
         s = DecimalSerializer(data={'decimal_field': '123.4567'})
@@ -656,7 +654,7 @@ class DecimalFieldTest(TestCase):
         """
         Make sure max_whole_digits violations raises ValidationError
         """
-        class DecimalSerializer(Serializer):
+        class DecimalSerializer(serializers.Serializer):
             decimal_field = serializers.DecimalField(max_digits=4, decimal_places=3)
 
         s = DecimalSerializer(data={'decimal_field': '12345.6'})
@@ -837,11 +835,11 @@ class URLFieldTests(TestCase):
 
 class FieldMetadata(TestCase):
     def setUp(self):
-        self.required_field = Field()
+        self.required_field = serializers.Field()
         self.required_field.label = uuid4().hex
         self.required_field.required = True
 
-        self.optional_field = Field()
+        self.optional_field = serializers.Field()
         self.optional_field.label = uuid4().hex
         self.optional_field.required = False
 
@@ -854,26 +852,3 @@ class FieldMetadata(TestCase):
     def test_label(self):
         for field in (self.required_field, self.optional_field):
             self.assertEqual(field.metadata()['label'], field.label)
-
-
-class MetadataSerializer(Serializer):
-    field1 = CharField(3, required=True)
-    field2 = CharField(10, required=False)
-
-
-class MetadataSerializerTestCase(TestCase):
-    def setUp(self):
-        self.serializer = MetadataSerializer()
-
-    def test_serializer_metadata(self):
-        metadata = self.serializer.metadata()
-        expected = {
-            'field1': {'required': True,
-                       'max_length': 3,
-                       'type': 'string',
-                       'read_only': False},
-            'field2': {'required': False,
-                       'max_length': 10,
-                       'type': 'string',
-                       'read_only': False}}
-        self.assertEqual(expected, metadata)
diff --git a/rest_framework/tests/test_serializer.py b/rest_framework/tests/test_serializer.py
index f2c31872a..6cc913c5c 100644
--- a/rest_framework/tests/test_serializer.py
+++ b/rest_framework/tests/test_serializer.py
@@ -1528,3 +1528,31 @@ class DefaultValuesOnAutogeneratedFieldsTests(TestCase):
 
     def test_url_field(self):
         self.field_test('url_field')
+
+
+class MetadataSerializer(serializers.Serializer):
+    field1 = serializers.CharField(3, required=True)
+    field2 = serializers.CharField(10, required=False)
+
+
+class MetadataSerializerTestCase(TestCase):
+    def setUp(self):
+        self.serializer = MetadataSerializer()
+
+    def test_serializer_metadata(self):
+        metadata = self.serializer.metadata()
+        expected = {
+            'field1': {
+                'required': True,
+                'max_length': 3,
+                'type': 'string',
+                'read_only': False
+            },
+            'field2': {
+                'required': False,
+                'max_length': 10,
+                'type': 'string',
+                'read_only': False
+            }
+        }
+        self.assertEqual(expected, metadata)

From b15a6ccef2e13ab3310dbe856a945bba56e21c63 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Sun, 2 Jun 2013 20:12:49 +0100
Subject: [PATCH 185/197] Serializer field 'default' argument may be a callable

---
 docs/api-guide/fields.md            |  4 +++-
 docs/topics/release-notes.md        |  1 +
 rest_framework/fields.py            |  8 ++++----
 rest_framework/tests/test_fields.py | 14 ++++++++++++++
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md
index 9820cb403..c7db32edf 100644
--- a/docs/api-guide/fields.md
+++ b/docs/api-guide/fields.md
@@ -41,7 +41,9 @@ Defaults to `True`.
 
 ### `default`
 
-If set, this gives the default value that will be used for the field if none is supplied.  If not set the default behavior is to not populate the attribute at all.
+If set, this gives the default value that will be used for the field if none is supplied.  If not set the default behavior is to not populate the attribute at all. 
+
+May be set to a function or other callable, in which case the value will be evaluated each time it is used.
 
 ### `validators`
 
diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 77cd4f9ea..6eb181603 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -43,6 +43,7 @@ You can determine your currently installed version using `pip freeze`:
 ### Master
 
 * Added `get_url` hook to `HyperlinkedIdentityField`.
+* Serializer field `default` argument may be a callable.
 * Bugfix: The `lookup_field` option on `HyperlinkedIdentityField` should apply by default to the url field on the serializer.
 * Bugfix: `HyperlinkedIdentityField` should continue to support `pk_url_kwarg`, `slug_url_kwarg`, `slug_field`, in a pending deprecation state.
 * Bugfix: Ensure we always return 404 instead of 500 if a lookup field cannot be converted to the correct lookup type.  (Eg non-numeric `AutoInteger` pk lookup)
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 30bbafc41..535aa2ac8 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -250,9 +250,6 @@ class WritableField(Field):
         self.validators = self.default_validators + validators
         self.default = default if default is not None else self.default
 
-        if is_simple_callable(self.default):
-            self.default = self.default()
-
         # Widgets are ony used for HTML forms.
         widget = widget or self.widget
         if isinstance(widget, type):
@@ -298,7 +295,10 @@ class WritableField(Field):
         except KeyError:
             if self.default is not None and not self.partial:
                 # Note: partial updates shouldn't set defaults
-                native = self.default
+                if is_simple_callable(self.default):
+                    native = self.default()
+                else:
+                    native = self.default
             else:
                 if self.required:
                     raise ValidationError(self.error_messages['required'])
diff --git a/rest_framework/tests/test_fields.py b/rest_framework/tests/test_fields.py
index 3f9560516..de3710011 100644
--- a/rest_framework/tests/test_fields.py
+++ b/rest_framework/tests/test_fields.py
@@ -852,3 +852,17 @@ class FieldMetadata(TestCase):
     def test_label(self):
         for field in (self.required_field, self.optional_field):
             self.assertEqual(field.metadata()['label'], field.label)
+
+
+class FieldCallableDefault(TestCase):
+    def setUp(self):
+        self.simple_callable = lambda: 'foo bar'
+
+    def test_default_can_be_simple_callable(self):
+        """
+        Ensure that the 'default' argument can also be a simple callable.
+        """
+        field = serializers.WritableField(default=self.simple_callable)
+        into = {}
+        field.field_from_native({}, {}, 'field', into)
+        self.assertEquals(into, {'field': 'foo bar'})

From 9d4fc3226e5e730ac29528a7e84bcdbb7d2e1f44 Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy <xordoquy@linovia.com>
Date: Sun, 2 Jun 2013 21:34:12 +0200
Subject: [PATCH 186/197] Upgraded the django-oauth2-provider.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 94f69cae5..6a4532411 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ install:
   - pip install defusedxml==0.3
   - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install oauth2==1.5.211 --use-mirrors; fi"
   - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth-plus==2.0 --use-mirrors; fi"
-  - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth2-provider==0.2.3 --use-mirrors; fi"
+  - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth2-provider==0.2.4 --use-mirrors; fi"
   - "if [[ ${DJANGO::11} == 'django==1.3' ]]; then pip install django-filter==0.5.4 --use-mirrors; fi"
   - "if [[ ${DJANGO::11} != 'django==1.3' ]]; then pip install django-filter==0.6 --use-mirrors; fi"
   - export PYTHONPATH=.

From 959ece66e5718ab4586ba4810b13ecaa0f1e571f Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Sun, 2 Jun 2013 20:43:20 +0100
Subject: [PATCH 187/197] Added @aburgel for work on #887. Thank you :)

---
 docs/topics/credits.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index 1271fe45d..2552af192 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -137,6 +137,7 @@ The following people have helped make REST framework great.
 * Michal Dvořák - [mikee2185]
 * Markus Törnqvist - [mjtorn]
 * Pascal Borreli - [pborreli]
+* Alex Burgel - [aburgel]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -310,3 +311,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [mikee2185]: https://github.com/mikee2185
 [mjtorn]: https://github.com/mjtorn
 [pborreli]: https://github.com/pborreli
+[aburgel]: https://github.com/aburgel

From a3796f430b96abe71f2f99f566d9f7655e89f268 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Sun, 2 Jun 2013 21:04:47 +0100
Subject: [PATCH 188/197] Only use test import munging prior to Django 1.6's
 new test runner

---
 rest_framework/tests/tests.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/rest_framework/tests/tests.py b/rest_framework/tests/tests.py
index 08f88e113..554ebd1ad 100644
--- a/rest_framework/tests/tests.py
+++ b/rest_framework/tests/tests.py
@@ -4,11 +4,13 @@ runner to pick up the tests.  Yowzers.
 """
 from __future__ import unicode_literals
 import os
+import django
 
 modules = [filename.rsplit('.', 1)[0]
            for filename in os.listdir(os.path.dirname(__file__))
            if filename.endswith('.py') and not filename.startswith('_')]
 __test__ = dict()
 
-for module in modules:
-    exec("from rest_framework.tests.%s import *" % module)
+if django.VERSION < (1, 6):
+    for module in modules:
+        exec("from rest_framework.tests.%s import *" % module)

From b10869a08b4effac9b8df1d776e6ffb882a1a742 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Sun, 2 Jun 2013 21:14:02 +0100
Subject: [PATCH 189/197] Add Django 1.6 to docs and to tox

---
 README.md     |  2 +-
 docs/index.md |  2 +-
 tox.ini       | 32 +++++++++++++++++++++++++++++++-
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 94996c39d..12ed09f9f 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ There is a live example API for testing purposes, [available here][sandbox].
 # Requirements
 
 * Python (2.6.5+, 2.7, 3.2, 3.3)
-* Django (1.3, 1.4, 1.5)
+* Django (1.3, 1.4, 1.5, 1.6)
 
 # Installation
 
diff --git a/docs/index.md b/docs/index.md
index 78259a004..d944ddd4b 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -32,7 +32,7 @@ There is a live example API for testing purposes, [available here][sandbox].
 REST framework requires the following:
 
 * Python (2.6.5+, 2.7, 3.2, 3.3)
-* Django (1.3, 1.4, 1.5)
+* Django (1.3, 1.4, 1.5, 1.6)
 
 The following packages are optional:
 
diff --git a/tox.ini b/tox.ini
index d62359a54..27db9a8a6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,40 @@
 [tox]
 downloadcache = {toxworkdir}/cache/
-envlist = py3.3-django1.5,py3.2-django1.5,py2.7-django1.5,py2.6-django1.5,py2.7-django1.4,py2.6-django1.4,py2.7-django1.3,py2.6-django1.3
+envlist = py3.3-django1.6,py3.2-django1.6,py2.7-django1.6,py2.6-django1.6,py3.3-django1.5,py3.2-django1.5,py2.7-django1.5,py2.6-django1.5,py2.7-django1.4,py2.6-django1.4,py2.7-django1.3,py2.6-django1.3
 
 [testenv]
 commands = {envpython} rest_framework/runtests/runtests.py
 
+[testenv:py3.3-django1.6]
+basepython = python3.3
+deps = https://www.djangoproject.com/download/1.6a1/tarball/
+       django-filter==0.6a1
+       defusedxml==0.3
+
+[testenv:py3.2-django1.6]
+basepython = python3.2
+deps = https://www.djangoproject.com/download/1.6a1/tarball/
+       django-filter==0.6a1
+       defusedxml==0.3
+
+[testenv:py2.7-django1.6]
+basepython = python2.7
+deps = https://www.djangoproject.com/download/1.6a1/tarball/
+       django-filter==0.6a1
+       defusedxml==0.3
+       django-oauth-plus==2.0
+       oauth2==1.5.211
+       django-oauth2-provider==0.2.3
+
+[testenv:py2.6-django1.6]
+basepython = python2.6
+deps = https://www.djangoproject.com/download/1.6a1/tarball/
+       django-filter==0.6a1
+       defusedxml==0.3
+       django-oauth-plus==2.0
+       oauth2==1.5.211
+       django-oauth2-provider==0.2.3
+
 [testenv:py3.3-django1.5]
 basepython = python3.3
 deps = django==1.5

From 11cbf8dca2fe54ae9c27040be70157b88ec75541 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 3 Jun 2013 09:50:29 +0200
Subject: [PATCH 190/197] Added @copitux for work on #900. Thanks! :)

---
 docs/topics/credits.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index 2552af192..bbe209c74 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -138,6 +138,7 @@ The following people have helped make REST framework great.
 * Markus Törnqvist - [mjtorn]
 * Pascal Borreli - [pborreli]
 * Alex Burgel - [aburgel]
+* David Medina - [copitux]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -312,3 +313,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [mjtorn]: https://github.com/mjtorn
 [pborreli]: https://github.com/pborreli
 [aburgel]: https://github.com/aburgel
+[copitux]: https://github.com/copitux

From 6e0567c271ca2b68b5c53778692066a799fb2df6 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 3 Jun 2013 12:32:57 +0100
Subject: [PATCH 191/197] request.user should be still be accessible in
 renderer context if authentication fails

---
 docs/api-guide/authentication.md            |  2 +-
 optionals.txt                               |  2 +-
 rest_framework/request.py                   | 33 ++++++++++-------
 rest_framework/tests/test_authentication.py | 39 +++++++++++++++++++++
 4 files changed, 61 insertions(+), 15 deletions(-)

diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md
index 6888ac4e8..09491f021 100755
--- a/docs/api-guide/authentication.md
+++ b/docs/api-guide/authentication.md
@@ -333,7 +333,7 @@ The following example will authenticate any incoming request as the user given b
             try:
                 user = User.objects.get(username=username)
             except User.DoesNotExist:
-                raise authenticate.AuthenticationFailed('No such user')
+                raise exceptions.AuthenticationFailed('No such user')
             
             return (user, None)
 
diff --git a/optionals.txt b/optionals.txt
index 1853f74b2..4ebfceab4 100644
--- a/optionals.txt
+++ b/optionals.txt
@@ -4,4 +4,4 @@ defusedxml>=0.3
 django-filter>=0.5.4
 django-oauth-plus>=2.0
 oauth2>=1.5.211
-django-oauth2-provider>=0.2.3
+django-oauth2-provider>=0.2.4
diff --git a/rest_framework/request.py b/rest_framework/request.py
index a434659c1..0d88ebc7e 100644
--- a/rest_framework/request.py
+++ b/rest_framework/request.py
@@ -173,7 +173,7 @@ class Request(object):
         by the authentication classes provided to the request.
         """
         if not hasattr(self, '_user'):
-            self._authenticator, self._user, self._auth = self._authenticate()
+            self._authenticate()
         return self._user
 
     @user.setter
@@ -192,7 +192,7 @@ class Request(object):
         request, such as an authentication token.
         """
         if not hasattr(self, '_auth'):
-            self._authenticator, self._user, self._auth = self._authenticate()
+            self._authenticate()
         return self._auth
 
     @auth.setter
@@ -210,7 +210,7 @@ class Request(object):
         to authenticate the request, or `None`.
         """
         if not hasattr(self, '_authenticator'):
-            self._authenticator, self._user, self._auth = self._authenticate()
+            self._authenticate()
         return self._authenticator
 
     def _load_data_and_files(self):
@@ -330,11 +330,18 @@ class Request(object):
         Returns a three-tuple of (authenticator, user, authtoken).
         """
         for authenticator in self.authenticators:
-            user_auth_tuple = authenticator.authenticate(self)
+            try:
+                user_auth_tuple = authenticator.authenticate(self)
+            except exceptions.APIException:
+                self._not_authenticated()
+                raise
+
             if not user_auth_tuple is None:
-                user, auth = user_auth_tuple
-                return (authenticator, user, auth)
-        return self._not_authenticated()
+                self._authenticator = authenticator
+                self._user, self._auth = user_auth_tuple
+                return
+
+        self._not_authenticated()
 
     def _not_authenticated(self):
         """
@@ -343,17 +350,17 @@ class Request(object):
 
         By default this will be (None, AnonymousUser, None).
         """
+        self._authenticator = None
+
         if api_settings.UNAUTHENTICATED_USER:
-            user = api_settings.UNAUTHENTICATED_USER()
+            self._user = api_settings.UNAUTHENTICATED_USER()
         else:
-            user = None
+            self._user = None
 
         if api_settings.UNAUTHENTICATED_TOKEN:
-            auth = api_settings.UNAUTHENTICATED_TOKEN()
+            self._auth = api_settings.UNAUTHENTICATED_TOKEN()
         else:
-            auth = None
-
-        return (None, user, auth)
+            self._auth = None
 
     def __getattr__(self, attr):
         """
diff --git a/rest_framework/tests/test_authentication.py b/rest_framework/tests/test_authentication.py
index 05e9fbc30..d46ac0798 100644
--- a/rest_framework/tests/test_authentication.py
+++ b/rest_framework/tests/test_authentication.py
@@ -6,6 +6,8 @@ from django.utils import unittest
 from rest_framework import HTTP_HEADER_ENCODING
 from rest_framework import exceptions
 from rest_framework import permissions
+from rest_framework import renderers
+from rest_framework.response import Response
 from rest_framework import status
 from rest_framework.authentication import (
     BaseAuthentication,
@@ -553,3 +555,40 @@ class OAuth2Tests(TestCase):
         auth = self._create_authorization_header(token=read_write_access_token.token)
         response = self.csrf_client.post('/oauth2-with-scope-test/', HTTP_AUTHORIZATION=auth)
         self.assertEqual(response.status_code, 200)
+
+
+class FailingAuthAccessedInRenderer(TestCase):
+    def setUp(self):
+        class AuthAccessingRenderer(renderers.BaseRenderer):
+            media_type = 'text/plain'
+            format = 'txt'
+
+            def render(self, data, media_type=None, renderer_context=None):
+                request = renderer_context['request']
+                if request.user.is_authenticated():
+                    return b'authenticated'
+                return b'not authenticated'
+
+        class FailingAuth(BaseAuthentication):
+            def authenticate(self, request):
+                raise exceptions.AuthenticationFailed('authentication failed')
+
+        class ExampleView(APIView):
+            authentication_classes = (FailingAuth,)
+            renderer_classes = (AuthAccessingRenderer,)
+
+            def get(self, request):
+                return Response({'foo': 'bar'})
+
+        self.view = ExampleView.as_view()
+
+    def test_failing_auth_accessed_in_renderer(self):
+        """
+        When authentication fails the renderer should still be able to access
+        `request.user` without raising an exception. Particularly relevant
+        to HTML responses that might reasonably access `request.user`.
+        """
+        request = factory.get('/')
+        response = self.view(request)
+        content = response.render().content
+        self.assertEqual(content, b'not authenticated')

From 28c2c46a031808f116af50d777b1b696a3c5ccc7 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 3 Jun 2013 12:34:18 +0100
Subject: [PATCH 192/197] Version 2.3.5

---
 docs/topics/release-notes.md | 5 ++++-
 rest_framework/__init__.py   | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 005538aea..9ac51f42e 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -40,11 +40,14 @@ You can determine your currently installed version using `pip freeze`:
 
 ## 2.3.x series
 
-### Master
+### 2.3.5
+
+**Date**: 3rd June 2013
 
 * Added `get_url` hook to `HyperlinkedIdentityField`.
 * Serializer field `default` argument may be a callable.
 * `@action` decorator now accepts a `methods` argument.
+* Bugfix: `request.user` should be still be accessible in renderer context if authentication fails.
 * Bugfix: The `lookup_field` option on `HyperlinkedIdentityField` should apply by default to the url field on the serializer.
 * Bugfix: `HyperlinkedIdentityField` should continue to support `pk_url_kwarg`, `slug_url_kwarg`, `slug_field`, in a pending deprecation state.
 * Bugfix: Ensure we always return 404 instead of 500 if a lookup field cannot be converted to the correct lookup type.  (Eg non-numeric `AutoInteger` pk lookup)
diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py
index 59046733b..0a2101863 100644
--- a/rest_framework/__init__.py
+++ b/rest_framework/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '2.3.4'
+__version__ = '2.3.5'
 
 VERSION = __version__  # synonym
 

From 478f6ff94a6f4ce68bae5133def0e7a042f3c85a Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 3 Jun 2013 21:21:47 +0100
Subject: [PATCH 193/197] Regression test for #840. Closes #840.

---
 rest_framework/tests/test_serializer.py | 31 +++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/rest_framework/tests/test_serializer.py b/rest_framework/tests/test_serializer.py
index 6cc913c5c..ecaa7255f 100644
--- a/rest_framework/tests/test_serializer.py
+++ b/rest_framework/tests/test_serializer.py
@@ -1556,3 +1556,34 @@ class MetadataSerializerTestCase(TestCase):
             }
         }
         self.assertEqual(expected, metadata)
+
+
+class SimpleModel(models.Model):
+    text = models.CharField(max_length=100)
+
+
+class SimpleModelSerializer(serializers.ModelSerializer):
+    text = serializers.CharField()
+    other = serializers.CharField()
+
+    class Meta:
+        model = SimpleModel
+
+    def validate_other(self, attrs, source):
+        del attrs['other']
+        return attrs
+
+class FieldValidationRemovingAttr(TestCase):
+    def test_removing_non_model_field_in_validation(self):
+        """
+        Removing an attr during field valiation should ensure that it is not
+        passed through when restoring the object.
+
+        This allows additional non-model fields to be supported.
+
+        Regression test for #840.
+        """
+        serializer = SimpleModelSerializer(data={'text': 'foo', 'other': 'bar'})
+        self.assertTrue(serializer.is_valid())
+        serializer.save()
+        self.assertEqual(serializer.object.text, 'foo')

From c160e49321d77c6b1b99fc898e2624760edc137b Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Tue, 4 Jun 2013 14:05:35 +0100
Subject: [PATCH 194/197] Test cases and fix for plain-list relationships (ie
 not queryset) Closes #878.

---
 rest_framework/relations.py             | 16 +++++++--
 rest_framework/tests/test_serializer.py | 44 +++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/rest_framework/relations.py b/rest_framework/relations.py
index e3675b512..edaf76d6e 100644
--- a/rest_framework/relations.py
+++ b/rest_framework/relations.py
@@ -12,7 +12,7 @@ from django.db.models.fields import BLANK_CHOICE_DASH
 from django.forms import widgets
 from django.forms.models import ModelChoiceIterator
 from django.utils.translation import ugettext_lazy as _
-from rest_framework.fields import Field, WritableField, get_component
+from rest_framework.fields import Field, WritableField, get_component, is_simple_callable
 from rest_framework.reverse import reverse
 from rest_framework.compat import urlparse
 from rest_framework.compat import smart_text
@@ -144,7 +144,12 @@ class RelatedField(WritableField):
             return None
 
         if self.many:
-            return [self.to_native(item) for item in value.all()]
+            if is_simple_callable(getattr(value, 'all', None)):
+                return [self.to_native(item) for item in value.all()]
+            else:
+                # Also support non-queryset iterables.
+                # This allows us to also support plain lists of related items.
+                return [self.to_native(item) for item in value]
         return self.to_native(value)
 
     def field_from_native(self, data, files, field_name, into):
@@ -242,7 +247,12 @@ class PrimaryKeyRelatedField(RelatedField):
                     queryset = get_component(queryset, component)
 
             # Forward relationship
-            return [self.to_native(item.pk) for item in queryset.all()]
+            if is_simple_callable(getattr(queryset, 'all', None)):
+                return [self.to_native(item.pk) for item in queryset.all()]
+            else:
+                # Also support non-queryset iterables.
+                # This allows us to also support plain lists of related items.
+                return [self.to_native(item.pk) for item in queryset]
 
         # To-one relationship
         try:
diff --git a/rest_framework/tests/test_serializer.py b/rest_framework/tests/test_serializer.py
index ecaa7255f..8b87a0847 100644
--- a/rest_framework/tests/test_serializer.py
+++ b/rest_framework/tests/test_serializer.py
@@ -1558,6 +1558,8 @@ class MetadataSerializerTestCase(TestCase):
         self.assertEqual(expected, metadata)
 
 
+### Regression test for #840
+
 class SimpleModel(models.Model):
     text = models.CharField(max_length=100)
 
@@ -1573,6 +1575,7 @@ class SimpleModelSerializer(serializers.ModelSerializer):
         del attrs['other']
         return attrs
 
+
 class FieldValidationRemovingAttr(TestCase):
     def test_removing_non_model_field_in_validation(self):
         """
@@ -1587,3 +1590,44 @@ class FieldValidationRemovingAttr(TestCase):
         self.assertTrue(serializer.is_valid())
         serializer.save()
         self.assertEqual(serializer.object.text, 'foo')
+
+
+### Regression test for #878
+
+class SimpleTargetModel(models.Model):
+    text = models.CharField(max_length=100)
+
+
+class SimplePKSourceModelSerializer(serializers.Serializer):
+    targets = serializers.PrimaryKeyRelatedField(queryset=SimpleTargetModel.objects.all(), many=True)
+    text = serializers.CharField()
+
+
+class SimpleSlugSourceModelSerializer(serializers.Serializer):
+    targets = serializers.SlugRelatedField(queryset=SimpleTargetModel.objects.all(), many=True, slug_field='pk')
+    text = serializers.CharField()
+
+
+class SerializerSupportsManyRelationships(TestCase):
+    def setUp(self):
+        SimpleTargetModel.objects.create(text='foo')
+        SimpleTargetModel.objects.create(text='bar')
+
+    def test_serializer_supports_pk_many_relationships(self):
+        """
+        Regression test for #878.
+
+        Note that pk behavior has a different code path to usual cases,
+        for performance reasons.
+        """
+        serializer = SimplePKSourceModelSerializer(data={'text': 'foo', 'targets': [1, 2]})
+        self.assertTrue(serializer.is_valid())
+        self.assertEqual(serializer.data, {'text': 'foo', 'targets': [1, 2]})
+
+    def test_serializer_supports_slug_many_relationships(self):
+        """
+        Regression test for #878.
+        """
+        serializer = SimpleSlugSourceModelSerializer(data={'text': 'foo', 'targets': [1, 2]})
+        self.assertTrue(serializer.is_valid())
+        self.assertEqual(serializer.data, {'text': 'foo', 'targets': [1, 2]})

From ffa27b840f66d24562de9f66a9ac7a4142da51db Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Tue, 4 Jun 2013 20:23:16 +0100
Subject: [PATCH 195/197] Fix ModelField docs.  Closes #909.

---
 docs/api-guide/fields.md | 4 +++-
 docs/index.md            | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md
index c7db32edf..94fff7e21 100644
--- a/docs/api-guide/fields.md
+++ b/docs/api-guide/fields.md
@@ -117,7 +117,9 @@ A field that supports both read and write operations.  By itself `WritableField`
 
 A generic field that can be tied to any arbitrary model field.  The `ModelField` class delegates the task of serialization/deserialization to it's associated model field.  This field can be used to create serializer fields for custom model fields, without having to create a new custom serializer field.
 
-**Signature:** `ModelField(model_field=<Django ModelField class>)`
+The `ModelField` class is generally intended for internal use, but can be used by your API if needed.  In order to properly instantiate a `ModelField`, it must be passed a field that is attached to an instantiated model.  For example: `ModelField(model_field=MyModel()._meta.get_field('custom_field'))`
+
+**Signature:** `ModelField(model_field=<Django ModelField instance>)`
 
 ## SerializerMethodField
 
diff --git a/docs/index.md b/docs/index.md
index d944ddd4b..0fb5706e1 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,10 +1,10 @@
 <p class="badges">
 <iframe src="http://ghbtns.com/github-btn.html?user=tomchristie&amp;repo=django-rest-framework&amp;type=watch&amp;count=true" class="github-star-button" allowtransparency="true" frameborder="0" scrolling="0" width="110px" height="20px"></iframe>
 
-<a href="https://twitter.com/share" class="twitter-share-button" data-url="django-rest-framework.org" data-text="Checking out the totally awesome Django REST framework! http://django-rest-framework.org" data-count="none">Tweet</a>
+<a href="https://twitter.com/share" class="twitter-share-button" data-url="django-rest-framework.org" data-text="Checking out the totally awesome Django REST framework! http://django-rest-framework.org" data-count="none"></a>
 <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="http://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
 
-<img alt="Travis build image" src="https://secure.travis-ci.org/tomchristie/django-rest-framework.png?branch=master" class="travis-build-image">
+<img src="https://secure.travis-ci.org/tomchristie/django-rest-framework.png?branch=master" class="travis-build-image">
 </p>
 
 # Django REST framework

From f1251e8c58e86db11028396d79f01db5dfcf9e52 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Tue, 4 Jun 2013 20:59:12 +0100
Subject: [PATCH 196/197] Added trailing_slash argument to routers.  Closes
 #905

---
 docs/api-guide/routers.md            | 13 ++++++++++-
 docs/css/default.css                 |  1 +
 rest_framework/routers.py            | 17 ++++++++++----
 rest_framework/tests/test_routers.py | 35 +++++++++++++++++++++++++---
 4 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md
index 3c3a6ae3f..f16fa9468 100644
--- a/docs/api-guide/routers.md
+++ b/docs/api-guide/routers.md
@@ -66,6 +66,13 @@ This router includes routes for the standard set of `list`, `create`, `retrieve`
     <tr><td>POST</td><td>@action decorated method</td></tr>
 </table>
 
+By default the URLs created by `SimpleRouter` are appending with a trailing slash.
+This behavior can be modified by setting the `trailing_slash` argument to `False` when instantiating the router.  For example:
+
+    router = SimpleRouter(trailing_slash=False)
+
+Trailing slashes are conventional in Django, but are not used by default in some other frameworks such as Rails.  Which style you choose to use is largely a matter of preference, although some javascript frameworks may expect a particular routing style.
+
 ## DefaultRouter
 
 This router is similar to `SimpleRouter` as above, but additionally includes a default API root view, that returns a response containing hyperlinks to all the list views.  It also generates routes for optional `.json` style format suffixes.
@@ -83,6 +90,10 @@ This router is similar to `SimpleRouter` as above, but additionally includes a d
     <tr><td>POST</td><td>@action decorated method</td></tr>
 </table>
 
+As with `SimpleRouter` the trailing slashs on the URL routes can be removed by setting the `trailing_slash` argument to `False` when instantiating the router.
+
+    router = DefaultRouter(trailing_slash=False)
+
 # Custom Routers
 
 Implementing a custom router isn't something you'd need to do very often, but it can be useful if you have specific requirements about how the your URLs for your API are strutured.  Doing so allows you to encapsulate the URL structure in a reusable way that ensures you don't have to write your URL patterns explicitly for each new view.
@@ -91,7 +102,7 @@ The simplest way to implement a custom router is to subclass one of the existing
 
 ## Example
 
-The following example will only route to the `list` and `retrieve` actions, and unlike the routers included by REST framework, it does not use the trailing slash convention.
+The following example will only route to the `list` and `retrieve` actions, and does not use the trailing slash convention.
 
     class ReadOnlyRouter(SimpleRouter):
         """
diff --git a/docs/css/default.css b/docs/css/default.css
index 5c6c72ced..a4f05daa8 100644
--- a/docs/css/default.css
+++ b/docs/css/default.css
@@ -301,4 +301,5 @@ td, th {
 
 table {
   border-color: white;
+  margin-bottom: 0.6em;
 }
diff --git a/rest_framework/routers.py b/rest_framework/routers.py
index 6c5fd0048..9764e5692 100644
--- a/rest_framework/routers.py
+++ b/rest_framework/routers.py
@@ -18,7 +18,6 @@ from __future__ import unicode_literals
 from collections import namedtuple
 from rest_framework import views
 from rest_framework.compat import patterns, url
-from rest_framework.decorators import api_view
 from rest_framework.response import Response
 from rest_framework.reverse import reverse
 from rest_framework.urlpatterns import format_suffix_patterns
@@ -72,7 +71,7 @@ class SimpleRouter(BaseRouter):
     routes = [
         # List route.
         Route(
-            url=r'^{prefix}/$',
+            url=r'^{prefix}{trailing_slash}$',
             mapping={
                 'get': 'list',
                 'post': 'create'
@@ -82,7 +81,7 @@ class SimpleRouter(BaseRouter):
         ),
         # Detail route.
         Route(
-            url=r'^{prefix}/{lookup}/$',
+            url=r'^{prefix}/{lookup}{trailing_slash}$',
             mapping={
                 'get': 'retrieve',
                 'put': 'update',
@@ -95,7 +94,7 @@ class SimpleRouter(BaseRouter):
         # Dynamically generated routes.
         # Generated using @action or @link decorators on methods of the viewset.
         Route(
-            url=r'^{prefix}/{lookup}/{methodname}/$',
+            url=r'^{prefix}/{lookup}/{methodname}{trailing_slash}$',
             mapping={
                 '{httpmethod}': '{methodname}',
             },
@@ -104,6 +103,10 @@ class SimpleRouter(BaseRouter):
         ),
     ]
 
+    def __init__(self, trailing_slash=True):
+        self.trailing_slash = trailing_slash and '/' or ''
+        super(SimpleRouter, self).__init__()
+
     def get_default_base_name(self, viewset):
         """
         If `base_name` is not specified, attempt to automatically determine
@@ -193,7 +196,11 @@ class SimpleRouter(BaseRouter):
                     continue
 
                 # Build the url pattern
-                regex = route.url.format(prefix=prefix, lookup=lookup)
+                regex = route.url.format(
+                    prefix=prefix,
+                    lookup=lookup,
+                    trailing_slash=self.trailing_slash
+                )
                 view = viewset.as_view(mapping, **route.initkwargs)
                 name = route.name.format(basename=basename)
                 ret.append(url(regex, view, name=name))
diff --git a/rest_framework/tests/test_routers.py b/rest_framework/tests/test_routers.py
index 10d3cc25a..a7534f70b 100644
--- a/rest_framework/tests/test_routers.py
+++ b/rest_framework/tests/test_routers.py
@@ -50,7 +50,7 @@ class TestSimpleRouter(TestCase):
             route = decorator_routes[i]
             # check url listing
             self.assertEqual(route.url,
-                             '^{{prefix}}/{{lookup}}/{0}/$'.format(endpoint))
+                             '^{{prefix}}/{{lookup}}/{0}{{trailing_slash}}$'.format(endpoint))
             # check method to function mapping
             if endpoint == 'action3':
                 methods_map = ['post', 'delete']
@@ -103,7 +103,7 @@ class TestCustomLookupFields(TestCase):
 
     def test_retrieve_lookup_field_list_view(self):
         response = self.client.get('/notes/')
-        self.assertEquals(response.data,
+        self.assertEqual(response.data,
             [{
                 "url": "http://testserver/notes/123/",
                 "uuid": "123", "text": "foo bar"
@@ -112,10 +112,39 @@ class TestCustomLookupFields(TestCase):
 
     def test_retrieve_lookup_field_detail_view(self):
         response = self.client.get('/notes/123/')
-        self.assertEquals(response.data,
+        self.assertEqual(response.data,
             {
                 "url": "http://testserver/notes/123/",
                 "uuid": "123", "text": "foo bar"
             }
         )
 
+
+class TestTrailingSlash(TestCase):
+    def setUp(self):
+        class NoteViewSet(viewsets.ModelViewSet):
+            model = RouterTestModel
+
+        self.router = SimpleRouter()
+        self.router.register(r'notes', NoteViewSet)
+        self.urls = self.router.urls
+
+    def test_urls_have_trailing_slash_by_default(self):
+        expected = ['^notes/$', '^notes/(?P<pk>[^/]+)/$']
+        for idx in range(len(expected)):
+            self.assertEqual(expected[idx], self.urls[idx].regex.pattern)
+
+
+class TestTrailingSlash(TestCase):
+    def setUp(self):
+        class NoteViewSet(viewsets.ModelViewSet):
+            model = RouterTestModel
+
+        self.router = SimpleRouter(trailing_slash=False)
+        self.router.register(r'notes', NoteViewSet)
+        self.urls = self.router.urls
+
+    def test_urls_can_have_trailing_slash_removed(self):
+        expected = ['^notes$', '^notes/(?P<pk>[^/]+)$']
+        for idx in range(len(expected)):
+            self.assertEqual(expected[idx], self.urls[idx].regex.pattern)

From 2ca243a1144bb2a5461767a21ed14dec1d2b8dc2 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Wed, 5 Jun 2013 13:20:06 +0100
Subject: [PATCH 197/197] Fix up tests and tox

---
 rest_framework/tests/test_fields.py | 2 +-
 tox.ini                             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rest_framework/tests/test_fields.py b/rest_framework/tests/test_fields.py
index de3710011..69a0468e0 100644
--- a/rest_framework/tests/test_fields.py
+++ b/rest_framework/tests/test_fields.py
@@ -865,4 +865,4 @@ class FieldCallableDefault(TestCase):
         field = serializers.WritableField(default=self.simple_callable)
         into = {}
         field.field_from_native({}, {}, 'field', into)
-        self.assertEquals(into, {'field': 'foo bar'})
+        self.assertEqual(into, {'field': 'foo bar'})
diff --git a/tox.ini b/tox.ini
index 27db9a8a6..aa97fd350 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,7 +24,7 @@ deps = https://www.djangoproject.com/download/1.6a1/tarball/
        defusedxml==0.3
        django-oauth-plus==2.0
        oauth2==1.5.211
-       django-oauth2-provider==0.2.3
+       django-oauth2-provider==0.2.4
 
 [testenv:py2.6-django1.6]
 basepython = python2.6
@@ -33,7 +33,7 @@ deps = https://www.djangoproject.com/download/1.6a1/tarball/
        defusedxml==0.3
        django-oauth-plus==2.0
        oauth2==1.5.211
-       django-oauth2-provider==0.2.3
+       django-oauth2-provider==0.2.4
 
 [testenv:py3.3-django1.5]
 basepython = python3.3