diff options
| author | Rocco Matano <devnull@localhost> | 2014-03-07 14:39:43 (GMT) |
|---|---|---|
| committer | Rocco Matano <devnull@localhost> | 2014-03-07 14:39:43 (GMT) |
| commit | ea1890249923aab9cda388b2d22b566dbb7b8949 (patch) | |
| tree | adf82b67b42bed5f5374239ece9fc1d1ce87960e /src/engine/SCons/Platform | |
| parent | 8986df6b325e924f4143b03705129899fccc72ba (diff) | |
| download | SCons-ea1890249923aab9cda388b2d22b566dbb7b8949.zip SCons-ea1890249923aab9cda388b2d22b566dbb7b8949.tar.gz SCons-ea1890249923aab9cda388b2d22b566dbb7b8949.tar.bz2 | |
fix some minor 2to3 issues on windows
Diffstat (limited to 'src/engine/SCons/Platform')
| -rw-r--r-- | src/engine/SCons/Platform/win32.py | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/engine/SCons/Platform/win32.py b/src/engine/SCons/Platform/win32.py index 879817d..1e4fb2a 100644 --- a/src/engine/SCons/Platform/win32.py +++ b/src/engine/SCons/Platform/win32.py @@ -61,16 +61,21 @@ else: parallel_msg = None import builtins - - _builtin_file = builtins.file + builtin_file = getattr(builtins, 'file', None) is not None + + if builtin_file: + _builtin_file = builtins.file + + 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) + + builtins.file = _scons_file + _builtin_open = builtins.open - 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) - def _scons_open(*args, **kw): fp = _builtin_open(*args, **kw) win32api.SetHandleInformation(msvcrt.get_osfhandle(fp.fileno()), @@ -78,7 +83,6 @@ else: 0) return fp - builtins.file = _scons_file builtins.open = _scons_open try: |
