openstack/deb-python-django-babel
Code Issues Proposed changes

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

Browse Source 
support django 1.9
This commit is contained in:
Thomas Grainger
2015-12-04 11:23:56 +00:00
parent edbf90b5fe 57e337c070
commit 5d953ef9e3
4 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.travis.yml
View File

@@ -6,17 +6,18 @@ env:
- TOX_ENV=py27-django16 - TOX_ENV=py27-django16
- TOX_ENV=py27-django17 - TOX_ENV=py27-django17
- TOX_ENV=py27-django18 - TOX_ENV=py27-django18
- TOX_ENV=py27-django19
- TOX_ENV=py27-djangomaster - 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-django15
- TOX_ENV=py34-django16 - TOX_ENV=py34-django16
- TOX_ENV=py34-django17 - TOX_ENV=py34-django17
- TOX_ENV=py34-django18 - TOX_ENV=py34-django18
- TOX_ENV=py34-django19
- TOX_ENV=py34-djangomaster - 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-django15
- TOX_ENV=py26-django16 - TOX_ENV=py26-django16
- TOX_ENV=lint - TOX_ENV=lint

9
django_babel/extract.py
View File

@@ -33,7 +33,14 @@ def extract_django(fileobj, keywords, comment_tags, options):
encoding = options.get('encoding', 'utf8') encoding = options.get('encoding', 'utf8')
text = fileobj.read().decode(encoding) 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') lineno += t.contents.count('\n')
if intrans: if intrans:
if t.token_type == TOKEN_BLOCK: if t.token_type == TOKEN_BLOCK:

2
setup.py
View File

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

3
tox.ini
View File

@@ -1,5 +1,5 @@
[tox] [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] [testenv]
deps = deps =
@@ -11,6 +11,7 @@ deps =
django16: Django>=1.6,<1.7 django16: Django>=1.6,<1.7
django17: Django>=1.7,<1.8 django17: Django>=1.7,<1.8
django18: Django>=1.8,<1.9 django18: Django>=1.8,<1.9
django19: Django>=1.9,<1.10
djangomaster: https://github.com/django/django/archive/master.tar.gz#egg=Django djangomaster: https://github.com/django/django/archive/master.tar.gz#egg=Django
commands = py.test {posargs} commands = py.test {posargs}