diff --git a/AUTHORS b/AUTHORS index 845d42a..8afb539 100644 --- a/AUTHORS +++ b/AUTHORS @@ -33,3 +33,4 @@ Patches and Suggestions - Marco Dallagiacoma - Mathias Loesch - Tushar Makkar +- Andrii Soldatenko diff --git a/tablib/packages/xlwt/ExcelFormulaLexer.py b/tablib/packages/xlwt/ExcelFormulaLexer.py index 91d999f..5004d8e 100644 --- a/tablib/packages/xlwt/ExcelFormulaLexer.py +++ b/tablib/packages/xlwt/ExcelFormulaLexer.py @@ -4,7 +4,7 @@ import sys from antlr import EOF, CommonToken as Tok, TokenStream, TokenStreamException import struct import ExcelFormulaParser -from re import compile as recompile, match, LOCALE, UNICODE, IGNORECASE, VERBOSE +from re import compile as recompile, match, UNICODE, IGNORECASE, VERBOSE int_const_pattern = r"\d+\b" @@ -51,7 +51,7 @@ pattern_type_tuples = ( _re = recompile( '(' + ')|('.join([i[0] for i in pattern_type_tuples]) + ')', - VERBOSE+LOCALE+IGNORECASE) + VERBOSE+IGNORECASE) _toktype = [None] + [i[1] for i in pattern_type_tuples] # need dummy at start because re.MatchObject.lastindex counts from 1 diff --git a/tablib/packages/xlwt3/ExcelFormulaLexer.py b/tablib/packages/xlwt3/ExcelFormulaLexer.py index 5dc546c..9b6103c 100644 --- a/tablib/packages/xlwt3/ExcelFormulaLexer.py +++ b/tablib/packages/xlwt3/ExcelFormulaLexer.py @@ -2,7 +2,7 @@ import sys from .antlr import EOF, CommonToken as Tok, TokenStream, TokenStreamException import struct from . import ExcelFormulaParser -from re import compile as recompile, match, LOCALE, UNICODE, IGNORECASE, VERBOSE +from re import compile as recompile, match, UNICODE, IGNORECASE, VERBOSE int_const_pattern = r"\d+\b" @@ -49,7 +49,7 @@ pattern_type_tuples = ( _re = recompile( '(' + ')|('.join([i[0] for i in pattern_type_tuples]) + ')', - VERBOSE+LOCALE+IGNORECASE) + VERBOSE+IGNORECASE) _toktype = [None] + [i[1] for i in pattern_type_tuples] # need dummy at start because re.MatchObject.lastindex counts from 1 diff --git a/tox.ini b/tox.ini index 52cd321..34003e1 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ # and then run "tox" from this directory. [tox] -envlist = py26, py27, py32, py33, py34, pypy +envlist = py26, py27, py32, py33, py34, py35, py36, pypy [testenv] commands = python setup.py test