Commit 13d16697 authored by Tim Graham's avatar Tim Graham
Browse files

[1.9.x] Fixed flake8 2.6 warnings. 

Backport of ea34426a from master
parent 1cfcc02f

django/contrib/gis/db/backends/base/models.py

+4 −4
Original line number Diff line number Diff line
@@ -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:

django/contrib/gis/db/models/sql/aggregates.py

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
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)

tests/postgres_tests/migrations/0002_create_test_models.py

+4 −1
Original line number Diff line number Diff line
@@ -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):

tests/servers/tests.py

+4 −10
Original line number Diff line number Diff line
@@ -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):

        """