Merge pull request #176 from rpkilby/django-six

Use Django's vendored 'six'

Author: nemesifier

requirements-test.txt

@@ -1,6 +1,4 @@
-six
 psycopg2
-djangorestframework>=3.3
 coverage==3.7.1  # rq.filter: >=3,<4
 coveralls
 django-filter>=0.15,<1.2

requirements.txt

@@ -1,2 +1 @@
-six
 djangorestframework>=3.3,<3.9

rest_framework_gis/fields.py

@@ -1,10 +1,10 @@
-import six  # TODO Remove this along with GeoJsonDict when support for python 2.6/2.7 is dropped.
 import json
 from collections import OrderedDict
 
 from django.contrib.gis.geos import GEOSGeometry, GEOSException
 from django.contrib.gis.gdal import GDALException
 from django.core.exceptions import ValidationError
+from django.utils import six  # TODO Remove this along with GeoJsonDict when support for python 2.6/2.7 is dropped.
 from django.utils.translation import ugettext_lazy as _
 from rest_framework.fields import Field, SerializerMethodField