[arch-commits] Commit in python-xlwt/trunk (PKGBUILD python3.6.patch)

[Felix Yan]

    Date: Sunday, December 25, 2016 @ 16:46:11
  Author: felixonmars
Revision: 201953

upgpkg: python-xlwt 1.1.2-2

python 3.6 rebuild

Added:
  python-xlwt/trunk/python3.6.patch
Modified:
  python-xlwt/trunk/PKGBUILD

-----------------+
 PKGBUILD        |    9 ++++++---
 python3.6.patch |   36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-12-25 16:46:04 UTC (rev 201952)
+++ PKGBUILD	2016-12-25 16:46:11 UTC (rev 201953)
@@ -6,17 +6,20 @@
 pkgbase=python-xlwt
 pkgname=('python2-xlwt' 'python-xlwt')
 pkgver=1.1.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Library to create spreadsheet files compatible with MS Excel 97/2000/XP/2003 XLS files"
 arch=('any')
 url="http://www.python-excel.org/"
 license=('BSD')
 makedepends=('python2-setuptools' 'python-setuptools')
-source=("https://github.com/python-excel/xlwt/archive/${pkgver}.tar.gz")
-md5sums=('7533c37c5908200627b754c135241b75')
+source=("https://github.com/python-excel/xlwt/archive/${pkgver}.tar.gz"
+        python3.6.patch)
+md5sums=('7533c37c5908200627b754c135241b75'
+         '0c6581f27989b3c141d78b53b09092a1')
 
 build() {
   cd "$srcdir"
+  (cd xlwt-${pkgver}; patch -p1 -i ../python3.6.patch)
   cp -a xlwt-${pkgver} xlwt-py2-${pkgver}
 
   msg "Building Python2"

Added: python3.6.patch
===================================================================
--- python3.6.patch	                        (rev 0)
+++ python3.6.patch	2016-12-25 16:46:11 UTC (rev 201953)
@@ -0,0 +1,36 @@
+From 86564ef26341020316cd8a27c704ef1dc5a6129b Mon Sep 17 00:00:00 2001
+From: Jon Dufresne <jon.dufresne at gmail.com>
+Date: Thu, 18 Aug 2016 17:17:24 -0700
+Subject: [PATCH] Remove LOCALE from str regular expression
+
+Fixes warning:
+
+DeprecationWarning: LOCALE flag with a str pattern is deprecated. Will be an error in 3.6
+
+Fixes #90
+---
+ xlwt/ExcelFormulaLexer.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/xlwt/ExcelFormulaLexer.py b/xlwt/ExcelFormulaLexer.py
+index 46a2bff..8ff7386 100644
+--- a/xlwt/ExcelFormulaLexer.py
++++ b/xlwt/ExcelFormulaLexer.py
+@@ -3,7 +3,7 @@
+ 
+ from .antlr import EOF, CommonToken as Tok, TokenStream, TokenStreamException
+ from . import ExcelFormulaParser
+-from re import compile as recompile, LOCALE, IGNORECASE, VERBOSE
++from re import compile as recompile, IGNORECASE, VERBOSE
+ 
+ 
+ int_const_pattern = r"\d+\b"
+@@ -50,7 +50,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