[Python-modules-commits] r34116 - in packages/ply/trunk/debian (3 files)

[barry at users.alioth.debian.org]

    Date: Wednesday, September 2, 2015 @ 22:14:28
  Author: barry
Revision: 34116

* Team upload.
* New upstream release.
* debian/patches
  - Refreshed: relax-lex-tabversion-check.patch
  - Removed; applied upstream: fix-lex-tabversion.patch,
    fixed-yacc-tests-to-account-for-dict-hash-key-random.patch,
    more-test-fixes.patch, fixed-lexer-line-tracking.patch

Modified:
  packages/ply/trunk/debian/changelog
  packages/ply/trunk/debian/patches/relax-lex-tabversion-check.patch
  packages/ply/trunk/debian/patches/series

Modified: packages/ply/trunk/debian/changelog
===================================================================
--- packages/ply/trunk/debian/changelog	2015-09-02 19:46:24 UTC (rev 34115)
+++ packages/ply/trunk/debian/changelog	2015-09-02 22:14:28 UTC (rev 34116)
@@ -1,3 +1,15 @@
+ply (3.7-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release.
+  * debian/patches
+    - Refreshed: relax-lex-tabversion-check.patch
+    - Removed; applied upstream: fix-lex-tabversion.patch,
+      fixed-yacc-tests-to-account-for-dict-hash-key-random.patch,
+      more-test-fixes.patch, fixed-lexer-line-tracking.patch
+
+ -- Barry Warsaw <barry at debian.org>  Wed, 02 Sep 2015 17:50:09 -0400
+
 ply (3.4-5) unstable; urgency=medium
 
   * d/rules: add manpage for dh_python3-ply.

Modified: packages/ply/trunk/debian/patches/relax-lex-tabversion-check.patch
===================================================================
--- packages/ply/trunk/debian/patches/relax-lex-tabversion-check.patch	2015-09-02 19:46:24 UTC (rev 34115)
+++ packages/ply/trunk/debian/patches/relax-lex-tabversion-check.patch	2015-09-02 22:14:28 UTC (rev 34116)
@@ -3,11 +3,11 @@
 Forwarded: not-needed
 --- a/ply/lex.py
 +++ b/ply/lex.py
-@@ -222,7 +222,14 @@
-                 exec("import %s as lextab" % tabfile, env,env)
-                 lextab = env['lextab']
+@@ -215,7 +215,14 @@
+             exec('import %s' % tabfile)
+             lextab = sys.modules[tabfile]
  
--        if getattr(lextab,"_tabversion","0.0") != __tabversion__:
+-        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.
@@ -16,6 +16,6 @@
 +            actual_tabversion = '3.2'
 +
 +        if actual_tabversion != __tabversion__:
-             raise ImportError("Inconsistent PLY version")
+             raise ImportError('Inconsistent PLY version')
  
          self.lextokens      = lextab._lextokens

Modified: packages/ply/trunk/debian/patches/series
===================================================================
--- packages/ply/trunk/debian/patches/series	2015-09-02 19:46:24 UTC (rev 34115)
+++ packages/ply/trunk/debian/patches/series	2015-09-02 22:14:28 UTC (rev 34116)
@@ -1,5 +1 @@
-fix-lex-tabversion.patch
 relax-lex-tabversion-check.patch
-fixed-yacc-tests-to-account-for-dict-hash-key-random.patch
-more-test-fixes.patch
-fixed-lexer-line-tracking.patch