  import os, unittest
  from django.contrib.gis.geos import *
  from django.contrib.gis.db.backend import SpatialBackend
  from django.contrib.gis.db.models import F, Extent, Union
  from django.contrib.gis.tests.utils import no_mysql, no_oracle, no_spatialite
  from django.conf import settings
  from models import City, Location, DirectoryEntry, Parcel
  
  cities = (('Aurora', 'TX', -97.516111, 33.058333),
 
</s> remove from models import City, Location, DirectoryEntry, Parcel
 </s> add from models import City, Location, DirectoryEntry, Parcel, Book, Author </s> remove         dallas = City.objects.create(name='Dallas', location=loc2)
        houston = City.objects.create(name='Houston', location=loc1)
 </s> add         dallas = City.objects.create(name='Dallas', state='TX', location=loc2)
        houston = City.objects.create(name='Houston', state='TX', location=loc1) </s> remove         alias, col, field = obj.alias, obj.col, obj.field
 </s> add         col, field = obj.col, obj.field </s> remove             return super(WhereNode, self).add(((alias, col, field.db_type()), lookup_type, annotation, params), connector)
 </s> add             return super(WhereNode, self).add(((obj.alias, col, field.db_type()), lookup_type, annotation, params), connector)
from django.contrib.gis.db.models import Count, Extent, F, Union
  import os, unittest
  from django.contrib.gis.geos import *
  from django.contrib.gis.db.backend import SpatialBackend
from django.contrib.gis.db.models import Count, Extent, F, Union
  from django.contrib.gis.tests.utils import no_mysql, no_oracle, no_spatialite
  from django.conf import settings
  from models import City, Location, DirectoryEntry, Parcel
  
  cities = (('Aurora', 'TX', -97.516111, 33.058333),
keep keep keep replace keep keep keep keep keep
 Fixed #11087 -- Fixed the `Count` annotation when used with `GeoManager`.  Thanks to dgouldin for ticket and initial patch.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@10912 bcc190cf-cafb-0310-a4f2-bffc1f526a37 
django/contrib/gis/tests/relatedapp/tests.py