Merge pull request #12 from novafloss/9-support-django19

Adding Django 1.9 support

Author: brunobord

.travis.yml

@@ -4,6 +4,7 @@ env:
     - TOX_ENV=py27-django16
     - TOX_ENV=py27-django17
     - TOX_ENV=py27-django18
+    - TOX_ENV=py27-django19
     - TOX_ENV=flake8
 script: tox -e $TOX_ENV
 install:

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## master (unreleased)
 
-- Nothing changed yet.
+- Added Django 1.9 suport (#9).
 
 ## 1.0.0 (2016-06-23)
 

chunkator/__init__.py

@@ -2,8 +2,6 @@
 Toolbox for chunking / slicing querysets
 """
 
-from django.db.models.query import ValuesQuerySet
-
 
 class MissingPkFieldException(Exception):
     """
@@ -23,7 +21,10 @@ def chunkator(source_qs, chunk_size, query_log=None):
     CPU-and-RAM-consuming ``len(queryset)`` query.
     """
     pk = None
-    if isinstance(source_qs, ValuesQuerySet):
+    # In django 1.9, _fields is always present and `None` if 'values()' is used
+    # In Django 1.8 and below, _fields will only be present if using `values()`
+    has_fields = hasattr(source_qs, '_fields') and source_qs._fields
+    if has_fields:
         if "pk" not in source_qs._fields:
             raise MissingPkFieldException("The values() call must include the `pk` field")  # noqa
 
@@ -37,7 +38,8 @@ def chunkator(source_qs, chunk_size, query_log=None):
             query_log.write('{page.query}\n'.format(page=page))
         nb_items = 0
         for item in page:
-            if isinstance(queryset, ValuesQuerySet):
+            # source_qs._fields exists *and* is not none when using "values()"
+            if has_fields:
                 pk = item["pk"]
             else:
                 pk = item.pk

tox.ini

@@ -1,12 +1,13 @@
 [tox]
-envlist = {py27,py34}-django{16,17,18},flake8
+envlist = {py27,py34}-django{16,17,18,19},flake8
 
 [testenv]
 usedevelop = True
 deps =
     django16: Django>=1.6,<1.7
     django17: Django>=1.7,<1.8
     django18: Django>=1.8,<1.9
+    django19: Django>=1.9,<1.10
     flake8: flake8
 commands =
     pip install -e demo/