Django 1.9 support

geoposition/fields.py

@@ -1,15 +1,14 @@
 from __future__ import unicode_literals
 
 from django.db import models
-from django.utils.six import with_metaclass
 from django.utils.translation import ugettext_lazy as _
 from django.utils.encoding import smart_text
 
 from . import Geoposition
 from .forms import GeopositionField as GeopositionFormField
 
 
-class GeopositionField(with_metaclass(models.SubfieldBase, models.Field)):
+class GeopositionField(models.Field):
     description = _("A geoposition (latitude and longitude)")
 
     def __init__(self, *args, **kwargs):
@@ -19,12 +18,13 @@ def __init__(self, *args, **kwargs):
     def get_internal_type(self):
         return 'CharField'
 
-    def to_python(self, value):
+    def _parse_position(self, value):
         if not value or value == 'None':
             return None
         if isinstance(value, Geoposition):
             return value
         if isinstance(value, list):
+            value = list(map(str, value))
             return Geoposition(value[0], value[1])
 
         # default case is string
@@ -40,6 +40,12 @@ def to_python(self, value):
 
         return Geoposition(latitude, longitude)
 
+    def from_db_value(self, value, expression, connection, context):
+        return self._parse_position(value)
+
+    def to_python(self, value):
+        return self._parse_position(value)
+
     def get_prep_value(self, value):
         return str(value)
 

geoposition/tests/__init__.py

@@ -1 +0,0 @@
-from .test_geoposition import GeopositionTestCase

geoposition/tests/settings.py

@@ -4,7 +4,6 @@
 SECRET_KEY = '+*mac$-+vop%1#8zp%)blgacvst%fm)p$&u#p!5(x5nv9c0955'
 
 DEBUG = True
-TEMPLATE_DEBUG = True
 
 ALLOWED_HOSTS = []
 
@@ -19,6 +18,25 @@
     'example',
 )
 
+
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [
+            os.path.join(BASE_DIR, 'templates')
+        ],
+        'DEBUG': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.template.context_processors.debug',
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    },
+]
+
 MIDDLEWARE_CLASSES = (
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',

geoposition/tests/test_geoposition.py

@@ -1,10 +1,10 @@
 from decimal import Decimal
-from django.test import SimpleTestCase
+from django.test import TestCase
 from geoposition import Geoposition
 from example.models import PointOfInterest
 
 
-class GeopositionTestCase(SimpleTestCase):
+class GeopositionTestCase(TestCase):
     def test_init_with_decimals(self):
         gp = Geoposition(Decimal('52.5'), Decimal('13.4'))
         self.assertEqual(gp.latitude, Decimal('52.5'))

geoposition/tests/urls.py

@@ -1,9 +1,10 @@
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
 from django.contrib import admin
+from example.views import poi_list
 
 admin.autodiscover()
 
-urlpatterns = patterns('',
-    url(r'^$', 'example.views.poi_list'),
+urlpatterns = [
+    url(r'^$', poi_list),
     url(r'^admin/', include(admin.site.urls)),
-)
+]