diff options
| author | Guido van Rossum <guido@python.org> | 2002-08-09 16:38:32 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2002-08-09 16:38:32 (GMT) |
| commit | 3b0a3293c369f3c3f4753e3cb9172cb4e242af76 (patch) | |
| tree | e0f9d295c0a2897ddfb7a5bf3b076be70f1492b4 /Lib/distutils | |
| parent | 830a5151c1e2ed4d0c647efb4ad54a9a6c67e4ae (diff) | |
| download | cpython-3b0a3293c369f3c3f4753e3cb9172cb4e242af76.zip cpython-3b0a3293c369f3c3f4753e3cb9172cb4e242af76.tar.gz cpython-3b0a3293c369f3c3f4753e3cb9172cb4e242af76.tar.bz2 | |
Massive changes from SF 589982 (tempfile.py rewrite, by Zack
Weinberg). This changes all uses of deprecated tempfile functions to
the recommended ones.
Diffstat (limited to 'Lib/distutils')
| -rw-r--r-- | Lib/distutils/command/bdist_wininst.py | 7 | ||||
| -rw-r--r-- | Lib/distutils/util.py | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/Lib/distutils/command/bdist_wininst.py b/Lib/distutils/command/bdist_wininst.py index 71e51bf..b538319 100644 --- a/Lib/distutils/command/bdist_wininst.py +++ b/Lib/distutils/command/bdist_wininst.py @@ -130,8 +130,9 @@ class bdist_wininst (Command): # And make an archive relative to the root of the # pseudo-installation tree. - from tempfile import mktemp - archive_basename = mktemp() + from tempfile import NamedTemporaryFile + arc = NamedTemporaryFile(".zip") + archive_basename = arc.name[:-4] fullname = self.distribution.get_fullname() arcname = self.make_archive(archive_basename, "zip", root_dir=self.bdist_dir) @@ -139,7 +140,7 @@ class bdist_wininst (Command): self.create_exe(arcname, fullname, self.bitmap) # remove the zip-file again log.debug("removing temporary file '%s'", arcname) - os.remove(arcname) + arc.close() if not self.keep_temp: remove_tree(self.bdist_dir, dry_run=self.dry_run) diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py index 23c29eb..d9c6224 100644 --- a/Lib/distutils/util.py +++ b/Lib/distutils/util.py @@ -359,11 +359,11 @@ def byte_compile (py_files, # "Indirect" byte-compilation: write a temporary script and then # run it with the appropriate flags. if not direct: - from tempfile import mktemp - script_name = mktemp(".py") + from tempfile import mkstemp + (script_fd, script_name) = mkstemp(".py") log.info("writing byte-compilation script '%s'", script_name) if not dry_run: - script = open(script_name, "w") + script = os.fdopen(script_fd, "w") script.write("""\ from distutils.util import byte_compile |