Fix flake8 warnings

Author: timgraham

djangobench/benchmarks/query_get/benchmark.py

@@ -12,7 +12,7 @@ def benchmark():
     try:
         # This will fail, due to too many objects
         Book.objects.get()
-    except:
+    except Book.MultipleObjectsReturned:
         pass
 
 run_benchmark(

djangobench/benchmarks/url_resolve_flat/benchmark.py

@@ -1,7 +1,7 @@
 try:
-    from django.urls import resolve
+    from django.urls import resolve, Resolver404
 except ImportError:  # Django < 1.10
-    from django.core.urlresolvers import resolve
+    from django.core.urlresolvers import resolve, Resolver404
 
 from djangobench.utils import run_benchmark
 
@@ -18,7 +18,7 @@ def benchmark():
         for path in paths:
             try:
                 resolve(path)
-            except:
+            except Resolver404:
                 pass
 run_benchmark(
     benchmark,

djangobench/benchmarks/url_resolve_flat/urls.py

@@ -17,11 +17,11 @@ def handler404(request):
 ]
 
 urlpatterns += [
-    url("^(?P<locale>en|ru)/%s$" % f, ok_view) for f in features
+    url(r"^(?P<locale>en|ru)/%s$" % f, ok_view) for f in features
 ]
 
 urlpatterns += [
-    url("^(?P<user>\w+)/(?P<repo>\w+)/%s$" % f, ok_view) for f in features
+    url(r"^(?P<user>\w+)/(?P<repo>\w+)/%s$" % f, ok_view) for f in features
 ]
 
 # Total: 240 patterns

djangobench/benchmarks/url_resolve_flat_i18n_off/benchmark.py

@@ -1,7 +1,7 @@
 try:
-    from django.urls import resolve
+    from django.urls import resolve, Resolver404
 except ImportError:  # Django < 1.10
-    from django.core.urlresolvers import resolve
+    from django.core.urlresolvers import resolve, Resolver404
 
 from djangobench.utils import run_benchmark
 
@@ -18,7 +18,7 @@ def benchmark():
         for path in paths:
             try:
                 resolve(path)
-            except:
+            except Resolver404:
                 pass
 run_benchmark(
     benchmark,

djangobench/benchmarks/url_resolve_flat_i18n_off/urls.py

@@ -17,11 +17,11 @@ def handler404(request):
 ]
 
 urlpatterns += [
-    url("^(?P<locale>en|ru)/%s$" % f, ok_view) for f in features
+    url(r"^(?P<locale>en|ru)/%s$" % f, ok_view) for f in features
 ]
 
 urlpatterns += [
-    url("^(?P<user>\w+)/(?P<repo>\w+)/%s$" % f, ok_view) for f in features
+    url(r"^(?P<user>\w+)/(?P<repo>\w+)/%s$" % f, ok_view) for f in features
 ]
 
 # Total: 240 patterns

djangobench/perf.py

@@ -1101,7 +1101,7 @@ def __str__(self):
                 % self.__dict__)
 
 
-_PY_BENCH_TOTALS_LINE = re.compile("""
+_PY_BENCH_TOTALS_LINE = re.compile(r"""
     Totals:\s+(?P<min_base>\d+)ms\s+
     (?P<min_changed>\d+)ms\s+
     \S+\s+  # Percent change, which we re-compute

setup.cfg

@@ -1,5 +1,5 @@
 [flake8]
-ignore = E302 E305
+ignore = E302 E305 W504
 max-line-length = 119
 
 [isort]