From 5301a9d7b1c2151e9b0496c7e244e8ceb6d273c1 Mon Sep 17 00:00:00 2001
From: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Thu, 23 Aug 2012 10:16:16 +0200
Subject: [PATCH] [py3] Removed duplicate imports.

Fixed #18837. Refs #18791.
---
 django/contrib/gis/db/models/query.py | 3 +--
 django/db/backends/oracle/base.py     | 2 --
 django/forms/models.py                | 1 -
 django/utils/text.py                  | 3 +--
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/django/contrib/gis/db/models/query.py b/django/contrib/gis/db/models/query.py
index cc61dfa4d2..d87e151aea 100644
--- a/django/contrib/gis/db/models/query.py
+++ b/django/contrib/gis/db/models/query.py
@@ -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."
 
diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py
index 7d4f2b445a..5913250206 100644
--- a/django/db/backends/oracle/base.py
+++ b/django/db/backends/oracle/base.py
@@ -10,8 +10,6 @@ import decimal
 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
diff --git a/django/forms/models.py b/django/forms/models.py
index a40d31ad9f..2482437152 100644
--- a/django/forms/models.py
+++ b/django/forms/models.py
@@ -18,7 +18,6 @@ from django.utils.datastructures import SortedDict
 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__ = (
diff --git a/django/utils/text.py b/django/utils/text.py
index ca79a24f7c..e7c62131a0 100644
--- a/django/utils/text.py
+++ b/django/utils/text.py
@@ -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 @@ if not six.PY3:
     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