Merge 014b0bf into ad792d3

SCons · Feb 11, 2018 · e86d188 · e86d188
2 parents ad792d3 + 014b0bf
commit e86d188
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
@@ -7,6 +7,10 @@
 
 RELEASE 3.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
 
+  From Daniel Moody:
+    - Made a small change to scons main __init__.py to set the pickling protocal 
+      to choose the latest which fixed 2 failing test varient dir test from Interactive
+
   From Ray Donnelly:
     - Fix the PATH created by scons.bat (and other .bat files) to provide a normalized
       PATH.  Some pythons in the 3.6 series are no longer able to handle paths which

diff --git a/src/engine/SCons/compat/__init__.py b/src/engine/SCons/compat/__init__.py
@@ -98,7 +98,7 @@ def rename_module(new, old):
 
 # Was pickle.HIGHEST_PROTOCOL
 # Changed to 2 so py3.5+'s pickle will be compatible with py2.7.
-PICKLE_PROTOCOL = 2
+PICKLE_PROTOCOL = -2
 
 # TODO: FIXME
 # In 3.x, 'profile' automatically loads the fast version if available.