Replaced fprintf(stderr,...) with PySys_WriteStderr(...) where appropriate.

diff --git a/Mac/Include/macbuildno.h b/Mac/Include/macbuildno.h
index 40de2144bd0c29e1af0f330946eff5149c802996..064f56147d2445e84d95c488d2ea1b37e1689507 100644 (file)
--- a/Mac/Include/macbuildno.h
+++ b/Mac/Include/macbuildno.h
@@ -1 +1 @@
-#define BUILD 41
+#define BUILD 42

diff --git a/Mac/Lib/lib-toolbox/AEDataModel.py b/Mac/Lib/lib-toolbox/AEDataModel.py
index 51738630cab766e6df2946faa427b17113763188..7a2260e1a6b2cac8dc603334232676ca8ea82a6b 100644 (file)
--- a/Mac/Lib/lib-toolbox/AEDataModel.py
+++ b/Mac/Lib/lib-toolbox/AEDataModel.py
@@ -1,4 +1,4 @@
-# Generated from 'flap:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:AEDataModel.h'
+# Generated from 'moes:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:AEDataModel.h'
 
 def FOUR_CHAR_CODE(x): return x
 typeBoolean = FOUR_CHAR_CODE('bool')

diff --git a/Mac/Lib/lib-toolbox/AEObjects.py b/Mac/Lib/lib-toolbox/AEObjects.py
index 7d4f28e49f78e313224727e8b46af5cb143c330d..1b48998dc0a1a543163e4180b57ca8ce75a5e310 100644 (file)
--- a/Mac/Lib/lib-toolbox/AEObjects.py
+++ b/Mac/Lib/lib-toolbox/AEObjects.py
@@ -1,4 +1,4 @@
-# Generated from 'flap:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:AEObjects.h'
+# Generated from 'moes:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:AEObjects.h'
 
 def FOUR_CHAR_CODE(x): return x
 kAEAND = FOUR_CHAR_CODE('AND ')

diff --git a/Mac/Lib/lib-toolbox/AERegistry.py b/Mac/Lib/lib-toolbox/AERegistry.py
index 0211ac07d9dddfd3f4a406e714a1ae5b76082c8c..a511ef1d09a4f1338f159c07cd8d643adf036d08 100644 (file)
--- a/Mac/Lib/lib-toolbox/AERegistry.py
+++ b/Mac/Lib/lib-toolbox/AERegistry.py
@@ -1,4 +1,4 @@
-# Generated from 'flap:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:AERegistry.h'
+# Generated from 'moes:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:AERegistry.h'
 
 def FOUR_CHAR_CODE(x): return x
 from AEDataModel import *

diff --git a/Mac/Lib/lib-toolbox/AppleEvents.py b/Mac/Lib/lib-toolbox/AppleEvents.py
index 3f3cad83f7dc3b14b98f49ec60ecc438189d7b17..544d16ba5464095391d20eba848da4fe5b1fb7fa 100644 (file)
--- a/Mac/Lib/lib-toolbox/AppleEvents.py
+++ b/Mac/Lib/lib-toolbox/AppleEvents.py
@@ -1,4 +1,4 @@
-# Generated from 'flap:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:AppleEvents.h'
+# Generated from 'moes:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:AppleEvents.h'
 
 def FOUR_CHAR_CODE(x): return x
 from AEDataModel import *

diff --git a/Mac/Lib/lib-toolbox/Controls.py b/Mac/Lib/lib-toolbox/Controls.py
index 416b850e7207bc97656ae695be0c038f74af5f95..71e37b7abc8e08e0173b560931b25727283d7b6a 100644 (file)
--- a/Mac/Lib/lib-toolbox/Controls.py
+++ b/Mac/Lib/lib-toolbox/Controls.py
@@ -1,4 +1,4 @@
-# Generated from 'flap:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Controls.h'
+# Generated from 'moes:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Controls.h'
 
 def FOUR_CHAR_CODE(x): return x
 from TextEdit import *

diff --git a/Mac/Lib/lib-toolbox/Dialogs.py b/Mac/Lib/lib-toolbox/Dialogs.py
index 477f001d6b6f43c94fc139efc74119dd04dbbaa4..a07729e260b7853690c0e437003f9103025b77e3 100644 (file)
--- a/Mac/Lib/lib-toolbox/Dialogs.py
+++ b/Mac/Lib/lib-toolbox/Dialogs.py
@@ -1,4 +1,4 @@
-# Generated from 'flap:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Dialogs.h'
+# Generated from 'moes:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Dialogs.h'
 
 kControlDialogItem = 4
 kButtonDialogItem = kControlDialogItem | 0

