Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Eric Buehl 2014-03-06 20:21:27 +00:00
commit 86375f2d95
3 changed files with 14 additions and 3 deletions

View File

@ -40,6 +40,17 @@ You can determine your currently installed version using `pip freeze`:
## 2.3.x series
### 2.3.13
**Date**: 6th March 2014
* Django 1.7 Support.
* Fix `default` argument when used with serializer relation fields.
* Display the media type of the content that is being displayed in the browsable API, rather than 'text/html'.
* Bugfix for `urlize` template failure when URL regex is matched, but value does not `urlparse`.
* Use `urandom` for token generation.
* Only use `Vary: Accept` when more than one renderer exists.
### 2.3.12
**Date**: 15th January 2014

View File

@ -8,10 +8,10 @@ ______ _____ _____ _____ __ _
"""
__title__ = 'Django REST framework'
__version__ = '2.3.12'
__version__ = '2.3.13'
__author__ = 'Tom Christie'
__license__ = 'BSD 2-Clause'
__copyright__ = 'Copyright 2011-2013 Tom Christie'
__copyright__ = 'Copyright 2011-2014 Tom Christie'
# Version synonym
VERSION = __version__

View File

@ -758,7 +758,7 @@ class ModelSerializer(Serializer):
ret[accessor_name] = field
# Add the `read_only` flag to any fields that have bee specified
# Add the `read_only` flag to any fields that have been 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(), (