Commit 96fd5557 authored by Alex Gaynor's avatar Alex Gaynor
Browse files

Removed a ton of unused local vars

parent 0ee8aa5c

django/contrib/auth/tests/urls.py

+2 −2
Original line number Diff line number Diff line
@@ -23,14 +23,14 @@ def remote_user_auth_view(request): 
    return HttpResponse(t.render(c))



def auth_processor_no_attr_access(request):

    r1 = render_to_response('context_processors/auth_attrs_no_access.html',

    render_to_response('context_processors/auth_attrs_no_access.html',

        RequestContext(request, {}, processors=[context_processors.auth]))

    # *After* rendering, we check whether the session was accessed

    return render_to_response('context_processors/auth_attrs_test_access.html',

        {'session_accessed':request.session.accessed})



def auth_processor_attr_access(request):

    r1 = render_to_response('context_processors/auth_attrs_access.html',

    render_to_response('context_processors/auth_attrs_access.html',

        RequestContext(request, {}, processors=[context_processors.auth]))

    return render_to_response('context_processors/auth_attrs_test_access.html',

        {'session_accessed':request.session.accessed})

django/contrib/gis/db/backends/spatialite/creation.py

+0 −1
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ class SpatiaLiteCreation(DatabaseCreation): 


        if isinstance(f, GeometryField):

            gqn = self.connection.ops.geo_quote_name

            qn = self.connection.ops.quote_name

            db_table = model._meta.db_table



            output.append(style.SQL_KEYWORD('SELECT ') +

django/contrib/gis/geos/tests/test_geos.py

+3 −3
Original line number Diff line number Diff line
@@ -469,7 +469,7 @@ class GEOSTest(unittest.TestCase, TestDataMixin): 


    def test_multipolygons(self):

        "Testing MultiPolygon objects."

        prev = fromstr('POINT (0 0)')

        fromstr('POINT (0 0)')

        for mp in self.geometries.multipolygons:

            mpoly = fromstr(mp.wkt)

            self.assertEqual(mpoly.geom_type, 'MultiPolygon')
@@ -709,7 +709,7 @@ class GEOSTest(unittest.TestCase, TestDataMixin): 
                new = Point(random.randint(21, 100), random.randint(21, 100))

                # Testing the assignment

                mp[i] = new

                s = str(new) # what was used for the assignment is still accessible

                str(new) # what was used for the assignment is still accessible

                self.assertEqual(mp[i], new)

                self.assertEqual(mp[i].wkt, new.wkt)

                self.assertNotEqual(pnt, mp[i])
@@ -730,7 +730,7 @@ class GEOSTest(unittest.TestCase, TestDataMixin): 
                self.assertNotEqual(mpoly[i], poly)

                # Testing the assignment

                mpoly[i] = poly

                s = str(poly) # Still accessible

                str(poly) # Still accessible

                self.assertEqual(mpoly[i], poly)

                self.assertNotEqual(mpoly[i], old_poly)

django/contrib/gis/management/commands/ogrinspect.py

+2 −2
Original line number Diff line number Diff line
@@ -93,8 +93,8 @@ class Command(LabelCommand): 
        show_mapping = options.pop('mapping', False)



        # Getting rid of settings that `_ogrinspect` doesn't like.

        verbosity = options.pop('verbosity', False)

        settings = options.pop('settings', False)

        options.pop('verbosity', False)

        options.pop('settings', False)



        # Returning the output of ogrinspect with the given arguments

        # and options.

django/contrib/gis/tests/geoapp/test_regress.py

+3 −3
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ class GeoRegressionTests(TestCase): 
                  'description' : name,

                  'kml' : '<Point><coordinates>5.0,23.0</coordinates></Point>'

                  }]

        kmz = render_to_kmz('gis/kml/placemarks.kml', {'places' : places})

        render_to_kmz('gis/kml/placemarks.kml', {'places' : places})



    @no_spatialite

    @no_mysql
@@ -52,7 +52,7 @@ class GeoRegressionTests(TestCase): 
    def test_unicode_date(self):

        "Testing dates are converted properly, even on SpatiaLite. See #16408."

        founded = datetime(1857, 5, 23)

        mansfield = PennsylvaniaCity.objects.create(name='Mansfield', county='Tioga', point='POINT(-77.071445 41.823881)',

        PennsylvaniaCity.objects.create(name='Mansfield', county='Tioga', point='POINT(-77.071445 41.823881)',

                                        founded=founded)

        self.assertEqual(founded, PennsylvaniaCity.objects.datetimes('founded', 'day')[0])

        self.assertEqual(founded, PennsylvaniaCity.objects.aggregate(Min('founded'))['founded__min'])