diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/engine/SCons/SConsign.py | 10 | ||||
-rw-r--r-- | src/engine/SCons/compat/sixTests.py | 4 | ||||
-rw-r--r-- | src/engine/SCons/dblite.py | 1 | ||||
-rw-r--r-- | src/script/sconsign.py | 3 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/engine/SCons/SConsign.py b/src/engine/SCons/SConsign.py index 970c35c..cb089aa 100644 --- a/src/engine/SCons/SConsign.py +++ b/src/engine/SCons/SConsign.py @@ -26,6 +26,7 @@ Writing and reading information to the .sconsign file or files. # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # + from __future__ import print_function __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" @@ -33,7 +34,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import SCons.compat import os -# compat layer imports "cPickle" for us if it's available. import pickle import SCons.dblite @@ -125,16 +125,16 @@ class SConsignEntry(object): """ __slots__ = ("binfo", "ninfo", "__weakref__") current_version_id = 2 - + def __init__(self): # Create an object attribute from the class attribute so it ends up # in the pickled data in the .sconsign file. #_version_id = self.current_version_id pass - + def convert_to_sconsign(self): self.binfo.convert_to_sconsign() - + def convert_from_sconsign(self, dir, name): self.binfo.convert_from_sconsign(dir, name) @@ -156,7 +156,7 @@ class SConsignEntry(object): for key, value in state.items(): if key not in ('_version_id','__weakref__'): setattr(self, key, value) - + class Base(object): """ This is the controlling class for the signatures for the collection of diff --git a/src/engine/SCons/compat/sixTests.py b/src/engine/SCons/compat/sixTests.py index 71df78d..8be3572 100644 --- a/src/engine/SCons/compat/sixTests.py +++ b/src/engine/SCons/compat/sixTests.py @@ -1,4 +1,3 @@ -from __future__ import print_function # # __COPYRIGHT__ # @@ -22,6 +21,8 @@ from __future__ import print_function # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # +from __future__ import print_function + import unittest class sixTestCase(unittest.TestCase): @@ -32,4 +33,3 @@ class sixTestCase(unittest.TestCase): print(sys.path) from SCons.compat.six import PY2, PY3 self.assertTrue(PY2 or PY3) - diff --git a/src/engine/SCons/dblite.py b/src/engine/SCons/dblite.py index 3be6cb2..b12d320 100644 --- a/src/engine/SCons/dblite.py +++ b/src/engine/SCons/dblite.py @@ -5,7 +5,6 @@ from __future__ import print_function import SCons.compat import os -# compat layer imports "cPickle" for us if it's available. import pickle import shutil import time diff --git a/src/script/sconsign.py b/src/script/sconsign.py index 1a4caf7..daf088e 100644 --- a/src/script/sconsign.py +++ b/src/script/sconsign.py @@ -22,6 +22,7 @@ # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + from __future__ import print_function from SCons.compat.six import PY2, PY3 @@ -185,7 +186,7 @@ sys.path = libs + sys.path # END STANDARD SCons SCRIPT HEADER ############################################################################## -import SCons.compat # so pickle will import cPickle instead +import SCons.compat if PY2: import whichdb |