summaryrefslogtreecommitdiff
path: root/sphinx
diff options
context:
space:
mode:
authorJonathan Waltman <jonathan.waltman@gmail.com>2013-01-09 08:58:28 -0600
committerJonathan Waltman <jonathan.waltman@gmail.com>2013-01-09 08:58:28 -0600
commit91e71114e9c35b89d3ada830d648666dc7eca009 (patch)
tree9c554914d7452010b826a5174a3a559ad82d0816 /sphinx
parentc2a6bf29df872eb46ed4053b4fca8e6da519c29c (diff)
downloadsphinx-91e71114e9c35b89d3ada830d648666dc7eca009.tar.gz
Closes #1070: Avoid un-pickling issues under Python 3 when accessing doctrees saved under Python 2.
Diffstat (limited to 'sphinx')
-rw-r--r--sphinx/environment.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sphinx/environment.py b/sphinx/environment.py
index a08d671a..ba1b836b 100644
--- a/sphinx/environment.py
+++ b/sphinx/environment.py
@@ -71,7 +71,7 @@ default_settings = {
# This is increased every time an environment attribute is added
# or changed to properly invalidate pickle files.
-ENV_VERSION = 42
+ENV_VERSION = 42 + (sys.version_info[0] - 2)
default_substitutions = set([