Merge branch 'master' into requests-client

Author: lovelydinosaur

README.md

@@ -18,8 +18,7 @@ REST framework commercially we strongly encourage you to invest in its
 continued development by **[signing up for a paid plan][funding]**.
 
 The initial aim is to provide a single full-time position on REST framework.
-Right now we're over 58% of the way towards achieving that.
-*Every single sign-up makes a significant impact.*
+*Every single sign-up makes a significant impact towards making that possible.*
 
 <p align="center">
   <a href="http://jobs.rover.com/"><img src="https://raw.githubusercontent.com/tomchristie/django-rest-framework/master/docs/img/premium/rover-readme.png"/></a>

docs/api-guide/fields.md

@@ -49,7 +49,9 @@ Defaults to `False`
 
 ### `default`
 
-If set, this gives the default value that will be used for the field if no input value 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 no input value is supplied. If not set the default behaviour is to not populate the attribute at all.
+
+The `default` is not applied during partial update operations. In the partial update case only fields that are provided in the incoming data will have a validated value returned.
 
 May be set to a function or other callable, in which case the value will be evaluated each time it is used. When called, it will receive no arguments. If the callable has a `set_context` method, that will be called each time before getting the value with the field instance as only argument. This works the same way as for [validators](validators.md#using-set_context).
 
@@ -486,7 +488,7 @@ This field is used by default with `ModelSerializer` when including field names
 
 **Signature**: `ReadOnlyField()`
 
-For example, is `has_expired` was a property on the `Account` model, then the following serializer would automatically generate it as a `ReadOnlyField`:
+For example, if `has_expired` was a property on the `Account` model, then the following serializer would automatically generate it as a `ReadOnlyField`:
 
     class AccountSerializer(serializers.ModelSerializer):
         class Meta:

docs/api-guide/filtering.md

@@ -241,7 +241,6 @@ 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.
 
 ---
 

docs/api-guide/permissions.md

@@ -132,7 +132,7 @@ This permission is suitable if you want to your API to allow read permissions to
 
 ## DjangoModelPermissions
 
-This permission class ties into Django's standard `django.contrib.auth` [model permissions][contribauth].  This permission must only be applied to views that has a `.queryset` property set. Authorization will only be granted if the user *is authenticated* and has the *relevant model permissions* assigned.
+This permission class ties into Django's standard `django.contrib.auth` [model permissions][contribauth].  This permission must only be applied to views that have a `.queryset` property set. Authorization will only be granted if the user *is authenticated* and has the *relevant model permissions* assigned.
 
 * `POST` requests require the user to have the `add` permission on the model.
 * `PUT` and `PATCH` requests require the user to have the `change` permission on the model.

docs/api-guide/throttling.md

@@ -184,6 +184,8 @@ If the `.wait()` method is implemented and the request is throttled, then a `Ret
 
 The following is an example of a rate throttle, that will randomly throttle 1 in every 10 requests.
 
+    import random
+
     class RandomRateThrottle(throttling.BaseThrottle):
         def allow_request(self, request, view):
             return random.randint(1, 10) == 1

docs/api-guide/validators.md

@@ -64,6 +64,8 @@ It takes a single required argument, and an optional `messages` argument:
 
 This validator should be applied to *serializer fields*, like so:
 
+    from rest_framework.validators import UniqueValidator
+
     slug = SlugField(
         max_length=100,
         validators=[UniqueValidator(queryset=BlogPost.objects.all())]
@@ -80,6 +82,8 @@ It has two required arguments, and a single optional `messages` argument:
 
 The validator should be applied to *serializer classes*, like so:
 
+    from rest_framework.validators import UniqueTogetherValidator
+    
     class ExampleSerializer(serializers.Serializer):
         # ...
         class Meta:
@@ -114,6 +118,8 @@ These validators can be used to enforce the `unique_for_date`, `unique_for_month
 
 The validator should be applied to *serializer classes*, like so:
 
+    from rest_framework.validators import UniqueForYearValidator
+
     class ExampleSerializer(serializers.Serializer):
         # ...
         class Meta:
@@ -183,7 +189,7 @@ It takes a single argument, which is the default value or callable that should b
 
     created_at = serializers.DateTimeField(
         read_only=True,
-        default=CreateOnlyDefault(timezone.now)
+        default=serializers.CreateOnlyDefault(timezone.now)
     )
 
 ---

docs/api-guide/versioning.md

@@ -71,8 +71,8 @@ You can also set the versioning scheme on an individual view. Typically you won'
 The following settings keys are also used to control versioning:
 
 * `DEFAULT_VERSION`. The value that should be used for `request.version` when no versioning information is present. Defaults to `None`.
-* `ALLOWED_VERSIONS`. If set, this value will restrict the set of versions that may be returned by the versioning scheme, and will raise an error if the provided version if not in this set. Note that the value used for the `DEFAULT_VERSION` setting is always considered to be part of the `ALLOWED_VERSIONS` set. Defaults to `None`.
-* `VERSION_PARAM`. The string that should used for any versioning parameters, such as in the media type or URL query parameters. Defaults to `'version'`.
+* `ALLOWED_VERSIONS`. If set, this value will restrict the set of versions that may be returned by the versioning scheme, and will raise an error if the provided version is not in this set. Note that the value used for the `DEFAULT_VERSION` setting is always considered to be part of the `ALLOWED_VERSIONS` set (unless it is `None`). Defaults to `None`.
+* `VERSION_PARAM`. The string that should be used for any versioning parameters, such as in the media type or URL query parameters. Defaults to `'version'`.
 
 You can also set your versioning class plus those three values on a per-view or a per-viewset basis by defining your own versioning scheme and using the `default_version`, `allowed_versions` and `version_param` class variables. For example, if you want to use `URLPathVersioning`:
 

docs/index.md

@@ -68,8 +68,7 @@ REST framework commercially we strongly encourage you to invest in its
 continued development by **[signing up for a paid plan][funding]**.
 
 The initial aim is to provide a single full-time position on REST framework.
-Right now we're over 58% of the way towards achieving that.
-*Every single sign-up makes a significant impact.*
+*Every single sign-up makes a significant impact towards making that possible.*
 
 <ul class="premium-promo promo">
     <li><a href="http://jobs.rover.com/" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/rover_130x130.png)">Rover.com</a></li>
@@ -87,7 +86,7 @@ Right now we're over 58% of the way towards achieving that.
 REST framework requires the following:
 
 * Python (2.7, 3.2, 3.3, 3.4, 3.5)
-* Django (1.7+, 1.8, 1.9)
+* Django (1.8, 1.9, 1.10)
 
 The following packages are optional:
 

docs/topics/release-notes.md

@@ -40,6 +40,49 @@ You can determine your currently installed version using `pip freeze`:
 
 ## 3.4.x series
 
+### 3.4.4
+
+**Date**: [12th August 2016][3.4.4-milestone]
+
+* Ensure views are fully initialized when generating schemas. ([#4373][gh4373], [#4382][gh4382], [#4383][gh4383], [#4279][gh4279], [#4278][gh4278])
+* Add form field descriptions to schemas. ([#4387][gh4387])
+* Fix category generation for schema endpoints. ([#4391][gh4391], [#4394][gh4394], [#4390][gh4390], [#4386][gh4386], [#4376][gh4376], [#4329][gh4329])
+* Don't strip empty query params when paginating. ([#4392][gh4392], [#4393][gh4393], [#4260][gh4260])
+* Do not re-run query for empty results with LimitOffsetPagination. ([#4201][gh4201], [#4388][gh4388])
+* Stricter type validation for CharField. ([#4380][gh4380], [#3394][gh3394])
+* RelatedField.choices should preserve non-string values. ([#4111][gh4111], [#4379][gh4379], [#3365][gh3365])
+* Test case for rendering checkboxes in vertical form style. ([#4378][gh4378], [#3868][gh3868], [#3868][gh3868])
+* Show error traceback HTML in browsable API ([#4042][gh4042], [#4172][gh4172])
+* Fix handling of ALLOWED_VERSIONS and no DEFAULT_VERSION. [#4370][gh4370]
+* Allow `max_digits=None` on DecimalField. ([#4377][gh4377], [#4372][gh4372])
+* Limit queryset when rendering relational choices. ([#4375][gh4375], [#4122][gh4122], [#3329][gh3329], [#3330][gh3330], [#3877][gh3877])
+* Resolve form display with ChoiceField, MultipleChoiceField and non-string choices. ([#4374][gh4374], [#4119][gh4119], [#4121][gh4121], [#4137][gh4137], [#4120][gh4120])
+* Fix call to TemplateHTMLRenderer.resolve_context() fallback method. ([#4371][gh4371])
+
+### 3.4.3
+
+**Date**: [5th August 2016][3.4.3-milestone]
+
+* Include fallaback for users of older TemplateHTMLRenderer internal API. ([#4361][gh4361])
+
+### 3.4.2
+
+**Date**: [5th August 2016][3.4.2-milestone]
+
+* Include kwargs passed to 'as_view' when generating schemas. ([#4359][gh4359], [#4330][gh4330], [#4331][gh4331])
+* Access `request.user.is_authenticated` as property not method, under Django 1.10+ ([#4358][gh4358], [#4354][gh4354])
+* Filter HEAD out from schemas. ([#4357][gh4357])
+* extra_kwargs takes precedence over uniqueness kwargs. ([#4198][gh4198], [#4199][gh4199], [#4349][gh4349])
+* Correct descriptions when tabs are used in code indentation. ([#4345][gh4345], [#4347][gh4347])*
+* Change template context generation in TemplateHTMLRenderer. ([#4236][gh4236])
+* Serializer defaults should not be included in partial updates. ([#4346][gh4346], [#3565][gh3565])
+* Consistent behavior & descriptive error from FileUploadParser when filename not included. ([#4340][gh4340], [#3610][gh3610], [#4292][gh4292], [#4296][gh4296])
+* DecimalField quantizes incoming digitals. ([#4339][gh4339], [#4318][gh4318])
+* Handle non-string input for IP fields. ([#4335][gh4335], [#4336][gh4336], [#4338][gh4338])
+* Fix leading slash handling when Schema generation includes a root URL. ([#4332][gh4332])
+* Test cases for DictField with allow_null options. ([#4348][gh4348])
+* Update tests from Django 1.10 beta to Django 1.10. ([#4344][gh4344])
+
 ### 3.4.1
 
 **Date**: [28th July 2016][3.4.1-milestone]
@@ -514,6 +557,9 @@ For older release notes, [please see the version 2.x documentation][old-release-
 [3.3.3-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.3.3+Release%22
 [3.4.0-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.0+Release%22
 [3.4.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.1+Release%22
+[3.4.2-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.2+Release%22
+[3.4.3-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.3+Release%22
+[3.4.4-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.4+Release%22
 
 <!-- 3.0.1 -->
 [gh2013]: https://github.com/tomchristie/django-rest-framework/issues/2013
@@ -943,3 +989,79 @@ For older release notes, [please see the version 2.x documentation][old-release-
 [gh4272]: https://github.com/tomchristie/django-rest-framework/issues/4272
 [gh4273]: https://github.com/tomchristie/django-rest-framework/issues/4273
 [gh4288]: https://github.com/tomchristie/django-rest-framework/issues/4288
+
+<!-- 3.4.2 -->
+[gh3565]: https://github.com/tomchristie/django-rest-framework/issues/3565
+[gh3610]: https://github.com/tomchristie/django-rest-framework/issues/3610
+[gh4198]: https://github.com/tomchristie/django-rest-framework/issues/4198
+[gh4199]: https://github.com/tomchristie/django-rest-framework/issues/4199
+[gh4236]: https://github.com/tomchristie/django-rest-framework/issues/4236
+[gh4292]: https://github.com/tomchristie/django-rest-framework/issues/4292
+[gh4296]: https://github.com/tomchristie/django-rest-framework/issues/4296
+[gh4318]: https://github.com/tomchristie/django-rest-framework/issues/4318
+[gh4330]: https://github.com/tomchristie/django-rest-framework/issues/4330
+[gh4331]: https://github.com/tomchristie/django-rest-framework/issues/4331
+[gh4332]: https://github.com/tomchristie/django-rest-framework/issues/4332
+[gh4335]: https://github.com/tomchristie/django-rest-framework/issues/4335
+[gh4336]: https://github.com/tomchristie/django-rest-framework/issues/4336
+[gh4338]: https://github.com/tomchristie/django-rest-framework/issues/4338
+[gh4339]: https://github.com/tomchristie/django-rest-framework/issues/4339
+[gh4340]: https://github.com/tomchristie/django-rest-framework/issues/4340
+[gh4344]: https://github.com/tomchristie/django-rest-framework/issues/4344
+[gh4345]: https://github.com/tomchristie/django-rest-framework/issues/4345
+[gh4346]: https://github.com/tomchristie/django-rest-framework/issues/4346
+[gh4347]: https://github.com/tomchristie/django-rest-framework/issues/4347
+[gh4348]: https://github.com/tomchristie/django-rest-framework/issues/4348
+[gh4349]: https://github.com/tomchristie/django-rest-framework/issues/4349
+[gh4354]: https://github.com/tomchristie/django-rest-framework/issues/4354
+[gh4357]: https://github.com/tomchristie/django-rest-framework/issues/4357
+[gh4358]: https://github.com/tomchristie/django-rest-framework/issues/4358
+[gh4359]: https://github.com/tomchristie/django-rest-framework/issues/4359
+
+<!-- 3.4.3 -->
+[gh4361]: https://github.com/tomchristie/django-rest-framework/issues/4361
+
+<!-- 3.4.4 -->
+
+[gh2829]: https://github.com/tomchristie/django-rest-framework/issues/2829
+[gh3329]: https://github.com/tomchristie/django-rest-framework/issues/3329
+[gh3330]: https://github.com/tomchristie/django-rest-framework/issues/3330
+[gh3365]: https://github.com/tomchristie/django-rest-framework/issues/3365
+[gh3394]: https://github.com/tomchristie/django-rest-framework/issues/3394
+[gh3868]: https://github.com/tomchristie/django-rest-framework/issues/3868
+[gh3868]: https://github.com/tomchristie/django-rest-framework/issues/3868
+[gh3877]: https://github.com/tomchristie/django-rest-framework/issues/3877
+[gh4042]: https://github.com/tomchristie/django-rest-framework/issues/4042
+[gh4111]: https://github.com/tomchristie/django-rest-framework/issues/4111
+[gh4119]: https://github.com/tomchristie/django-rest-framework/issues/4119
+[gh4120]: https://github.com/tomchristie/django-rest-framework/issues/4120
+[gh4121]: https://github.com/tomchristie/django-rest-framework/issues/4121
+[gh4122]: https://github.com/tomchristie/django-rest-framework/issues/4122
+[gh4137]: https://github.com/tomchristie/django-rest-framework/issues/4137
+[gh4172]: https://github.com/tomchristie/django-rest-framework/issues/4172
+[gh4201]: https://github.com/tomchristie/django-rest-framework/issues/4201
+[gh4260]: https://github.com/tomchristie/django-rest-framework/issues/4260
+[gh4278]: https://github.com/tomchristie/django-rest-framework/issues/4278
+[gh4279]: https://github.com/tomchristie/django-rest-framework/issues/4279
+[gh4329]: https://github.com/tomchristie/django-rest-framework/issues/4329
+[gh4370]: https://github.com/tomchristie/django-rest-framework/issues/4370
+[gh4371]: https://github.com/tomchristie/django-rest-framework/issues/4371
+[gh4372]: https://github.com/tomchristie/django-rest-framework/issues/4372
+[gh4373]: https://github.com/tomchristie/django-rest-framework/issues/4373
+[gh4374]: https://github.com/tomchristie/django-rest-framework/issues/4374
+[gh4375]: https://github.com/tomchristie/django-rest-framework/issues/4375
+[gh4376]: https://github.com/tomchristie/django-rest-framework/issues/4376
+[gh4377]: https://github.com/tomchristie/django-rest-framework/issues/4377
+[gh4378]: https://github.com/tomchristie/django-rest-framework/issues/4378
+[gh4379]: https://github.com/tomchristie/django-rest-framework/issues/4379
+[gh4380]: https://github.com/tomchristie/django-rest-framework/issues/4380
+[gh4382]: https://github.com/tomchristie/django-rest-framework/issues/4382
+[gh4383]: https://github.com/tomchristie/django-rest-framework/issues/4383
+[gh4386]: https://github.com/tomchristie/django-rest-framework/issues/4386
+[gh4387]: https://github.com/tomchristie/django-rest-framework/issues/4387
+[gh4388]: https://github.com/tomchristie/django-rest-framework/issues/4388
+[gh4390]: https://github.com/tomchristie/django-rest-framework/issues/4390
+[gh4391]: https://github.com/tomchristie/django-rest-framework/issues/4391
+[gh4392]: https://github.com/tomchristie/django-rest-framework/issues/4392
+[gh4393]: https://github.com/tomchristie/django-rest-framework/issues/4393
+[gh4394]: https://github.com/tomchristie/django-rest-framework/issues/4394

rest_framework/__init__.py

@@ -8,7 +8,7 @@
 """
 
 __title__ = 'Django REST framework'
-__version__ = '3.4.1'
+__version__ = '3.4.4'
 __author__ = 'Tom Christie'
 __license__ = 'BSD 2-Clause'
 __copyright__ = 'Copyright 2011-2016 Tom Christie'