mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-13 07:26:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Use ValueError, not RuntimeError for a utime flag combination illegal on some systems.

Browse source
This commit is contained in:
Georg Brandl 2012-06-26 09:25:44 +02:00
parent a4b018f0cd
commit 969288e488
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/test/test_posix.py
View file

@ -730,7 +730,7 @@ class PosixTester(unittest.TestCase):
if os.utime in os.supports_follow_symlinks: if os.utime in os.supports_follow_symlinks:
try: try:
posix.utime(support.TESTFN, follow_symlinks=False, dir_fd=f) posix.utime(support.TESTFN, follow_symlinks=False, dir_fd=f)
except RuntimeError: except ValueError:
# whoops! using both together not supported on this platform. # whoops! using both together not supported on this platform.
pass pass

2
Modules/posixmodule.c
View file

@ -4667,7 +4667,7 @@ posix_utime(PyObject *self, PyObject *args, PyObject *kwargs)
#if !defined(HAVE_UTIMENSAT) #if !defined(HAVE_UTIMENSAT)
if ((dir_fd != DEFAULT_DIR_FD) && (!follow_symlinks)) { if ((dir_fd != DEFAULT_DIR_FD) && (!follow_symlinks)) {
PyErr_SetString(PyExc_RuntimeError, PyErr_SetString(PyExc_ValueError,
"utime: cannot use dir_fd and follow_symlinks " "utime: cannot use dir_fd and follow_symlinks "
"together on this platform"); "together on this platform");
goto exit; goto exit;