From 13d16697a0de87b37a046d5418426a02b810a5b0 Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Thu, 16 Jun 2016 09:07:51 -0400
Subject: [PATCH] [1.9.x] Fixed flake8 2.6 warnings.

Backport of ea34426ae789d31b036f58c8fd59ce299649e91e from master
---
 django/contrib/gis/db/backends/base/models.py      |  8 ++++----
 django/contrib/gis/db/models/sql/aggregates.py     | 10 ----------
 .../migrations/0002_create_test_models.py          |  5 ++++-
 tests/servers/tests.py                             | 14 ++++----------
 4 files changed, 12 insertions(+), 25 deletions(-)
 delete mode 100644 django/contrib/gis/db/models/sql/aggregates.py

diff --git a/django/contrib/gis/db/backends/base/models.py b/django/contrib/gis/db/backends/base/models.py
index a84b23dfe8..7367a9f6a0 100644
--- a/django/contrib/gis/db/backends/base/models.py
+++ b/django/contrib/gis/db/backends/base/models.py
@@ -45,14 +45,14 @@ class SpatialRefSysMixin(object):
                 try:
                     self._srs = gdal.SpatialReference(self.wkt)
                     return self.srs
-                except Exception as msg:
-                    pass
+                except Exception as e:
+                    msg = e
 
                 try:
                     self._srs = gdal.SpatialReference(self.proj4text)
                     return self.srs
-                except Exception as msg:
-                    pass
+                except Exception as e:
+                    msg = e
 
                 raise Exception('Could not get OSR SpatialReference from WKT: %s\nError:\n%s' % (self.wkt, msg))
         else:
diff --git a/django/contrib/gis/db/models/sql/aggregates.py b/django/contrib/gis/db/models/sql/aggregates.py
deleted file mode 100644
index e3fb049cf5..0000000000
--- a/django/contrib/gis/db/models/sql/aggregates.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from django.db.models.sql import aggregates
-from django.db.models.sql.aggregates import *  # NOQA
-
-__all__ = ['Collect', 'Extent', 'Extent3D', 'MakeLine', 'Union'] + aggregates.__all__
-
-
-warnings.warn(
-    "django.contrib.gis.db.models.sql.aggregates is deprecated. Use "
-    "django.contrib.gis.db.models.aggregates instead.",
-    RemovedInDjango110Warning, stacklevel=2)
diff --git a/tests/postgres_tests/migrations/0002_create_test_models.py b/tests/postgres_tests/migrations/0002_create_test_models.py
index 4be219f722..0152f88a9f 100644
--- a/tests/postgres_tests/migrations/0002_create_test_models.py
+++ b/tests/postgres_tests/migrations/0002_create_test_models.py
@@ -3,7 +3,10 @@ from __future__ import unicode_literals
 
 from django.db import migrations, models
 
-from ..fields import *  # NOQA
+from ..fields import (
+    ArrayField, BigIntegerRangeField, DateRangeField, DateTimeRangeField,
+    FloatRangeField, HStoreField, IntegerRangeField, JSONField,
+)
 
 
 class Migration(migrations.Migration):
diff --git a/tests/servers/tests.py b/tests/servers/tests.py
index dbb298e003..fa5e5d4690 100644
--- a/tests/servers/tests.py
+++ b/tests/servers/tests.py
@@ -103,12 +103,9 @@ class LiveServerViews(LiveServerBase):
         Ensure that the LiveServerTestCase serves 404s.
         Refs #2879.
         """
-        try:
+        with self.assertRaises(HTTPError) as err:
             self.urlopen('/')
-        except HTTPError as err:
-            self.assertEqual(err.code, 404, 'Expected 404 response')
-        else:
-            self.fail('Expected 404 response')
+        self.assertEqual(err.exception.code, 404, 'Expected 404 response')
 
     def test_view(self):
         """
@@ -132,12 +129,9 @@ class LiveServerViews(LiveServerBase):
         tries to access a static file that isn't explicitly put under
         STATIC_ROOT.
         """
-        try:
+        with self.assertRaises(HTTPError) as err:
             self.urlopen('/static/another_app/another_app_static_file.txt')
-        except HTTPError as err:
-            self.assertEqual(err.code, 404, 'Expected 404 response')
-        else:
-            self.fail('Expected 404 response (got %d)' % err.code)
+        self.assertEqual(err.exception.code, 404, 'Expected 404 response')
 
     def test_media_files(self):
         """