Fixed "redefinition of unused 'foo' from line X" pyflakes warnings.

6 files changed, 5 insertions, 8 deletions

diff --git a/django/contrib/auth/tests/test_basic.py b/django/contrib/auth/tests/test_basic.py
index 57790830b0..e5a3e676b8 100644
--- a/django/contrib/auth/tests/test_basic.py
+++ b/django/contrib/auth/tests/test_basic.py
@@ -23,7 +23,6 @@ from django.utils.six import binary_type, PY2, StringIO
 def user_model_swapped(**kwargs):
     if kwargs['setting'] == 'AUTH_USER_MODEL':
         from django.db.models.manager import ensure_default_manager
-        from django.contrib.auth.models import User
         # Reset User manager
         setattr(User, 'objects', User._default_manager)
         ensure_default_manager(User)
diff --git a/django/contrib/gis/geos/prototypes/__init__.py b/django/contrib/gis/geos/prototypes/__init__.py
index 89b96c0ecf..992a1ac514 100644
--- a/django/contrib/gis/geos/prototypes/__init__.py
+++ b/django/contrib/gis/geos/prototypes/__init__.py
@@ -24,7 +24,7 @@ from django.contrib.gis.geos.prototypes.misc import *
 from django.contrib.gis.geos.prototypes.predicates import (geos_hasz, geos_isempty,
     geos_isring, geos_issimple, geos_isvalid, geos_contains, geos_crosses,
     geos_disjoint, geos_equals, geos_equalsexact, geos_intersects,
-    geos_intersects, geos_overlaps, geos_relatepattern, geos_touches, geos_within)
+    geos_overlaps, geos_relatepattern, geos_touches, geos_within)
 
 # Topology routines
 from django.contrib.gis.geos.prototypes.topology import *
diff --git a/django/contrib/sitemaps/__init__.py b/django/contrib/sitemaps/__init__.py
index fd71276be7..b8d0a4f31e 100644
--- a/django/contrib/sitemaps/__init__.py
+++ b/django/contrib/sitemaps/__init__.py
@@ -30,7 +30,6 @@ def ping_google(sitemap_url=None, ping_url=PING_URL):
     if sitemap_url is None:
         raise SitemapNotFound("You didn't provide a sitemap_url, and the sitemap URL couldn't be auto-detected.")
 
-    from django.contrib.sites.models import Site
     current_site = Site.objects.get_current()
     url = "http://%s%s" % (current_site.domain, sitemap_url)
     params = urlencode({'sitemap':url})
diff --git a/django/db/backends/mysql/base.py b/django/db/backends/mysql/base.py
index f7fb8217a9..1e3cdbad9b 100644
--- a/django/db/backends/mysql/base.py
+++ b/django/db/backends/mysql/base.py
@@ -43,7 +43,6 @@ from django.db.backends.mysql.introspection import DatabaseIntrospection
 from django.db.backends.mysql.validation import DatabaseValidation
 from django.utils.encoding import force_str, force_text
 from django.db.backends.mysql.schema import DatabaseSchemaEditor
-from django.utils.encoding import force_str
 from django.utils.functional import cached_property
 from django.utils.safestring import SafeBytes, SafeText
 from django.utils import six
diff --git a/django/db/migrations/state.py b/django/db/migrations/state.py
index 25b4b2b102..b85c9971b4 100644
--- a/django/db/migrations/state.py
+++ b/django/db/migrations/state.py
@@ -53,11 +53,11 @@ class ProjectState(object):
     @classmethod
     def from_app_cache(cls, app_cache):
         "Takes in an AppCache and returns a ProjectState matching it"
-        models = {}
+        app_models = {}
         for model in app_cache.get_models():
             model_state = ModelState.from_model(model)
-            models[(model_state.app_label, model_state.name.lower())] = model_state
-        return cls(models)
+            app_models[(model_state.app_label, model_state.name.lower())] = model_state
+        return cls(app_models)
 
     def __eq__(self, other):
         if set(self.models.keys()) != set(other.models.keys()):
diff --git a/django/db/models/base.py b/django/db/models/base.py
index a9d8695f21..9409454d3e 100644
--- a/django/db/models/base.py
+++ b/django/db/models/base.py
@@ -276,7 +276,7 @@ class ModelBase(type):
     def copy_managers(cls, base_managers):
         # This is in-place sorting of an Options attribute, but that's fine.
         base_managers.sort()
-        for _, mgr_name, manager in base_managers:
+        for _, mgr_name, manager in base_managers: # NOQA (redefinition of _)
             val = getattr(cls, mgr_name, None)
             if not val or val is manager:
                 new_manager = manager._copy_to_model(cls)