Fix F401 flake8 warnings

timgraham · timgraham · commit 9e64b32d9a4d · 2017-08-11T11:46:48.000-04:00
diff --git a/djangobench/benchmarks/default_middleware/models.py b/djangobench/benchmarks/default_middleware/models.py
diff --git a/djangobench/benchmarks/default_middleware/settings.py b/djangobench/benchmarks/default_middleware/settings.py
@@ -1,4 +1,4 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['default_middleware']
 ROOT_URLCONF = 'default_middleware.urls'
diff --git a/djangobench/benchmarks/form_clean/settings.py b/djangobench/benchmarks/form_clean/settings.py
@@ -1 +1 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
diff --git a/djangobench/benchmarks/form_create/settings.py b/djangobench/benchmarks/form_create/settings.py
@@ -1 +1 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
diff --git a/djangobench/benchmarks/l10n_render/benchmark.py b/djangobench/benchmarks/l10n_render/benchmark.py
@@ -1,10 +1,8 @@
-import os
 import sys
 
 from django.core.handlers.wsgi import WSGIRequest
 from django.shortcuts import render_to_response
 from django.template import RequestContext
-from django.test.client import Client
 
 from djangobench.utils import run_benchmark
 
diff --git a/djangobench/benchmarks/l10n_render/models.py b/djangobench/benchmarks/l10n_render/models.py
diff --git a/djangobench/benchmarks/l10n_render/settings.py b/djangobench/benchmarks/l10n_render/settings.py
@@ -1,6 +1,6 @@
 import os
 
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 USE_I18N = False
 USE_L10N = True
diff --git a/djangobench/benchmarks/locale_from_request/settings.py b/djangobench/benchmarks/locale_from_request/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 ROOT_URLCONF = None
diff --git a/djangobench/benchmarks/model_creation/benchmark.py b/djangobench/benchmarks/model_creation/benchmark.py
@@ -1,5 +1,3 @@
-import time
-
 from djangobench.utils import run_benchmark
 
 
