[Python-modules-commits] [ply] 04/08: merge patched into master
Arnaud Fontaine
arnau at moszumanska.debian.org
Fri Nov 18 06:50:31 UTC 2016
This is an automated email from the git hooks/post-receive script.
arnau pushed a commit to branch master
in repository ply.
commit 845a2871aec142a86d09ab933a7453653e2bb82f
Merge: 56eb3cf 30bd4b7
Author: Arnaud Fontaine <arnaud.fontaine at nexedi.com>
Date: Fri Nov 18 15:32:05 2016 +0900
merge patched into master
ANNOUNCE | 8 +-
CHANGES | 36 ++
PKG-INFO | 2 +-
README.md | 4 +-
debian/.git-dpm | 6 +-
debian/patches/py35-compat.patch | 219 --------
debian/patches/relax-lex-tabversion-check.patch | 4 +-
debian/patches/series | 1 -
doc/ply.html | 39 +-
example/BASIC/basic.py | 46 +-
example/BASIC/basiclex.py | 71 +--
example/BASIC/basiclog.py | 56 +-
example/BASIC/basinterp.py | 719 +++++++++++++-----------
example/BASIC/basparse.py | 290 ++++++----
example/GardenSnake/GardenSnake.py | 160 ++++--
example/ansic/clex.py | 132 ++---
example/ansic/cparse.py | 208 ++++++-
example/calc/calc.py | 50 +-
example/calc/parser.out | 395 -------------
example/calc/parsetab.py | 39 --
example/calcdebug/calc.py | 52 +-
example/calceof/calc.py | 51 +-
example/classcalc/calc.py | 72 +--
example/closurecalc/calc.py | 44 +-
example/hedit/hedit.py | 22 +-
example/newclasscalc/calc.py | 73 +--
example/optcalc/calc.py | 67 ++-
example/unicalc/calc.py | 66 ++-
example/yply/ylex.py | 91 +--
example/yply/yparse.py | 153 ++---
example/yply/yply.py | 10 +-
ply.egg-info/PKG-INFO | 2 +-
ply.egg-info/SOURCES.txt | 19 +-
ply/__init__.py | 2 +-
ply/cpp.py | 13 +-
ply/lex.py | 13 +-
ply/yacc.py | 75 ++-
setup.cfg | 8 +-
setup.py | 2 +-
test/parser.out | 1 -
test/pkg_test1/parsing/lextab.py | 10 -
test/pkg_test1/parsing/parser.out | 395 -------------
test/pkg_test1/parsing/parsetab.py | 39 --
test/pkg_test2/parsing/calclextab.py | 10 -
test/pkg_test2/parsing/calcparsetab.py | 39 --
test/pkg_test2/parsing/parser.out | 395 -------------
test/pkg_test3/generated/lextab.py | 10 -
test/pkg_test3/generated/parser.out | 395 -------------
test/pkg_test3/generated/parsetab.py | 39 --
test/pkg_test5/parsing/lextab.py | 10 -
test/pkg_test5/parsing/parser.out | 395 -------------
test/pkg_test5/parsing/parsetab.py | 39 --
test/pkg_test6/parsing/lextab.py | 10 -
test/pkg_test6/parsing/parser.out | 338 -----------
test/pkg_test6/parsing/parsetab.py | 39 --
55 files changed, 1613 insertions(+), 3871 deletions(-)
diff --cc debian/.git-dpm
index 1d93163,0000000..c6e274e
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
- ee980f6cd185765b182c74bd99ec40d3a32d7bc3
- ee980f6cd185765b182c74bd99ec40d3a32d7bc3
- 3146c990b36b9d5c56df8bfc819a80c7b14ec85a
++30bd4b7bbcf989ec11b211e8bc7a6842889db196
++30bd4b7bbcf989ec11b211e8bc7a6842889db196
++466362e0b5385640af2ec20d3b71f2d5b10ca85e
+466362e0b5385640af2ec20d3b71f2d5b10ca85e
+ply_3.9.orig.tar.gz
+3909910312996082dfa9ca9b5300113636163b66
+150750
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/relax-lex-tabversion-check.patch
index a7820a6,0000000..dd5a62c
mode 100644,000000..100644
--- a/debian/patches/relax-lex-tabversion-check.patch
+++ b/debian/patches/relax-lex-tabversion-check.patch
@@@ -1,31 -1,0 +1,31 @@@
- From a0d2b0460a1dfc5deba4ce30af484d3400993746 Mon Sep 17 00:00:00 2001
++From 30bd4b7bbcf989ec11b211e8bc7a6842889db196 Mon Sep 17 00:00:00 2001
+From: Jakub Wilk <jwilk at debian.org>
+Date: Thu, 8 Oct 2015 10:15:00 -0700
+Subject: Don't break already built packages with wrong _tabversion
+
+Forwarded: not-needed
+Patch-Name: relax-lex-tabversion-check.patch
+---
+ ply/lex.py | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/ply/lex.py b/ply/lex.py
- index 70edf13..6ed04c9 100644
++index 0f3e464..0b44a75 100644
+--- a/ply/lex.py
++++ b/ply/lex.py
+@@ -215,7 +215,14 @@ class Lexer:
+ exec('import %s' % tabfile)
+ lextab = sys.modules[tabfile]
+
+- if getattr(lextab, '_tabversion', '0.0') != __tabversion__:
++ # python-ply 3.3-1 is shipped by Debian since Squeeze, so
++ # to not break packages that were built with wrong
++ # _tabversion we need to explicitly fix it.
++ actual_tabversion = getattr(lextab, '_tabversion', '0.0')
++ if actual_tabversion in ('3.3', '3.4'):
++ actual_tabversion = '3.2'
++
++ if actual_tabversion != __tabversion__:
+ raise ImportError('Inconsistent PLY version')
+
+ self.lextokens = lextab._lextokens
diff --cc debian/patches/series
index cadfd2c,0000000..8b47fdf
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
+relax-lex-tabversion-check.patch
- py35-compat.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/ply.git
More information about the Python-modules-commits
mailing list