From 4c91a7a1d2904dbc3fa1afe579b8714f0cfdbaba Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Fri, 10 Jan 2014 21:07:51 +0100 Subject: [PATCH] Closes #641: use Sphinx version in cache pickle filename. --- sphinx/pycode/pgen2/driver.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sphinx/pycode/pgen2/driver.py b/sphinx/pycode/pgen2/driver.py index 5e6cf9a5b..e9e907dcc 100644 --- a/sphinx/pycode/pgen2/driver.py +++ b/sphinx/pycode/pgen2/driver.py @@ -18,7 +18,8 @@ __all__ = ["Driver", "load_grammar"] # Python imports import os import logging -import sys + +import sphinx # Pgen imports from sphinx.pycode.pgen2 import grammar, parse, token, tokenize, pgen @@ -120,7 +121,8 @@ def load_grammar(gt="Grammar.txt", gp=None, head, tail = os.path.splitext(gt) if tail == ".txt": tail = "" - gp = head + tail + ".".join(map(str, sys.version_info[:2])) + ".pickle" + # embed Sphinx major version for the case we ever change the grammar... + gp = head + tail + ".".join(map(str, sphinx.version_info[:2])) + ".pickle" if force or not _newer(gp, gt): logger.info("Generating grammar tables from %s", gt) g = pgen.generate_grammar(gt)