Browse files

[py3] Removed duplicate imports.

Fixed #18837. Refs #18791.
  • Loading branch information...
1 parent e06189f commit 5301a9d7b1c2151e9b0496c7e244e8ceb6d273c1 @aaugustin aaugustin committed Aug 23, 2012
Showing with 2 additions and 7 deletions.
  1. +1 −2 django/contrib/gis/db/models/
  2. +0 −2 django/db/backends/oracle/
  3. +0 −1 django/forms/
  4. +1 −2 django/utils/
@@ -1,16 +1,15 @@
from django.db import connections
from django.db.models.query import QuerySet, ValuesQuerySet, ValuesListQuerySet
-from django.utils import six
from django.contrib.gis.db.models import aggregates
from django.contrib.gis.db.models.fields import get_srid_info, PointField, LineStringField
from django.contrib.gis.db.models.sql import AreaField, DistanceField, GeomField, GeoQuery
from django.contrib.gis.geometry.backend import Geometry
from django.contrib.gis.measure import Area, Distance
-from django.utils import six
from django.utils import six
class GeoQuerySet(QuerySet):
"The Geographic QuerySet."
@@ -10,8 +10,6 @@
import sys
import warnings
-from django.utils import six
def _setup_environment(environ):
import platform
# Cygwin requires some special voodoo to set the environment variables
@@ -18,7 +18,6 @@
from django.utils import six
from django.utils.text import get_text_list, capfirst
from django.utils.translation import ugettext_lazy as _, ugettext
-from django.utils import six
__all__ = (
@@ -1,11 +1,9 @@
from __future__ import unicode_literals
import re
-from django.utils import six
import unicodedata
import warnings
from gzip import GzipFile
-from django.utils.six.moves import html_entities
from io import BytesIO
from django.utils.encoding import force_text
@@ -15,6 +13,7 @@
from django.utils.encoding import force_unicode
from django.utils.functional import allow_lazy, SimpleLazyObject
from django.utils import six
+from django.utils.six.moves import html_entities
from django.utils.translation import ugettext_lazy, ugettext as _, pgettext
from django.utils.safestring import mark_safe

0 comments on commit 5301a9d

Please sign in to comment.