[Python-modules-commits] [pep8-naming] 06/07: merge patched into master

[Mattia Rizzolo]

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

mattia pushed a commit to branch master
in repository pep8-naming.

commit 457f04e9d940de81f051b785e98038cc56472b0e
Merge: 9b277d7 cb927a1
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Sun Jan 28 12:07:28 2018 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 .../patches/0001-Use-raw-strings-in-regexps.patch  | 27 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 run_tests.py                                       |  4 ++--
 4 files changed, 32 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 57c5d1f,0000000..0c79c4a
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
- 6b32d9a3a8de27bdbfa1919522fd831e7e9ee62e
- 6b32d9a3a8de27bdbfa1919522fd831e7e9ee62e
++cb927a1deac7a4c40bac88c3ad6bd0dcc3953367
++cb927a1deac7a4c40bac88c3ad6bd0dcc3953367
 +6b32d9a3a8de27bdbfa1919522fd831e7e9ee62e
 +6b32d9a3a8de27bdbfa1919522fd831e7e9ee62e
 +pep8-naming_0.4.1.orig.tar.xz
 +291102a01d3862727e853777903a6f180fbe2f61
 +7364
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Use-raw-strings-in-regexps.patch
index 0000000,0000000..b81881f
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Use-raw-strings-in-regexps.patch
@@@ -1,0 -1,0 +1,27 @@@
++From cb927a1deac7a4c40bac88c3ad6bd0dcc3953367 Mon Sep 17 00:00:00 2001
++From: Michael Hudson-Doyle <michael.hudson at canonical.com>
++Date: Sun, 28 Jan 2018 12:06:19 +0100
++Subject: Use raw strings in regexps
++
++To avoid DeprecationWarnings with Python 3.6.
++
++Signed-off-by: Mattia Rizzolo <mattia at debian.org>
++---
++ run_tests.py | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/run_tests.py b/run_tests.py
++index b3d1b93..ce97ff7 100644
++--- a/run_tests.py
+++++ b/run_tests.py
++@@ -6,8 +6,8 @@ import re
++ PyCF_ONLY_AST = 1024
++ 
++ IS_PY3 = sys.version_info[0] == 3
++-IS_PY3_TEST = re.compile("^#\s*python3\s*only")
++-IS_PY2_TEST = re.compile("^#\s*python2\s*only")
+++IS_PY3_TEST = re.compile(r"^#\s*python3\s*only")
+++IS_PY2_TEST = re.compile(r"^#\s*python2\s*only")
++ 
++ 
++ def main():
diff --cc debian/patches/series
index 0000000,0000000..e34ed68
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Use-raw-strings-in-regexps.patch

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