Commit c5e258ee authored by Tim Graham's avatar Tim Graham
Browse files

[1.9.x] Removed unneeded GeoManagers in tests. 

Backport of 9027fac8 from master
parent 5b6c7512

django/contrib/gis/sitemaps/views.py

+1 −2
Original line number Diff line number Diff line
@@ -13,8 +13,7 @@ def kml(request, label, model, field_name=None, compress=False, using=DEFAULT_DB 
    """

    This view generates KML for the given app label, model, and field name.



    The model's default manager must be GeoManager, and the field name

    must be that of a geographic field.

    The field name must be that of a geographic field.

    """

    placemarks = []

    try:

tests/gis_tests/geo3d/models.py

+0 −2
Original line number Diff line number Diff line
@@ -47,8 +47,6 @@ class Polygon3D(NamedModel): 


class SimpleModel(models.Model):



    objects = models.GeoManager()



    class Meta:

        abstract = True

        required_db_features = ['gis_enabled']

tests/gis_tests/geoadmin/models.py

+0 −2
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ class City(models.Model): 
    name = models.CharField(max_length=30)

    point = models.PointField()



    objects = models.GeoManager()



    class Meta:

        app_label = 'geoadmin'

        required_db_features = ['gis_enabled']

tests/gis_tests/geoapp/models.py

+0 −8
Original line number Diff line number Diff line
@@ -35,10 +35,6 @@ class PennsylvaniaCity(City): 
    county = models.CharField(max_length=30)

    founded = models.DateTimeField(null=True)



    # TODO: This should be implicitly inherited.



    objects = models.GeoManager()



    class Meta:

        app_label = 'geoapp'

        required_db_features = ['gis_enabled']
@@ -77,8 +73,6 @@ class UniqueTogetherModel(models.Model): 
class Truth(models.Model):

    val = models.BooleanField(default=False)



    objects = models.GeoManager()



    class Meta:

        required_db_features = ['gis_enabled']
@@ -90,8 +84,6 @@ class Feature(NamedModel): 
class MinusOneSRID(models.Model):

    geom = models.PointField(srid=-1)  # Minus one SRID.



    objects = models.GeoManager()



    class Meta:

        required_db_features = ['gis_enabled']

tests/gis_tests/inspectapp/models.py

+0 −4
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@ class AllOGRFields(models.Model): 
    geom = models.PolygonField()

    point = models.PointField()



    objects = models.GeoManager()



    class Meta:

        required_db_features = ['gis_enabled']
@@ -24,7 +22,5 @@ class Fields3D(models.Model): 
    line = models.LineStringField(dim=3)

    poly = models.PolygonField(dim=3)



    objects = models.GeoManager()



    class Meta:

        required_db_features = ['gis_enabled']