Merge pull request #1 from bertonha/fix-django-1.10

Fix for Django 1.10
pennersr · Aug 16, 2016 · df9a4b4 · df9a4b4
2 parents 76f1d0b + 721ddaf
commit df9a4b4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,10 @@
 language: python
 python: 2.7
 env:
-    - TOX_ENV=py27
-    - TOX_ENV=py34
+    - TOX_ENV=py27-django19
+    - TOX_ENV=py34-django19
+    - TOX_ENV=py27-django110
+    - TOX_ENV=py34-django110
 install:
   - pip install tox
   - pip install "coverage>=3.7.1" coveralls

diff --git a/tox.ini b/tox.ini
@@ -1,14 +1,16 @@
 [tox]
 distribute = False
 envlist =
-    py27, py34
+    {py27,py34}-django19
+    {py27,py34}-django110
 
 
 [testenv]
 setenv = DJANGO_SETTINGS_MODULE=trackstats.tests.settings
 usedevelop = True
 deps =
-    Django
+    django19: Django==1.9.9
+    django110: Django==1.10
     pytz
     coverage
 commands =

diff --git a/trackstats/trackers.py b/trackstats/trackers.py
@@ -81,8 +81,8 @@ def track(self, qs):
                 timezone.get_current_timezone_name()
                 if settings.USE_TZ else None)
 
-            is_datetime = isinstance(qs.model._meta.get_field_by_name(
-                self.date_field)[0], models.DateTimeField)
+            is_datetime = isinstance(qs.model._meta.get_field(
+                self.date_field), models.DateTimeField)
             if is_datetime:
                 date_sql, tz_params = connection.ops.datetime_cast_date_sql(
                     self.date_field,