Created
August 3, 2013 08:16
-
-
Save loic/6145692 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt | |
| index 53eb8a3..c78fc4a 100644 | |
| --- a/docs/internals/deprecation.txt | |
| +++ b/docs/internals/deprecation.txt | |
| @@ -423,8 +423,8 @@ these changes. | |
| * FastCGI support via the ``runfcgi`` management command will be | |
| removed. Please deploy your project using WSGI. | |
| -* django.utils.datastructures.SortedDict will be removed. Use the built in | |
| - collections.OrderedDict instead. | |
| +* ``django.utils.datastructures.SortedDict`` will be removed. Instead use | |
| + ``collections.OrderedDict`` from the Python standard library. | |
| 2.0 | |
| --- | |
| diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt | |
| index 606f640..2020ddf 100644 | |
| --- a/docs/releases/1.7.txt | |
| +++ b/docs/releases/1.7.txt | |
| @@ -167,8 +167,9 @@ Python versions, this module isn't useful anymore. It has been deprecated. Use | |
| ``django.utils.datastructures.SortedDict`` | |
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | |
| -As OrderedDict was added to the standard library's :mod:`collections` in | |
| -Python 2.7, ``django.utils.datastructures.SortedDict`` has been deprecated. | |
| +As :class:`~collections.OrderedDict` was added to the standard library in | |
| +Python 2.7, :class:`~django.utils.datastructures.SortedDict` is no longer | |
| +needed and has been deprecated. | |
| Custom SQL location for models package | |
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment