diff options
| author | William Deegan <bill@baddogconsulting.com> | 2018-12-10 22:31:31 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-10 22:31:31 (GMT) |
| commit | 5f6aa2f1aec8c0c93e88731afa46b6b42bddba8f (patch) | |
| tree | 0598462d5ea2ba5f718bf6fcca71d1b7152b94bd /src | |
| parent | 903d9a41e160005360aef34d7850bde9e51ecc7c (diff) | |
| parent | f55f43e11f7f7efc96d17aeda8e0fef4f09ce627 (diff) | |
| download | SCons-5f6aa2f1aec8c0c93e88731afa46b6b42bddba8f.zip SCons-5f6aa2f1aec8c0c93e88731afa46b6b42bddba8f.tar.gz SCons-5f6aa2f1aec8c0c93e88731afa46b6b42bddba8f.tar.bz2 | |
Merge branch 'master' into fix_mac_shlibversion_gh_issue_3241
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 3 | ||||
| -rw-r--r-- | src/engine/SCons/Platform/win32.py | 12 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 26e1147..49f18a2 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -64,6 +64,9 @@ RELEASE 3.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE Note that the values of the above will be validated. Valid format for either APPLELINK variable is X[.Y[.Z]] where 0 <= X <= 65535, 0 <= Y <= 255, 0 <= Z <= 255. The new variables have been added to the documents and should show up in user guide and manpage. + - Fix GH Issue #3136 no longer wrap io.{BufferedReader,BufferedWriter,BufferedRWPair,BufferedRandom,TextIOWrapper + with logic to set HANDLE_FLAG_INHERIT flag on the file handle. Python 3.4+ automatically sets this according + to Python docs: https://docs.python.org/3/library/os.html#fd-inheritance From Andrew Featherstone - Removed unused --warn options from the man page and source code. diff --git a/src/engine/SCons/Platform/win32.py b/src/engine/SCons/Platform/win32.py index 3b76208..2d40fb8 100644 --- a/src/engine/SCons/Platform/win32.py +++ b/src/engine/SCons/Platform/win32.py @@ -82,16 +82,8 @@ else: win32con.HANDLE_FLAG_INHERIT, 0) file = _scons_file else: - import io - for io_class in ['BufferedReader', 'BufferedWriter', 'BufferedRWPair', - 'BufferedRandom', 'TextIOWrapper']: - _builtin_file = getattr(io, io_class) - class _scons_file(_builtin_file): - def __init__(self, *args, **kw): - _builtin_file.__init__(self, *args, **kw) - win32api.SetHandleInformation(msvcrt.get_osfhandle(self.fileno()), - win32con.HANDLE_FLAG_INHERIT, 0) - setattr(io, io_class, _scons_file) + # No longer needed for python 3.4 and above. Files are opened non sharable + pass |