summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2016-06-16 09:07:51 -0400
committerTim Graham <timograham@gmail.com>2016-06-16 09:12:50 -0400
commitea34426ae789d31b036f58c8fd59ce299649e91e (patch)
tree37478fcf8720331973b11bc7c0d2f21094d82a14 /django
parent96f97691ad5e1483263cea3bb4e4021b4c8dcc41 (diff)
Fixed flake8 2.6 warnings.
Diffstat (limited to 'django')
-rw-r--r--django/contrib/gis/db/backends/base/models.py8
-rw-r--r--django/core/management/commands/migrate.py2
2 files changed, 5 insertions, 5 deletions
diff --git a/django/contrib/gis/db/backends/base/models.py b/django/contrib/gis/db/backends/base/models.py
index 85f4478534..befb493919 100644
--- a/django/contrib/gis/db/backends/base/models.py
+++ b/django/contrib/gis/db/backends/base/models.py
@@ -40,14 +40,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/core/management/commands/migrate.py b/django/core/management/commands/migrate.py
index a1eb190eb1..b6c8748bff 100644
--- a/django/core/management/commands/migrate.py
+++ b/django/core/management/commands/migrate.py
@@ -213,7 +213,7 @@ class Command(BaseCommand):
model_keys.append(model_key)
post_migrate_apps.unregister_model(*model_key)
post_migrate_apps.render_multiple([
- ModelState.from_model(apps.get_model(*model_key)) for model_key in model_keys
+ ModelState.from_model(apps.get_model(*model)) for model in model_keys
])
# Send the post_migrate signal, so individual apps can do whatever they need