Add support for Django 2.0 / 2.1 (#22)

.travis.yml

@@ -11,6 +11,8 @@ env:
     - DJANGO_VERSION=1.9
     - DJANGO_VERSION=1.10
     - DJANGO_VERSION=1.11
+    - DJANGO_VERSION=2.0
+    - DJANGO_VERSION=2.1
 install:
   - pip install 'coverage<4' # coverage>=4 has issues with python3
   - pip install -q Django==$DJANGO_VERSION coveralls
@@ -26,3 +28,13 @@ matrix:
       env: DJANGO_VERSION=1.10
     - python: "3.3"
       env: DJANGO_VERSION=1.11
+    - python: "3.3"
+      env: DJANGO_VERSION=2.0
+    - python: "3.3"
+      env: DJANGO_VERSION=2.1
+    - python: "2.7"
+      env: DJANGO_VERSION=2.0
+    - python: "2.7"
+      env: DJANGO_VERSION=2.1
+    - python: "3.4"
+      env: DJANGO_VERSION=2.1

CONTRIBUTORS.txt

@@ -11,6 +11,7 @@ Generated by https://github.com/pydanny/contributors
   * Luke Plant (`@spookylukey`_)
   * Martin Mahner (<martin@mahner.org>)
   * Stéphane Raimbault (`@stephane`_)
+  * Xavier Ordoquy (`@xordoquy`_)
   * Zbigniew Siciarz (`@zsiciarz`_)
 .. _`@amcorreia`: https://github.com/amcorreia
 .. _`@zsiciarz`: https://github.com/zsiciarz
@@ -20,3 +21,5 @@ Generated by https://github.com/pydanny/contributors
 .. _`@pydanny`: https://github.com/pydanny
 .. _`@Backscratcher`: https://github.com/Backscratcher
 .. _`@jmichalicek`: https://github.com/jmichalicek
+.. _`@xordoquy`: https://github.com/xordoquy
+

dj_pagination/templatetags/pagination_tags.py

@@ -44,9 +44,10 @@
 )
 
 try:
+    from django.template.base import TokenType
+    TOKEN_BLOCK = TokenType.BLOCK
+except ImportError:     # Django < 2.0
     from django.template.base import TOKEN_BLOCK
-except ImportError:     # Django < 1.8
-    from django.template import TOKEN_BLOCK
 
 from django.template.loader import select_template
 from django.utils.text import unescape_string_literal