diff options
| author | Tom Christie | 2015-01-08 11:07:52 +0000 | 
|---|---|---|
| committer | Tom Christie | 2015-01-08 11:07:52 +0000 | 
| commit | 3dbcefb3c75877fb210e7e04037e682c718a4c6e (patch) | |
| tree | 0a378014498f8c70811187159b3f7fb4dce33721 /rest_framework | |
| parent | e61ef3d39f301bc62323b47af5080877e273c395 (diff) | |
| parent | c3814123d75e6af3edc51e9953f49eac40b72989 (diff) | |
| download | django-rest-framework-3dbcefb3c75877fb210e7e04037e682c718a4c6e.tar.bz2 | |
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
Diffstat (limited to 'rest_framework')
| -rw-r--r-- | rest_framework/compat.py | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/rest_framework/compat.py b/rest_framework/compat.py index ba26a3cd..b1f6f2fa 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -36,7 +36,7 @@ def unicode_to_repr(value):  # OrderedDict only available in Python 2.7.  # This will always be the case in Django 1.7 and above, as these versions  # no longer support Python 2.6. -# For Django <= 1.6 and Python 2.6 fall back to OrderedDict. +# For Django <= 1.6 and Python 2.6 fall back to SortedDict.  try:      from collections import OrderedDict  except ImportError: | 
