[Python-modules-commits] r17387 - in packages/ply/trunk/debian/patches (1 file)

[eriol-guest at users.alioth.debian.org]

    Date: Thursday, June 9, 2011 @ 23:29:57
  Author: eriol-guest
Revision: 17387

Replaced with a proper patch by Jakub Wilk

Modified:
  packages/ply/trunk/debian/patches/02_relax-lex-tabversion-check.patch

Modified: packages/ply/trunk/debian/patches/02_relax-lex-tabversion-check.patch
===================================================================
--- packages/ply/trunk/debian/patches/02_relax-lex-tabversion-check.patch	2011-06-09 22:48:25 UTC (rev 17386)
+++ packages/ply/trunk/debian/patches/02_relax-lex-tabversion-check.patch	2011-06-09 23:29:57 UTC (rev 17387)
@@ -1,19 +1,21 @@
 Description: Don't break already built packages with wrong _tabversion
-Author: Daniele Tricoli <eriol at mornie.org>
+Author: Jakub Wilk <jwilk at debian.org>
 Forwarded: not-needed
 --- a/ply/lex.py
 +++ b/ply/lex.py
-@@ -222,6 +222,13 @@
+@@ -222,7 +222,14 @@
                  exec("import %s as lextab" % tabfile, env,env)
                  lextab = env['lextab']
  
+-        if getattr(lextab,"_tabversion","0.0") != __tabversion__:
 +        # python-ply 3.3-1 is shipped by Debian since Squeeze, so
-+        # to not brake packages that were built with wrong
++        # to not break packages that were built with wrong
 +        # _tabversion we need to explicitly fix it.
-+        actual_tabversion = float(getattr(lextab,"_tabversion"))
-+        if actual_tabversion > 3.2 and __version__ in ('3.3', '3.4'):
-+            setattr(lextab, '_tabversion', '3.2')
++        actual_tabversion = getattr(lextab, '_tabversion', '0.0')
++        if actual_tabversion in ('3.3', '3.4'):
++            actual_tabversion = '3.2'
 +
-         if getattr(lextab,"_tabversion","0.0") != __tabversion__:
++        if actual_tabversion != __tabversion__:
              raise ImportError("Inconsistent PLY version")
  
+         self.lextokens      = lextab._lextokens