[Python-modules-commits] r15739 - in packages/sphinx/branches/1.0/debian (3 files)

[jwilk at users.alioth.debian.org]

    Date: Wednesday, February 16, 2011 @ 22:01:43
  Author: jwilk
Revision: 15739

Stop embedding Python version in filename of grammar pickle.

Added:
  packages/sphinx/branches/1.0/debian/patches/unversioned_grammar_pickle.diff
Modified:
  packages/sphinx/branches/1.0/debian/changelog
  packages/sphinx/branches/1.0/debian/patches/series

Modified: packages/sphinx/branches/1.0/debian/changelog
===================================================================
--- packages/sphinx/branches/1.0/debian/changelog	2011-02-16 21:27:37 UTC (rev 15738)
+++ packages/sphinx/branches/1.0/debian/changelog	2011-02-16 22:01:43 UTC (rev 15739)
@@ -3,8 +3,11 @@
   [ Mikhail Gusarov ]
   * Change my email address.
 
- -- Mikhail Gusarov <dottedmag at dottedmag.net>  Thu, 10 Feb 2011 16:58:58 +0100
+  [ Jakub Wilk ]
+  * Stop embedding Python version in filename of grammar pickle.
 
+ -- Jakub Wilk <jwilk at debian.org>  Wed, 16 Feb 2011 23:00:25 +0100
+
 sphinx (1.0.7-1) experimental; urgency=low
 
   * New upstream release.

Modified: packages/sphinx/branches/1.0/debian/patches/series
===================================================================
--- packages/sphinx/branches/1.0/debian/patches/series	2011-02-16 21:27:37 UTC (rev 15738)
+++ packages/sphinx/branches/1.0/debian/patches/series	2011-02-16 22:01:43 UTC (rev 15739)
@@ -1 +1,2 @@
 move_static_files_outside_site-packages.patch
+unversioned_grammar_pickle.diff

Added: packages/sphinx/branches/1.0/debian/patches/unversioned_grammar_pickle.diff
===================================================================
--- packages/sphinx/branches/1.0/debian/patches/unversioned_grammar_pickle.diff	                        (rev 0)
+++ packages/sphinx/branches/1.0/debian/patches/unversioned_grammar_pickle.diff	2011-02-16 22:01:43 UTC (rev 15739)
@@ -0,0 +1,17 @@
+Description: Don't embed Python version in filename of grammar pickle.
+Author: Jakub Wilk <jwilk at debian.org>
+Bug: https://bitbucket.org/birkenfeld/sphinx/issue/641
+Forwarded: not-needed
+Last-Update: 2011-02-16
+
+--- a/sphinx/pycode/pgen2/driver.py
++++ b/sphinx/pycode/pgen2/driver.py
+@@ -120,7 +120,7 @@
+         head, tail = os.path.splitext(gt)
+         if tail == ".txt":
+             tail = ""
+-        gp = head + tail + ".".join(map(str, sys.version_info[:2])) + ".pickle"
++        gp = head + tail + ".pickle"
+     if force or not _newer(gp, gt):
+         logger.info("Generating grammar tables from %s", gt)
+         g = pgen.generate_grammar(gt)