@@ -12,7 +10,7 @@ def benchmark():
     Book.objects.create(title='hi!')
 
 run_benchmark(
-    benchmark, 
+    benchmark,
     setup=setup,
     meta = {
         'description': 'Time of a Model.objects.create() call.',
diff --git a/djangobench/benchmarks/model_creation/settings.py b/djangobench/benchmarks/model_creation/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['model_creation']
diff --git a/djangobench/benchmarks/model_delete/settings.py b/djangobench/benchmarks/model_delete/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['model_delete']
diff --git a/djangobench/benchmarks/model_save_existing/settings.py b/djangobench/benchmarks/model_save_existing/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['model_save_existing']
diff --git a/djangobench/benchmarks/model_save_new/settings.py b/djangobench/benchmarks/model_save_new/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['model_save_new']
diff --git a/djangobench/benchmarks/multi_value_dict/benchmark.py b/djangobench/benchmarks/multi_value_dict/benchmark.py
@@ -1,5 +1,4 @@
 import copy
-from time import time
 
 from django.utils.datastructures import MultiValueDict
 
@@ -16,11 +15,11 @@ def benchmark_multi():
     caseDict['a']
     caseDict['b']
     caseDict['c']
-    
+
     caseDict.update(update)
     copy.copy(caseDict)
     copy.deepcopy(caseDict)
-    
+
     caseDict.items()
     caseDict.lists()
     for i in caseDict:
@@ -34,20 +33,20 @@ def benchmark_dict():
     # Instantiate a new dict and call same methods as above - to be fair,
     # get unlistify in this method where required
     caseDict = dict(case)
-    
+
     caseDict['a'][0]
     caseDict['b'][1]
     caseDict['c'][2]
-    
+
     caseDict.items()
     caseDict.values()
     for i in caseDict:
         i
-    
+
     caseDict.update(update)
     copy.copy(caseDict)
     copy.deepcopy(caseDict)
-    
+
     caseDict['a'] = ['A']
     caseDict['b'] = ['B']
     caseDict['c'] = ['C']
diff --git a/djangobench/benchmarks/multi_value_dict/settings.py b/djangobench/benchmarks/multi_value_dict/settings.py
@@ -1 +1 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
diff --git a/djangobench/benchmarks/qs_filter_chaining/benchmark.py b/djangobench/benchmarks/qs_filter_chaining/benchmark.py
@@ -1,5 +1,4 @@
 import datetime
-import time
 
 from djangobench.utils import run_benchmark
 
diff --git a/djangobench/benchmarks/qs_filter_chaining/settings.py b/djangobench/benchmarks/qs_filter_chaining/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['qs_filter_chaining']
diff --git a/djangobench/benchmarks/query_aggregate/settings.py b/djangobench/benchmarks/query_aggregate/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['query_aggregate']
diff --git a/djangobench/benchmarks/query_all/settings.py b/djangobench/benchmarks/query_all/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['query_all']
diff --git a/djangobench/benchmarks/query_all_converters/settings.py b/djangobench/benchmarks/query_all_converters/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['query_all_converters']
diff --git a/djangobench/benchmarks/query_all_multifield/settings.py b/djangobench/benchmarks/query_all_multifield/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['query_all_multifield']
diff --git a/djangobench/benchmarks/query_annotate/settings.py b/djangobench/benchmarks/query_annotate/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['query_annotate']
diff --git a/djangobench/benchmarks/query_complex_filter/settings.py b/djangobench/benchmarks/query_complex_filter/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['query_complex_filter']
diff --git a/djangobench/benchmarks/query_count/settings.py b/djangobench/benchmarks/query_count/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['query_count']
diff --git a/djangobench/benchmarks/query_dates/settings.py b/djangobench/benchmarks/query_dates/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['query_dates']
diff --git a/djangobench/benchmarks/query_delete/settings.py b/djangobench/benchmarks/query_delete/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['query_delete']
diff --git a/djangobench/benchmarks/query_delete_related/settings.py b/djangobench/benchmarks/query_delete_related/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['query_delete_related']
diff --git a/djangobench/benchmarks/query_distinct/settings.py b/djangobench/benchmarks/query_distinct/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['query_distinct']
diff --git a/djangobench/benchmarks/query_exclude/settings.py b/djangobench/benchmarks/query_exclude/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['query_exclude']
diff --git a/djangobench/benchmarks/query_exists/settings.py b/djangobench/benchmarks/query_exists/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['query_exists']
diff --git a/djangobench/benchmarks/query_filter/settings.py b/djangobench/benchmarks/query_filter/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['query_filter']
diff --git a/djangobench/benchmarks/query_get/settings.py b/djangobench/benchmarks/query_get/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['query_get']
diff --git a/djangobench/benchmarks/query_get_or_create/settings.py b/djangobench/benchmarks/query_get_or_create/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['query_get_or_create']
diff --git a/djangobench/benchmarks/query_in_bulk/settings.py b/djangobench/benchmarks/query_in_bulk/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['query_in_bulk']
diff --git a/djangobench/benchmarks/query_iterator/settings.py b/djangobench/benchmarks/query_iterator/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['query_iterator']
diff --git a/djangobench/benchmarks/query_latest/settings.py b/djangobench/benchmarks/query_latest/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['query_latest']
diff --git a/djangobench/benchmarks/query_none/settings.py b/djangobench/benchmarks/query_none/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['query_none']
diff --git a/djangobench/benchmarks/query_order_by/settings.py b/djangobench/benchmarks/query_order_by/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['query_order_by']
diff --git a/djangobench/benchmarks/query_prefetch_related/settings.py b/djangobench/benchmarks/query_prefetch_related/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['query_prefetch_related']
diff --git a/djangobench/benchmarks/query_raw/settings.py b/djangobench/benchmarks/query_raw/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['query_raw']
diff --git a/djangobench/benchmarks/query_raw_deferred/settings.py b/djangobench/benchmarks/query_raw_deferred/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['query_raw_deferred']
diff --git a/djangobench/benchmarks/query_select_related/settings.py b/djangobench/benchmarks/query_select_related/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['query_select_related']
diff --git a/djangobench/benchmarks/query_update/settings.py b/djangobench/benchmarks/query_update/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['query_update']
diff --git a/djangobench/benchmarks/query_values/settings.py b/djangobench/benchmarks/query_values/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['query_values']
diff --git a/djangobench/benchmarks/query_values_list/settings.py b/djangobench/benchmarks/query_values_list/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['query_values_list']
diff --git a/djangobench/benchmarks/raw_sql/settings.py b/djangobench/benchmarks/raw_sql/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['raw_sql']
diff --git a/djangobench/benchmarks/startup/settings.py b/djangobench/benchmarks/startup/settings.py
@@ -1,3 +1,3 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['startup']
diff --git a/djangobench/benchmarks/template_compilation/settings.py b/djangobench/benchmarks/template_compilation/settings.py
@@ -1,4 +1,4 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 TEMPLATES = [
     {
diff --git a/djangobench/benchmarks/template_render/settings.py b/djangobench/benchmarks/template_render/settings.py
@@ -1,6 +1,6 @@
 import os
 
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['template_render']
 TEMPLATE_DIRS = (
diff --git a/djangobench/benchmarks/template_render_simple/benchmark.py b/djangobench/benchmarks/template_render_simple/benchmark.py
@@ -1,5 +1,3 @@
-import os
-
 from django import template
 
 from djangobench.utils import run_benchmark
diff --git a/djangobench/benchmarks/template_render_simple/settings.py b/djangobench/benchmarks/template_render_simple/settings.py
@@ -1,4 +1,4 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 TEMPLATES = [
     {
diff --git a/djangobench/benchmarks/url_resolve/settings.py b/djangobench/benchmarks/url_resolve/settings.py
@@ -1,4 +1,4 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['url_resolve']
 ROOT_URLCONF = 'url_resolve.urls'
diff --git a/djangobench/benchmarks/url_resolve_flat/settings.py b/djangobench/benchmarks/url_resolve_flat/settings.py
@@ -1,4 +1,4 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['url_resolve_flat']
 ROOT_URLCONF = 'url_resolve_flat.urls'
diff --git a/djangobench/benchmarks/url_resolve_flat/urls.py b/djangobench/benchmarks/url_resolve_flat/urls.py
@@ -1,7 +1,7 @@
 try:
-    from django.conf.urls import include, url
+    from django.conf.urls import url
 except ImportError:
-    from django.conf.urls.defaults import include, url
+    from django.conf.urls.defaults import url
 
 def ok_view(request, *a, **kw):
     pass
diff --git a/djangobench/benchmarks/url_resolve_flat_i18n_off/settings.py b/djangobench/benchmarks/url_resolve_flat_i18n_off/settings.py
@@ -1,4 +1,4 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['url_resolve_flat_i18n_off']
 ROOT_URLCONF = 'url_resolve_flat_i18n_off.urls'
diff --git a/djangobench/benchmarks/url_resolve_flat_i18n_off/urls.py b/djangobench/benchmarks/url_resolve_flat_i18n_off/urls.py
@@ -1,7 +1,7 @@
 try:
-    from django.conf.urls import include, url
+    from django.conf.urls import url
 except ImportError:
-    from django.conf.urls.defaults import include, url
+    from django.conf.urls.defaults import url
 
 def ok_view(request, *a, **kw):
     pass
diff --git a/djangobench/benchmarks/url_resolve_nested/benchmark.py b/djangobench/benchmarks/url_resolve_nested/benchmark.py
@@ -1,4 +1,4 @@
-from django.core.urlresolvers import Resolver404, resolve
+from django.core.urlresolvers import resolve
 
 from djangobench.utils import run_benchmark
 
diff --git a/djangobench/benchmarks/url_resolve_nested/settings.py b/djangobench/benchmarks/url_resolve_nested/settings.py
@@ -1,4 +1,4 @@
-from djangobench.base_settings import *
+from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['url_resolve_nested']
 ROOT_URLCONF = 'url_resolve_nested.urls'
diff --git a/djangobench/benchmarks/url_reverse/settings.py b/djangobench/benchmarks/url_reverse/settings.py
@@ -1,4 +1,4 @@
-﻿from djangobench.base_settings import *
+﻿from djangobench.base_settings import *  # NOQA
 
 INSTALLED_APPS = ['url_reverse']
 ROOT_URLCONF = 'url_resolve.urls'
diff --git a/djangobench/perf.py b/djangobench/perf.py
@@ -76,10 +76,8 @@
 
 try:
     from urllib.request import urlopen
-    from urllib.parse import urlparse
     from urllib.error import URLError
 except ImportError:
-    from urlparse import urlparse
     from urllib2 import urlopen, URLError
 try:
     import multiprocessing

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-from djangobench.base_settings import *`
	`1`	`+from djangobench.base_settings import * # NOQA`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-from djangobench.base_settings import *`
	`1`	`+from djangobench.base_settings import * # NOQA`
`2`	`2`
`3`	`3`	`ROOT_URLCONF = None`