diff options
Diffstat (limited to 'django/contrib')
| -rw-r--r-- | django/contrib/gis/geos/mutable_list.py | 3 | ||||
| -rw-r--r-- | django/contrib/gis/maps/google/overlays.py | 3 | ||||
| -rw-r--r-- | django/contrib/gis/measure.py | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/django/contrib/gis/geos/mutable_list.py b/django/contrib/gis/geos/mutable_list.py index 6b60465431..cd639399f4 100644 --- a/django/contrib/gis/geos/mutable_list.py +++ b/django/contrib/gis/geos/mutable_list.py @@ -8,8 +8,9 @@ See also http://www.aryehleib.com/MutableLists.html Author: Aryeh Leib Taurog. """ +from functools import total_ordering + from django.utils import six -from django.utils.functional import total_ordering from django.utils.six.moves import range diff --git a/django/contrib/gis/maps/google/overlays.py b/django/contrib/gis/maps/google/overlays.py index ac0a6bd315..42f41e3b8e 100644 --- a/django/contrib/gis/maps/google/overlays.py +++ b/django/contrib/gis/maps/google/overlays.py @@ -1,11 +1,12 @@ from __future__ import unicode_literals +from functools import total_ordering + from django.contrib.gis.geos import ( LinearRing, LineString, Point, Polygon, fromstr, ) from django.utils import six from django.utils.encoding import python_2_unicode_compatible -from django.utils.functional import total_ordering from django.utils.html import html_safe diff --git a/django/contrib/gis/measure.py b/django/contrib/gis/measure.py index 527512f71b..52fdf874ca 100644 --- a/django/contrib/gis/measure.py +++ b/django/contrib/gis/measure.py @@ -37,9 +37,9 @@ and Geoff Biggs' PhD work on dimensioned units for robotics. """ __all__ = ['A', 'Area', 'D', 'Distance'] from decimal import Decimal +from functools import total_ordering from django.utils import six -from django.utils.functional import total_ordering NUMERIC_TYPES = six.integer_types + (float, Decimal) AREA_PREFIX = "sq_" |