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 Source: https://github.com/python-babel/django-babel/pull/45 --- 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