summaryrefslogtreecommitdiffstats
path: root/Mac
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>2003-03-21 12:54:24 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>2003-03-21 12:54:24 (GMT)
commit3e0196cc00a371a03a0e9c8b7ce71593681ef11d (patch)
tree54267dec9b671dd7f4cff6d0a5098396921a1e12 /Mac
parent7e0bc112b8bc1174449f5573c03e51e00805218b (diff)
downloadcpython-3e0196cc00a371a03a0e9c8b7ce71593681ef11d.zip
cpython-3e0196cc00a371a03a0e9c8b7ce71593681ef11d.tar.gz
cpython-3e0196cc00a371a03a0e9c8b7ce71593681ef11d.tar.bz2
Adding unicode filename support to FSRefs broke things on MacOS9. "Fixed" by disabling unicode filenames on OS9.
Diffstat (limited to 'Mac')
-rw-r--r--Mac/Modules/file/_Filemodule.c3
-rw-r--r--Mac/Modules/file/filesupport.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/Mac/Modules/file/_Filemodule.c b/Mac/Modules/file/_Filemodule.c
index d61172e..5a1cafd 100644
--- a/Mac/Modules/file/_Filemodule.c
+++ b/Mac/Modules/file/_Filemodule.c
@@ -3194,7 +3194,8 @@ PyMac_GetFSSpec(PyObject *v, FSSpec *spec)
#if TARGET_API_MAC_OSX
if ( PyMac_GetFSRef(v, &fsr) ) {
#else
- if ( PyArg_Parse(v, "O&", FSRef_Convert, &fsr) ) {
+ if (FSRef_Check(v)) {
+ fsr = ((FSRefObject *)v)->ob_itself;
#endif
err = FSGetCatalogInfo(&fsr, kFSCatInfoNone, NULL, NULL, spec, NULL);
if (err != noErr) {
diff --git a/Mac/Modules/file/filesupport.py b/Mac/Modules/file/filesupport.py
index 1237d22..7223038 100644
--- a/Mac/Modules/file/filesupport.py
+++ b/Mac/Modules/file/filesupport.py
@@ -252,7 +252,8 @@ PyMac_GetFSSpec(PyObject *v, FSSpec *spec)
#if TARGET_API_MAC_OSX
if ( PyMac_GetFSRef(v, &fsr) ) {
#else
- if ( PyArg_Parse(v, "O&", FSRef_Convert, &fsr) ) {
+ if (FSRef_Check(v)) {
+ fsr = ((FSRefObject *)v)->ob_itself;
#endif
err = FSGetCatalogInfo(&fsr, kFSCatInfoNone, NULL, NULL, spec, NULL);
if (err != noErr) {