summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorAmaury Forgeot d'Arc <amauryfa@gmail.com>2008-10-03 18:38:26 (GMT)
committerAmaury Forgeot d'Arc <amauryfa@gmail.com>2008-10-03 18:38:26 (GMT)
commitc72ef8b6dfbd73dee01c70fccc2d3cfe73fb9c56 (patch)
tree01483ca1b791ee8ec1a57fad4d9c30e924ac9183 /Modules
parent3f2291f8025cf01ac96981d4e3a5284ba6e57f9f (diff)
downloadcpython-c72ef8b6dfbd73dee01c70fccc2d3cfe73fb9c56.zip
cpython-c72ef8b6dfbd73dee01c70fccc2d3cfe73fb9c56.tar.gz
cpython-c72ef8b6dfbd73dee01c70fccc2d3cfe73fb9c56.tar.bz2
Second part of #3187, for windows:
os and os.path functions now accept both unicode and byte strings for file names. Reviewed by Guido.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/posixmodule.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 03959f7..12ee9a8 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -1651,7 +1651,7 @@ static PyObject *
posix_chdir(PyObject *self, PyObject *args)
{
#ifdef MS_WINDOWS
- return win32_1str(args, "chdir", "s:chdir", win32_chdir, "U:chdir", win32_wchdir);
+ return win32_1str(args, "chdir", "y:chdir", win32_chdir, "U:chdir", win32_wchdir);
#elif defined(PYOS_OS2) && defined(PYCC_GCC)
return posix_1str(args, "et:chdir", _chdir2);
#elif defined(__VMS)
@@ -2586,7 +2586,7 @@ static PyObject *
posix_rmdir(PyObject *self, PyObject *args)
{
#ifdef MS_WINDOWS
- return win32_1str(args, "rmdir", "s:rmdir", RemoveDirectoryA, "U:rmdir", RemoveDirectoryW);
+ return win32_1str(args, "rmdir", "y:rmdir", RemoveDirectoryA, "U:rmdir", RemoveDirectoryW);
#else
return posix_1str(args, "et:rmdir", rmdir);
#endif
@@ -2667,7 +2667,7 @@ static PyObject *
posix_unlink(PyObject *self, PyObject *args)
{
#ifdef MS_WINDOWS
- return win32_1str(args, "remove", "s:remove", DeleteFileA, "U:remove", DeleteFileW);
+ return win32_1str(args, "remove", "y:remove", DeleteFileA, "U:remove", DeleteFileW);
#else
return posix_1str(args, "et:remove", unlink);
#endif