Commit dd766d53 authored by Brett Cannon's avatar Brett Cannon

Move tempfile over to the io module. Makes test_threaded_import pass.

Thanks Paul Colomiets.
parent 9c121069
...@@ -197,7 +197,7 @@ def _get_default_tempdir(): ...@@ -197,7 +197,7 @@ def _get_default_tempdir():
filename = _os.path.join(dir, name) filename = _os.path.join(dir, name)
try: try:
fd = _os.open(filename, flags, 0o600) fd = _os.open(filename, flags, 0o600)
fp = _os.fdopen(fd, 'w') fp = _io.open(fd, 'w')
fp.write('blat') fp.write('blat')
fp.close() fp.close()
_os.unlink(filename) _os.unlink(filename)
...@@ -438,7 +438,7 @@ def NamedTemporaryFile(mode='w+b', bufsize=-1, suffix="", ...@@ -438,7 +438,7 @@ def NamedTemporaryFile(mode='w+b', bufsize=-1, suffix="",
flags |= _os.O_TEMPORARY flags |= _os.O_TEMPORARY
(fd, name) = _mkstemp_inner(dir, prefix, suffix, flags) (fd, name) = _mkstemp_inner(dir, prefix, suffix, flags)
file = _os.fdopen(fd, mode, bufsize) file = _io.open(fd, mode, bufsize)
return _TemporaryFileWrapper(file, name, delete) return _TemporaryFileWrapper(file, name, delete)
if _os.name != 'posix' or _os.sys.platform == 'cygwin': if _os.name != 'posix' or _os.sys.platform == 'cygwin':
...@@ -471,7 +471,7 @@ else: ...@@ -471,7 +471,7 @@ else:
(fd, name) = _mkstemp_inner(dir, prefix, suffix, flags) (fd, name) = _mkstemp_inner(dir, prefix, suffix, flags)
try: try:
_os.unlink(name) _os.unlink(name)
return _os.fdopen(fd, mode, bufsize) return _io.open(fd, mode, bufsize)
except: except:
_os.close(fd) _os.close(fd)
raise raise
......
...@@ -134,6 +134,7 @@ Josh Cogliati ...@@ -134,6 +134,7 @@ Josh Cogliati
Dave Cole Dave Cole
Benjamin Collar Benjamin Collar
Jeffery Collins Jeffery Collins
Paul Colomiets
Matt Conway Matt Conway
David M. Cooke David M. Cooke
Greg Copeland Greg Copeland
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment