summaryrefslogtreecommitdiff
path: root/django/db
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-06-15 10:10:40 -0400
committerTim Graham <timograham@gmail.com>2015-06-15 13:15:24 -0400
commit4b600ed24488b2d1fc0fd59fc883a84ee745fcf8 (patch)
tree0652c5a7f50fcbcd640bfbee41a9a4bfc217e362 /django/db
parent47fcbe506c04019a12e16221843e25a52249b1ab (diff)
Removed django.utils.functional.total_ordering()
Diffstat (limited to 'django/db')
-rw-r--r--django/db/migrations/graph.py2
-rw-r--r--django/db/models/fields/__init__.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/django/db/migrations/graph.py b/django/db/migrations/graph.py
index 8d8f41b1eb..f324ba5551 100644
--- a/django/db/migrations/graph.py
+++ b/django/db/migrations/graph.py
@@ -2,11 +2,11 @@ from __future__ import unicode_literals
import warnings
from collections import deque
+from functools import total_ordering
from django.db.migrations.state import ProjectState
from django.utils.datastructures import OrderedSet
from django.utils.encoding import python_2_unicode_compatible
-from django.utils.functional import total_ordering
from .exceptions import CircularDependencyError, NodeNotFoundError
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
index 568c66f4ac..de13b738d9 100644
--- a/django/db/models/fields/__init__.py
+++ b/django/db/models/fields/__init__.py
@@ -9,6 +9,7 @@ import math
import uuid
import warnings
from base64 import b64decode, b64encode
+from functools import total_ordering
from django.apps import apps
from django.db import connection
@@ -20,7 +21,7 @@ from django.core import exceptions, validators, checks
from django.utils.datastructures import DictWrapper
from django.utils.dateparse import parse_date, parse_datetime, parse_time, parse_duration
from django.utils.duration import duration_string
-from django.utils.functional import cached_property, curry, total_ordering, Promise
+from django.utils.functional import cached_property, curry, Promise
from django.utils.text import capfirst
from django.utils import timezone
from django.utils.deprecation import RemovedInDjango21Warning