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

Lexer's __init__ only takes template_string as arg (django 1.9)

Browse Source
This commit is contained in:
Sarina Canelake
2015-11-04 17:30:25 -05:00
committed by Thomas Grainger
parent 4c03571371
commit 76891338a5
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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: