IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jonathan Waltman 2013-01-09 08:58:28 -06:00
parent 61e951d2ed
commit e26b02e23e
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -1,6 +1,9 @@
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).

2
sphinx/environment.py
View File

@ -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([