mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-09-18 08:20:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'master' into schema-alteration

Browse source 
Conflicts:
	django/db/backends/mysql/introspection.py
	django/db/backends/oracle/creation.py
	django/db/backends/postgresql_psycopg2/creation.py
	django/db/models/base.py
	django/db/models/loading.py
This commit is contained in:
Andrew Godwin 2013-07-22 19:04:25 +01:00
commit 03ec3219a0
231 changed files with 2725 additions and 1373 deletions
Download patch file Download diff file Expand all files Collapse all files

5
django/utils/functional.py
View file

@ -403,9 +403,8 @@ def partition(predicate, values):
if sys.version_info >= (2, 7, 2):
from functools import total_ordering
else:
# For Python < 2.7.2. Python 2.6 does not have total_ordering, and
# total_ordering in 2.7 versions prior to 2.7.2 is buggy. See
# http://bugs.python.org/issue10042 for details. For these versions use
# For Python < 2.7.2. total_ordering in versions prior to 2.7.2 is buggy.
# See http://bugs.python.org/issue10042 for details. For these versions use
# code borrowed from Python 2.7.3.
def total_ordering(cls):
"""Class decorator that fills in missing ordering methods"""