diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-12 17:52:28 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-12 17:52:28 +0200 |
| commit | 81fada2b46636cbd118cc86ca85fa23966a4f88c (patch) | |
| tree | b7466cd11e81e45289ba0b36f5c73281f19e1112 /engine/SCons/compat | |
| parent | 2fb368b8751637ffa010e5e4f79e2dda6adc6038 (diff) | |
| parent | 7cff8ecb55b0eee07bf8c52ec5b3ea5c156bcbad (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'engine/SCons/compat')
| -rw-r--r-- | engine/SCons/compat/__init__.py | 6 | ||||
| -rw-r--r-- | engine/SCons/compat/_scons_dbm.py | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engine/SCons/compat/__init__.py b/engine/SCons/compat/__init__.py index 4356940..7846577 100644 --- a/engine/SCons/compat/__init__.py +++ b/engine/SCons/compat/__init__.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2001 - 2017 The SCons Foundation +# Copyright (c) 2001 - 2019 The SCons Foundation # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -57,7 +57,7 @@ function defined below loads the module as the "real" name (without the rest of our code will find our pre-loaded compatibility module. """ -__revision__ = "src/engine/SCons/compat/__init__.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" +__revision__ = "src/engine/SCons/compat/__init__.py a56bbd8c09fb219ab8a9673330ffcd55279219d0 2019-03-26 23:16:31 bdeegan" import os import sys @@ -98,7 +98,7 @@ import pickle # Was pickle.HIGHEST_PROTOCOL # Changed to 2 so py3.5+'s pickle will be compatible with py2.7. -PICKLE_PROTOCOL = 2 +PICKLE_PROTOCOL = pickle.HIGHEST_PROTOCOL # TODO: FIXME # In 3.x, 'profile' automatically loads the fast version if available. diff --git a/engine/SCons/compat/_scons_dbm.py b/engine/SCons/compat/_scons_dbm.py index e1e4b3a..a57f105 100644 --- a/engine/SCons/compat/_scons_dbm.py +++ b/engine/SCons/compat/_scons_dbm.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2001 - 2017 The SCons Foundation +# Copyright (c) 2001 - 2019 The SCons Foundation # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -30,7 +30,7 @@ that the whichdb.whichdb() implementstation in the various 2.X versions of Python won't blow up even if dbm wasn't compiled in. """ -__revision__ = "src/engine/SCons/compat/_scons_dbm.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" +__revision__ = "src/engine/SCons/compat/_scons_dbm.py a56bbd8c09fb219ab8a9673330ffcd55279219d0 2019-03-26 23:16:31 bdeegan" class error(Exception): pass |