From bf11befdec13efd49ee27a92029199d264e29973 Mon Sep 17 00:00:00 2001 From: Ivan Tsouvarev Date: Fri, 7 Sep 2018 19:24:14 +0300 Subject: [PATCH 1/2] Fix imports of token types for Django 2.1 --- django_babel/extract.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/django_babel/extract.py b/django_babel/extract.py index edb42c7..6748bae 100644 --- a/django_babel/extract.py +++ b/django_babel/extract.py @@ -1,5 +1,14 @@ # -*- coding: utf-8 -*- -from django.template.base import Lexer, TOKEN_TEXT, TOKEN_VAR, TOKEN_BLOCK +try: + # Django >= 2.1 + from django.template.base import Lexer, TokenType + TOKEN_TEXT = TokenType.TEXT + TOKEN_VAR = TokenType.VAR + TOKEN_BLOCK = TokenType.BLOCK +except ImportError: + # Django < 2.1 + from django.template.base import Lexer, TOKEN_TEXT, TOKEN_VAR, TOKEN_BLOCK + from django.utils.translation import trim_whitespace from django.utils.encoding import smart_text From 564530389ff5e8856f80bbfad610b3e5902ccc94 Mon Sep 17 00:00:00 2001 From: Ivan Tsouvarev Date: Fri, 7 Sep 2018 20:44:09 +0300 Subject: [PATCH 2/2] Update tox matrix --- tox.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index e763d02..1fe3de5 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{35,36}-djangomaster, py{27,34,35,36}-django{18,111,20}, lint, docs +envlist = py{35,36,37}-django{21,master}, py{27,34,35,36}-django{18,111,20}, lint, docs [testenv] deps = @@ -11,6 +11,7 @@ deps = django18: Django>=1.8,<1.9 django111: Django>=1.11,<2.0 django20: Django>=2.0,<2.1 + django21: Django>=2.1,<2.2 djangomaster: https://github.com/django/django/archive/master.tar.gz#egg=Django commands = py.test {posargs}