Jon Waltman avatar Jon Waltman committed 1b65a7c

Closes #1070: Avoid un-pickling issues under Python 3 when accessing doctrees saved under Python 2.

Comments (0)

Files changed (2)

 Release 1.2 (in development)
 ============================
 
+* #1070: Avoid un-pickling issues when running Python 3 and the saved
+  environment was created under Python 2.
+
 * #1069: Fixed error caused when autodoc would try to format signatures of
   "partial" functions without keyword arguments (patch by Artur Gaspar).
 

sphinx/environment.py

 
 # 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([
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.