summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormbyt <random.seed@web.de>2016-10-19 18:14:18 (GMT)
committermbyt <random.seed@web.de>2016-10-19 18:14:18 (GMT)
commitb8661de3379a931485fd73d6f2242edc93cc032d (patch)
tree4e6626674403966a65663d29eebb2a3bc708d82a
parent5587089a661a520a32c353ea886939cd63a0636a (diff)
downloadSCons-b8661de3379a931485fd73d6f2242edc93cc032d.zip
SCons-b8661de3379a931485fd73d6f2242edc93cc032d.tar.gz
SCons-b8661de3379a931485fd73d6f2242edc93cc032d.tar.bz2
the file builtin does not exist in python3
-rw-r--r--src/engine/SCons/Platform/win32.py30
1 files changed, 21 insertions, 9 deletions
diff --git a/src/engine/SCons/Platform/win32.py b/src/engine/SCons/Platform/win32.py
index 269007d..cb82df3 100644
--- a/src/engine/SCons/Platform/win32.py
+++ b/src/engine/SCons/Platform/win32.py
@@ -60,16 +60,8 @@ except AttributeError:
else:
parallel_msg = None
- _builtin_file = file
_builtin_open = 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()),
@@ -77,9 +69,29 @@ else:
0)
return fp
- file = _scons_file
open = _scons_open
+ if sys.version_info.major == 2:
+ _builtin_file = 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)
+ 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, _builtin_file)
+
+
try:
import threading
spawn_lock = threading.Lock()