3 files changed, 68 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7d0576769503..acbdd0bc433d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Fri Jan 13 03:39:36 UTC 2017
 pkgbase = python-tablib
 	pkgdesc = Format-agnostic tabular data library (XLS, JSON, YAML, CSV)
-	pkgver = 0.11.2
+	pkgver = 0.11.3
 	pkgrel = 1
 	url = http://python-tablib.org
 	arch = any
@@ -9,12 +11,13 @@ pkgbase = python-tablib
 	checkdepends = python2-pytest
 	makedepends = python-setuptools
 	makedepends = python2-setuptools
-	source = https://pypi.python.org/packages/source/t/tablib/tablib-0.11.2.tar.gz
-	sha256sums = 553dd5b58e8e6e039aaa61587ec2fab38c05f0e25f58ac65b81a7851db62a497
+	source = https://pypi.python.org/packages/12/93/2bdd501dad13f253cfc8bd066ff18313e4741c1c11d336dd9bbd78aa7845/tablib-0.11.3.tar.gz
+	source = remove-locale-from-str-regex.patch
+	sha256sums = 6369662b116a7ed7a13545ebac266c063f170ff9215e918ba01a1ef20a864c9a
+	sha256sums = 18ba282dbdc710edfda125ba80ca97a46bf9eb7e6183dc11eb1a47825f3b12ae
 
 pkgname = python-tablib
 	depends = python
 
 pkgname = python2-tablib
-	depends = python2
 
diff --git a/PKGBUILD b/PKGBUILD
index c086a3b421cb..821bbb42e01c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: David Scholl <djscholl at gmail dot com>
 _module="tablib"
 pkgname=("python-${_module}" "python2-${_module}")
-pkgver="0.11.2"
+pkgver="0.11.3"
 pkgrel="1"
 pkgdesc="Format-agnostic tabular data library (XLS, JSON, YAML, CSV)"
 arch=("any")
@@ -9,10 +9,14 @@ url="http://python-tablib.org"
 license=("MIT")
 makedepends=("python-setuptools" "python2-setuptools")
 checkdepends=("python-pytest" "python2-pytest")
-source=("https://pypi.python.org/packages/source/${_module:0:1}/${_module}/${_module}-${pkgver}.tar.gz")
-sha256sums=('553dd5b58e8e6e039aaa61587ec2fab38c05f0e25f58ac65b81a7851db62a497')
+source=("https://pypi.python.org/packages/12/93/2bdd501dad13f253cfc8bd066ff18313e4741c1c11d336dd9bbd78aa7845/${_module}-${pkgver}.tar.gz"
+       'remove-locale-from-str-regex.patch')
+sha256sums=('6369662b116a7ed7a13545ebac266c063f170ff9215e918ba01a1ef20a864c9a'
+            '18ba282dbdc710edfda125ba80ca97a46bf9eb7e6183dc11eb1a47825f3b12ae')
 
 prepare() {
+    cd "${srcdir}/${_module}-${pkgver}"
+    patch -p1 < ${srcdir}/remove-locale-from-str-regex.patch
     cp -a "${srcdir}/${_module}-${pkgver}"{,-python2}
 }
 
@@ -39,7 +43,6 @@ package_python-tablib() {
 }
 
 package_python2-tablib() {
-    depends=("python2")
     cd "${srcdir}/${_module}-${pkgver}-python2"
     python2 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
     install -D -m644 "${srcdir}/${_module}-${pkgver}-python2/LICENSE" \
diff --git a/remove-locale-from-str-regex.patch b/remove-locale-from-str-regex.patch
new file mode 100644
index 000000000000..f2b1294f2d68
--- /dev/null
+++ b/remove-locale-from-str-regex.patch
@@ -0,0 +1,54 @@
+From 54f9041f2c3cd47643bf4b9183f8cb530caf6313 Mon Sep 17 00:00:00 2001
+From: Andrii Soldatenko <andrii.soldatenko@ethoos.com>
+Date: Sun, 18 Dec 2016 16:44:18 +0200
+Subject: [PATCH] Remove LOCALE from str regular expression
+
+---
+ tablib/packages/xlwt/ExcelFormulaLexer.py  | 4 ++--
+ tablib/packages/xlwt3/ExcelFormulaLexer.py | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+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 @@
+ 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 @@
+ 
+ _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 @@
+ 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 @@
+ 

+ _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