diff --git a/Mac/Modules/ae/AEmodule.c b/Mac/Modules/ae/AEmodule.c
index 31274307166d83c3570a6b90d15c68487f7b87e4..241cb5d44f0f42dd8d3142be5a01f388c3dfcb31 100644 (file)
--- a/Mac/Modules/ae/AEmodule.c
+++ b/Mac/Modules/ae/AEmodule.c
@@ -75,7 +75,7 @@ static pascal Boolean AEIdleProc(EventRecord *theEvent, long *sleepTime, RgnHand
        if ( PyOS_InterruptOccurred() )
                return 1;
        if ( PyMac_HandleEvent(theEvent) < 0 ) {
-               fprintf(stderr, "Exception in user event handler during AE processing\n");
+               PySys_WriteStderr("Exception in user event handler during AE processing\n");
                PyErr_Clear();
        }
        return 0;

diff --git a/Mac/Modules/ae/aesupport.py b/Mac/Modules/ae/aesupport.py
index 58af2df9be363614cf7f7c3d76fce628cb78d46f..d82496bfd403aaeedd023dd7da07673ecc70921f 100644 (file)
--- a/Mac/Modules/ae/aesupport.py
+++ b/Mac/Modules/ae/aesupport.py
@@ -115,7 +115,7 @@ static pascal Boolean AEIdleProc(EventRecord *theEvent, long *sleepTime, RgnHand
        if ( PyOS_InterruptOccurred() )
                return 1;
        if ( PyMac_HandleEvent(theEvent) < 0 ) {
-               fprintf(stderr, "Exception in user event handler during AE processing\\n");
+               PySys_WriteStderr("Exception in user event handler during AE processing\\n");
                PyErr_Clear();
        }
        return 0;

diff --git a/Mac/Modules/ctl/Ctlmodule.c b/Mac/Modules/ctl/Ctlmodule.c
index 6b43b68975e73c4acff1528e21b461166346f53c..6a74d2338caae2d7095d3bb7b5a62995f8c8345f 100644 (file)
--- a/Mac/Modules/ctl/Ctlmodule.c
+++ b/Mac/Modules/ctl/Ctlmodule.c
@@ -1419,7 +1419,7 @@ mytracker(ctl, part)
        if (rv)
                Py_DECREF(rv);
        else
-               fprintf(stderr, "TrackControl: exception in tracker function\n");
+               PySys_WriteStderr("TrackControl: exception in tracker function\n");
 }
 
 

diff --git a/Mac/Modules/ctl/ctlsupport.py b/Mac/Modules/ctl/ctlsupport.py
index e01e8710c0ced9e71a2aec555c70f64fcab04942..84dd6cec8d7ccceaea49367b1298ee3c2dec6202 100644 (file)
--- a/Mac/Modules/ctl/ctlsupport.py
+++ b/Mac/Modules/ctl/ctlsupport.py
@@ -137,7 +137,7 @@ mytracker(ctl, part)
        if (rv)
                Py_DECREF(rv);
        else
-               fprintf(stderr, "TrackControl: exception in tracker function\\n");
+               PySys_WriteStderr("TrackControl: exception in tracker function\\n");
 }
 """
 

diff --git a/Mac/Modules/dlg/Dlgmodule.c b/Mac/Modules/dlg/Dlgmodule.c
index 9e59ecdbff7e0cb05da54d02bdcc6e4ce522797d..2abd785f731ae6aa1a29221f23595cc6a6b2857b 100644 (file)
--- a/Mac/Modules/dlg/Dlgmodule.c
+++ b/Mac/Modules/dlg/Dlgmodule.c
@@ -73,7 +73,7 @@ static pascal Boolean Dlg_UnivFilterProc(DialogPtr dialog,
                Py_DECREF(args);
        }
        if (res == NULL) {
-               fprintf(stderr, "Exception in Dialog Filter\n");
+               PySys_WriteStderr("Exception in Dialog Filter\n");
                PyErr_Print();
                *itemHit = -1; /* Fake return item */
                return 1; /* We handled it */
@@ -124,7 +124,7 @@ static pascal void Dlg_UnivUserItemProc(DialogPtr dialog,
                Py_DECREF(args);
        }
        if (res == NULL) {
-               fprintf(stderr, "Exception in Dialog UserItem proc\n");
+               PySys_WriteStderr("Exception in Dialog UserItem proc\n");
                PyErr_Print();
        }
        Py_XDECREF(res);

diff --git a/Mac/Modules/dlg/dlgsupport.py b/Mac/Modules/dlg/dlgsupport.py
index 8af8fe71328bf24bd251ea9c3cd7fc70aa58c689..526bfa441cdd22c502a45c06f3eb7699a0ab2e65 100644 (file)
--- a/Mac/Modules/dlg/dlgsupport.py
+++ b/Mac/Modules/dlg/dlgsupport.py
@@ -59,7 +59,7 @@ static pascal Boolean Dlg_UnivFilterProc(DialogPtr dialog,
                Py_DECREF(args);
        }
        if (res == NULL) {
-               fprintf(stderr, "Exception in Dialog Filter\\n");
+               PySys_WriteStderr("Exception in Dialog Filter\\n");
                PyErr_Print();
                *itemHit = -1; /* Fake return item */
                return 1; /* We handled it */
@@ -110,7 +110,7 @@ static pascal void Dlg_UnivUserItemProc(DialogPtr dialog,
                Py_DECREF(args);
        }
        if (res == NULL) {
-               fprintf(stderr, "Exception in Dialog UserItem proc\\n");
+               PySys_WriteStderr("Exception in Dialog UserItem proc\\n");
                PyErr_Print();
        }
        Py_XDECREF(res);

diff --git a/Mac/Modules/macosmodule.c b/Mac/Modules/macosmodule.c
index 68f9b48c9dd544249ecf5c6f421cabe5460d7f6a..14f807c81c53609424d9f7b4de7ee54d2ed7cfbd 100644 (file)
--- a/Mac/Modules/macosmodule.c
+++ b/Mac/Modules/macosmodule.c
@@ -377,7 +377,7 @@ MacOS_HighLevelEventProc(EventRecord *e)
                        Py_DECREF(args);
                }
                if (res == NULL) {
-                       fprintf(stderr, "Exception in MacOS_HighLevelEventProc:\n");
+                       PySys_WriteStderr("Exception in MacOS_HighLevelEventProc:\n");
                        PyErr_Print();
                }
                else

diff --git a/Mac/Modules/waste/wastemodule.c b/Mac/Modules/waste/wastemodule.c
index 660401f7dfc7d0fedf92b88ec6643adb2b9c4ae9..ffb39c3f74982b42ace14077066536efb0c14e93 100644 (file)
--- a/Mac/Modules/waste/wastemodule.c
+++ b/Mac/Modules/waste/wastemodule.c
@@ -150,7 +150,7 @@ any_handler(WESelector what, WEObjectReference who, PyObject *args, PyObject **r
        Py_DECREF(func);
        Py_DECREF(key);
        if ( *rv == NULL ) {
-               fprintf(stderr, "--Exception in callback: ");
+               PySys_WriteStderr("--Exception in callback: ");
                PyErr_Print();
                return errAEReplyNotArrived;
        }

diff --git a/Mac/Modules/waste/wastesupport.py b/Mac/Modules/waste/wastesupport.py
index 76eb010acfad139bda14a6084ee0c785cee84ee7..488e01ad4e5cf46a64f13360d595f597c929ca98 100644 (file)
--- a/Mac/Modules/waste/wastesupport.py
+++ b/Mac/Modules/waste/wastesupport.py
@@ -164,7 +164,7 @@ any_handler(WESelector what, WEObjectReference who, PyObject *args, PyObject **r
        Py_DECREF(func);
        Py_DECREF(key);
        if ( *rv == NULL ) {
-               fprintf(stderr, "--Exception in callback: ");
+               PySys_WriteStderr("--Exception in callback: ");
                PyErr_Print();
                return errAEReplyNotArrived;
        }

diff --git a/Mac/Python/macimport.c b/Mac/Python/macimport.c
index 627f828a10f50518e9a962cd4c2e3e525cd987dc..e079d2e5ee478e2d8775acf2107ed1f0ed764b5a 100644 (file)
--- a/Mac/Python/macimport.c
+++ b/Mac/Python/macimport.c
@@ -271,8 +271,7 @@ PyMac_LoadCodeResourceModule(name, pathname)
        Py_XDECREF(s);
 #endif
        if (Py_VerboseFlag)
-               fprintf(stderr,
-                       "import %s # pyd fragment %#s loaded from %s\n",
+               PySys_WriteStderr("import %s # pyd fragment %#s loaded from %s\n",
                        name, fragmentname, pathname);
        Py_INCREF(m);
        return m;
@@ -389,7 +388,7 @@ packageerror:
                m = NULL;
        }
        if (Py_VerboseFlag)
-               fprintf(stderr, "import %s # pyc resource from %s\n",
+               PySys_WriteStderr("import %s # pyc resource from %s\n",
                        module, filename);
        return m;
 error:
@@ -459,7 +458,7 @@ PyMac_FindModuleExtension(char *buf, int *lenp, char *module)
                strcpy((char *)fnbuf+1+modnamelen, fdp->suffix);
                fnbuf[0] = strlen((char *)fnbuf+1);
                if (Py_VerboseFlag > 1)
-                       fprintf(stderr, "# trying %s%s\n", buf, fdp->suffix);
+                       PySys_WriteStderr("# trying %s%s\n", buf, fdp->suffix);
                if ( FSMakeFSSpec(refnum, dirid, fnbuf, &fss) == noErr ) {
                        /* Found it. */
 #if 0