diff options
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | sphinx/environment.py | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -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). 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([ |