Partial revert of commit 2bf403ec

from django.contrib.gis import gdal

from django.contrib.gis.geos import HAS_GEOS

from django.contrib.gis.tests.utils import (

    no_mysql, no_oracle, no_spatialite,

    HAS_SPATIAL_DB, no_mysql, no_oracle, no_spatialite,

    mysql, oracle, postgis, spatialite)

from django.test import TestCase

from django.utils import six

    return spatial_version and (2, 0, 0) <= spatial_version <= (2, 0, 1)

@skipUnless(HAS_GEOS and postgis, "Geos and postgis are required.")

@skipUnless(HAS_GEOS and HAS_SPATIAL_DB, "Geos and spatial db are required.")

class GeoModelTest(TestCase):

    def test_fixtures(self):

        self.assertTrue(isinstance(cities2[0].point, Point))

@skipUnless(HAS_GEOS and postgis, "Geos and postgis are required.")

@skipUnless(HAS_GEOS and HAS_SPATIAL_DB, "Geos and spatial db are required.")

class GeoLookupTest(TestCase):

    @no_mysql

            self.assertEqual('Lawrence', City.objects.get(point__relate=(ks.poly, intersects_mask)).name)

@skipUnless(HAS_GEOS and postgis, "Geos and postgis are required.")

@skipUnless(HAS_GEOS and HAS_SPATIAL_DB, "Geos and spatial db are required.")

class GeoQuerySetTest(TestCase):

    # Please keep the tests in GeoQuerySet method's alphabetic order