[Python-modules-commits] [behave] 02/03: merge patched into master

[Vincent Bernat]

This is an automated email from the git hooks/post-receive script.

bernat pushed a commit to branch master
in repository behave.

commit 2577d3d93299ccb5aad5f68cff73769123bb9467
Merge: b0af264 6c303a1
Author: Vincent Bernat <bernat at debian.org>
Date:   Sat Aug 5 12:44:39 2017 +0200

    merge patched into master

 behave/configuration.py                            |  4 +++-
 debian/.git-dpm                                    |  4 ++--
 ...3.6-compatibility-patch-re.LOCALE-removed.patch | 25 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 4607be6,0000000..f502703
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- ed6df9cf0e8522ada8e3eda1d69dfbebc972f271
- ed6df9cf0e8522ada8e3eda1d69dfbebc972f271
++6c303a1255e86e7c6d8a9f9b958ea83a7db5db70
++6c303a1255e86e7c6d8a9f9b958ea83a7db5db70
 +19d18b7b8dfb63b959de1b648af85d69afea47f6
 +19d18b7b8dfb63b959de1b648af85d69afea47f6
 +behave_1.2.5.orig.tar.bz2
 +80b7bda7f1a1fb2fd275eff419c4574e7173a929
 +348877
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Python-3.6-compatibility-patch-re.LOCALE-removed.patch
index 0000000,0000000..5eda7e2
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Python-3.6-compatibility-patch-re.LOCALE-removed.patch
@@@ -1,0 -1,0 +1,25 @@@
++From 6c303a1255e86e7c6d8a9f9b958ea83a7db5db70 Mon Sep 17 00:00:00 2001
++From: Vincent Bernat <bernat at debian.org>
++Date: Sat, 5 Aug 2017 12:44:17 +0200
++Subject: Python 3.6 compatibility patch (re.LOCALE removed)
++
++---
++ behave/configuration.py | 4 +++-
++ 1 file changed, 3 insertions(+), 1 deletion(-)
++
++diff --git a/behave/configuration.py b/behave/configuration.py
++index a2563dfbf081..134004c1c950 100644
++--- a/behave/configuration.py
+++++ b/behave/configuration.py
++@@ -661,8 +661,10 @@ class Configuration(object):
++         :param names: List of name parts or regular expressions (as text).
++         :return: Compiled regular expression to use.
++         """
+++        # -- NOTE: re.LOCALE is removed in Python 3.6 (deprecated in Python 3.5)
+++        # flags = (re.UNICODE | re.LOCALE)
++         pattern = u"|".join(names)
++-        return re.compile(pattern, flags=(re.UNICODE | re.LOCALE))
+++        return re.compile(pattern, flags=re.UNICODE)
++ 
++     def exclude(self, filename):
++         if isinstance(filename, FileLocation):
diff --cc debian/patches/series
index 5330725,0000000..7081fb7
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-docs-disable-use-of-sphincontrib.cheeseshop.patch
++0002-Python-3.6-compatibility-patch-re.LOCALE-removed.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/behave.git