diff options
| -rw-r--r-- | Doc/library/os.rst | 55 | ||||
| -rw-r--r-- | Lib/test/test_os.py | 74 | ||||
| -rw-r--r-- | Lib/test/test_posix.py | 13 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/posixmodule.c | 114 |
5 files changed, 4 insertions, 255 deletions
diff --git a/Doc/library/os.rst b/Doc/library/os.rst index 2d87d8c..b5f2bdf 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -371,14 +371,6 @@ These functions create new file objects. (See also :func:`open`.) This function is obsolete. Use the :mod:`subprocess` module. -.. function:: tmpfile() - - Return a new file object opened in update mode (``w+b``). The file has no - directory entries associated with it and will be automatically deleted once - there are no file descriptors for the file. Availability: Macintosh, Unix, - Windows. - - .. _os-fd-ops: File Descriptor Operations @@ -1077,53 +1069,6 @@ Files and Directories Create a symbolic link pointing to *src* named *dst*. Availability: Unix. -.. function:: tempnam([dir[, prefix]]) - - Return a unique path name that is reasonable for creating a temporary file. - This will be an absolute path that names a potential directory entry in the - directory *dir* or a common location for temporary files if *dir* is omitted or - ``None``. If given and not ``None``, *prefix* is used to provide a short prefix - to the filename. Applications are responsible for properly creating and - managing files created using paths returned by :func:`tempnam`; no automatic - cleanup is provided. On Unix, the environment variable :envvar:`TMPDIR` - overrides *dir*, while on Windows the :envvar:`TMP` is used. The specific - behavior of this function depends on the C library implementation; some aspects - are underspecified in system documentation. - - .. warning:: - - Use of :func:`tempnam` is vulnerable to symlink attacks; consider using - :func:`tmpfile` (section :ref:`os-newstreams`) instead. - - Availability: Macintosh, Unix, Windows. - - -.. function:: tmpnam() - - Return a unique path name that is reasonable for creating a temporary file. - This will be an absolute path that names a potential directory entry in a common - location for temporary files. Applications are responsible for properly - creating and managing files created using paths returned by :func:`tmpnam`; no - automatic cleanup is provided. - - .. warning:: - - Use of :func:`tmpnam` is vulnerable to symlink attacks; consider using - :func:`tmpfile` (section :ref:`os-newstreams`) instead. - - Availability: Unix, Windows. This function probably shouldn't be used on - Windows, though: Microsoft's implementation of :func:`tmpnam` always creates a - name in the root directory of the current drive, and that's generally a poor - location for a temp file (depending on privileges, you may not even be able to - open a file using this name). - - -.. data:: TMP_MAX - - The maximum number of unique names that :func:`tmpnam` will generate before - reusing names. - - .. function:: unlink(path) Remove the file *path*. This is the same function as :func:`remove`; the diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py index 05932f5..0fe7382 100644 --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -8,9 +8,6 @@ import warnings import sys from test import test_support -warnings.filterwarnings("ignore", "tempnam", RuntimeWarning, __name__) -warnings.filterwarnings("ignore", "tmpnam", RuntimeWarning, __name__) - # Tests creating TESTFN class FileTests(unittest.TestCase): def setUp(self): @@ -24,76 +21,6 @@ class FileTests(unittest.TestCase): self.assert_(os.access(test_support.TESTFN, os.W_OK)) -class TemporaryFileTests(unittest.TestCase): - def setUp(self): - self.files = [] - os.mkdir(test_support.TESTFN) - - def tearDown(self): - for name in self.files: - os.unlink(name) - os.rmdir(test_support.TESTFN) - - def check_tempfile(self, name): - # make sure it doesn't already exist: - self.failIf(os.path.exists(name), - "file already exists for temporary file") - # make sure we can create the file - open(name, "w") - self.files.append(name) - - def test_tempnam(self): - if not hasattr(os, "tempnam"): - return - warnings.filterwarnings("ignore", "tempnam", RuntimeWarning, - r"test_os$") - self.check_tempfile(os.tempnam()) - - name = os.tempnam(test_support.TESTFN) - self.check_tempfile(name) - - name = os.tempnam(test_support.TESTFN, "pfx") - self.assertEqual(os.path.basename(name)[:3], "pfx") - self.check_tempfile(name) - - def test_tmpfile(self): - if not hasattr(os, "tmpfile"): - return - fp = os.tmpfile() - fp.write(b"foobar") - fp.seek(0) - s = fp.read() - fp.close() - self.assertEquals(s, b"foobar") - - def test_tmpnam(self): - import sys - if not hasattr(os, "tmpnam"): - return - warnings.filterwarnings("ignore", "tmpnam", RuntimeWarning, - r"test_os$") - name = os.tmpnam() - if sys.platform in ("win32",): - # The Windows tmpnam() seems useless. From the MS docs: - # - # The character string that tmpnam creates consists of - # the path prefix, defined by the entry P_tmpdir in the - # file STDIO.H, followed by a sequence consisting of the - # digit characters '0' through '9'; the numerical value - # of this string is in the range 1 - 65,535. Changing the - # definitions of L_tmpnam or P_tmpdir in STDIO.H does not - # change the operation of tmpnam. - # - # The really bizarre part is that, at least under MSVC6, - # P_tmpdir is "\\". That is, the path returned refers to - # the root of the current drive. That's a terrible place to - # put temp files, and, depending on privileges, the user - # may not even be able to open a file in the root directory. - self.failIf(os.path.exists(name), - "file already exists for temporary file") - else: - self.check_tempfile(name) - # Test attributes on return values from os.*stat* family. class StatAttributeTests(unittest.TestCase): def setUp(self): @@ -483,7 +410,6 @@ if sys.platform != 'win32': def test_main(): test_support.run_unittest( FileTests, - TemporaryFileTests, StatAttributeTests, EnvironTests, WalkTests, diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py index 22ec748..3569453 100644 --- a/Lib/test/test_posix.py +++ b/Lib/test/test_posix.py @@ -29,7 +29,7 @@ class PosixTester(unittest.TestCase): # test posix functions which take no arguments and have # no side-effects which we need to cleanup (e.g., fork, wait, abort) NO_ARG_FUNCTIONS = [ "ctermid", "getcwd", "getcwdu", "uname", - "times", "getloadavg", "tmpnam", + "times", "getloadavg", "getegid", "geteuid", "getgid", "getgroups", "getpid", "getpgrp", "getppid", "getuid", ] @@ -171,17 +171,6 @@ class PosixTester(unittest.TestCase): os.close(reader) os.close(writer) - def test_tempnam(self): - if hasattr(posix, 'tempnam'): - self.assert_(posix.tempnam()) - self.assert_(posix.tempnam(os.curdir)) - self.assert_(posix.tempnam(os.curdir, 'blah')) - - def test_tmpfile(self): - if hasattr(posix, 'tmpfile'): - fp = posix.tmpfile() - fp.close() - def test_utime(self): if hasattr(posix, 'utime'): now = time.time() @@ -39,6 +39,9 @@ Library argument was being ignored if __loader__ is defined and forcing the source to be UTF-8. +- The methods `os.tmpnam()`, `os.tempnam()` and `os.tmpfile()` have been + removed in favor of the tempfile module. + What's New in Python 3.0a1? ========================== diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index e0de961..acd01da 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -302,10 +302,6 @@ extern int lstat(const char *, struct stat *); #define USE_CTERMID_R #endif -#if defined(HAVE_TMPNAM_R) && defined(WITH_THREAD) -#define USE_TMPNAM_R -#endif - /* choose the appropriate stat and fstat functions and return structs */ #undef STAT #if defined(MS_WIN64) || defined(MS_WINDOWS) @@ -5339,107 +5335,6 @@ posix_statvfs(PyObject *self, PyObject *args) } #endif /* HAVE_STATVFS */ - -#ifdef HAVE_TEMPNAM -PyDoc_STRVAR(posix_tempnam__doc__, -"tempnam([dir[, prefix]]) -> string\n\n\ -Return a unique name for a temporary file.\n\ -The directory and a prefix may be specified as strings; they may be omitted\n\ -or None if not needed."); - -static PyObject * -posix_tempnam(PyObject *self, PyObject *args) -{ - PyObject *result = NULL; - char *dir = NULL; - char *pfx = NULL; - char *name; - - if (!PyArg_ParseTuple(args, "|zz:tempnam", &dir, &pfx)) - return NULL; - - if (PyErr_WarnEx(PyExc_RuntimeWarning, - "tempnam is a potential security risk to your program", - 1) < 0) - return NULL; - -#ifdef MS_WINDOWS - name = _tempnam(dir, pfx); -#else - name = tempnam(dir, pfx); -#endif - if (name == NULL) - return PyErr_NoMemory(); - result = PyUnicode_DecodeFSDefault(name); - free(name); - return result; -} -#endif - - -#ifdef HAVE_TMPFILE -PyDoc_STRVAR(posix_tmpfile__doc__, -"tmpfile() -> file object\n\n\ -Create a temporary file with no directory entries."); - -static PyObject * -posix_tmpfile(PyObject *self, PyObject *noargs) -{ - FILE *fp; - int fd; - - fp = tmpfile(); - if (fp == NULL) - return posix_error(); - fd = fileno(fp); - if (fd != -1) - fd = dup(fd); - fclose(fp); - if (fd == -1) - return posix_error(); - return PyFile_FromFd(fd, "<tmpfile>", "w+b", -1, NULL, NULL); -} -#endif - - -#ifdef HAVE_TMPNAM -PyDoc_STRVAR(posix_tmpnam__doc__, -"tmpnam() -> string\n\n\ -Return a unique name for a temporary file."); - -static PyObject * -posix_tmpnam(PyObject *self, PyObject *noargs) -{ - char buffer[L_tmpnam]; - char *name; - - if (PyErr_WarnEx(PyExc_RuntimeWarning, - "tmpnam is a potential security risk to your program", - 1) < 0) - return NULL; - -#ifdef USE_TMPNAM_R - name = tmpnam_r(buffer); -#else - name = tmpnam(buffer); -#endif - if (name == NULL) { - PyObject *err = Py_BuildValue("is", 0, -#ifdef USE_TMPNAM_R - "unexpected NULL from tmpnam_r" -#else - "unexpected NULL from tmpnam" -#endif - ); - PyErr_SetObject(PyExc_OSError, err); - Py_XDECREF(err); - return NULL; - } - return PyUnicode_DecodeFSDefault(buffer); -} -#endif - - /* This is used for fpathconf(), pathconf(), confstr() and sysconf(). * It maps strings representing configuration variable names to * integer values, allowing those functions to be called with the @@ -6941,15 +6836,6 @@ static PyMethodDef posix_methods[] = { #if defined(HAVE_STATVFS) && defined(HAVE_SYS_STATVFS_H) {"statvfs", posix_statvfs, METH_VARARGS, posix_statvfs__doc__}, #endif -#ifdef HAVE_TMPFILE - {"tmpfile", posix_tmpfile, METH_NOARGS, posix_tmpfile__doc__}, -#endif -#ifdef HAVE_TEMPNAM - {"tempnam", posix_tempnam, METH_VARARGS, posix_tempnam__doc__}, -#endif -#ifdef HAVE_TMPNAM - {"tmpnam", posix_tmpnam, METH_NOARGS, posix_tmpnam__doc__}, -#endif #ifdef HAVE_CONFSTR {"confstr", posix_confstr, METH_VARARGS, posix_confstr__doc__}, #endif |