[Python-checkins] python/dist/src/Mac/Modules/file filesupport.py,1.16,1.17 _Filemodule.c,1.18,1.19
jackjansen@users.sourceforge.net
jackjansen@users.sourceforge.net
2003年3月21日 04:54:26 -0800
Update of /cvsroot/python/python/dist/src/Mac/Modules/file
In directory sc8-pr-cvs1:/tmp/cvs-serv7609
Modified Files:
filesupport.py _Filemodule.c
Log Message:
Adding unicode filename support to FSRefs broke things on MacOS9. "Fixed" by disabling unicode filenames on OS9.
Index: filesupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/file/filesupport.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** filesupport.py 11 Mar 2003 21:48:57 -0000 1.16
--- filesupport.py 21 Mar 2003 12:54:24 -0000 1.17
***************
*** 253,257 ****
if ( PyMac_GetFSRef(v, &fsr) ) {
#else
! if ( PyArg_Parse(v, "O&", FSRef_Convert, &fsr) ) {
#endif
err = FSGetCatalogInfo(&fsr, kFSCatInfoNone, NULL, NULL, spec, NULL);
--- 253,258 ----
if ( PyMac_GetFSRef(v, &fsr) ) {
#else
! if (FSRef_Check(v)) {
! fsr = ((FSRefObject *)v)->ob_itself;
#endif
err = FSGetCatalogInfo(&fsr, kFSCatInfoNone, NULL, NULL, spec, NULL);
Index: _Filemodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/file/_Filemodule.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** _Filemodule.c 11 Mar 2003 21:48:56 -0000 1.18
--- _Filemodule.c 21 Mar 2003 12:54:24 -0000 1.19
***************
*** 3195,3199 ****
if ( PyMac_GetFSRef(v, &fsr) ) {
#else
! if ( PyArg_Parse(v, "O&", FSRef_Convert, &fsr) ) {
#endif
err = FSGetCatalogInfo(&fsr, kFSCatInfoNone, NULL, NULL, spec, NULL);
--- 3195,3200 ----
if ( PyMac_GetFSRef(v, &fsr) ) {
#else
! if (FSRef_Check(v)) {
! fsr = ((FSRefObject *)v)->ob_itself;
#endif
err = FSGetCatalogInfo(&fsr, kFSCatInfoNone, NULL, NULL, spec, NULL);