Merge pull request #24 from python-babel/support-django-1.9

support django 1.9

.travis.yml

@@ -6,17 +6,18 @@ env:
   - TOX_ENV=py27-django16
   - TOX_ENV=py27-django17
   - TOX_ENV=py27-django18
+  - TOX_ENV=py27-django19
   - TOX_ENV=py27-djangomaster
-  - TOX_ENV=py33-django15
-  - TOX_ENV=py33-django16
-  - TOX_ENV=py33-django17
-  - TOX_ENV=py33-django18
-  - TOX_ENV=py33-djangomaster
   - TOX_ENV=py34-django15
   - TOX_ENV=py34-django16
   - TOX_ENV=py34-django17
   - TOX_ENV=py34-django18
+  - TOX_ENV=py34-django19
   - TOX_ENV=py34-djangomaster
+  - TOX_ENV=py33-django15
+  - TOX_ENV=py33-django16
+  - TOX_ENV=py33-django17
+  - TOX_ENV=py33-django18
   - TOX_ENV=py26-django15
   - TOX_ENV=py26-django16
   - TOX_ENV=lint

django_babel/extract.py

@@ -33,7 +33,14 @@ def extract_django(fileobj, keywords, comment_tags, options):
     encoding = options.get('encoding', 'utf8')
     text = fileobj.read().decode(encoding)
 
-    for t in Lexer(text, None).tokenize():
+    try:
+        text_lexer = Lexer(text)
+    except TypeError:
+        # Django 1.9 changed the way we invoke Lexer; older versions
+        # require two parameters.
+        text_lexer = Lexer(text, None)
+
+    for t in text_lexer.tokenize():
         lineno += t.contents.count('\n')
         if intrans:
             if t.token_type == TOKEN_BLOCK:

setup.py

@@ -24,7 +24,7 @@ setup(
     url='https://github.com/python-babel/django-babel/',
     packages=find_packages(exclude=('tests',)),
     install_requires=[
-        'django>=1.4,<1.9',
+        'django>=1.4,<1.10',
         'babel>=1.3',
     ],
     classifiers=[

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = {py27,py33,py34}-django{15,16,17,18,master}, py26-django{15,16}, lint, docs
+envlist = {py27,py34}-django{15,16,17,18,19,master}, py33-django{15,16,17,18}, py26-django{15,16}, lint, docs
 
 [testenv]
 deps =
@@ -11,6 +11,7 @@ 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
     djangomaster: https://github.com/django/django/archive/master.tar.gz#egg=Django
 commands = py.test {posargs}