mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-21 11:19:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix for issue #1113328.

Browse source
This commit is contained in:
Ronald Oussoren 2009-03-04 22:49:36 +00:00
parent a97063a108
commit 1ea79913b9
1 changed files with 23 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Mac/Modules/OSATerminology.c
View file

@ -1,10 +1,13 @@
/* /*
** This module is a one-trick pony: given an FSSpec it gets the aeut ** An interface to the application scripting related functions of the OSA API.
** resources. It was written by Donovan Preston and slightly modified
** by Jack.
** **
** It should be considered a placeholder, it will probably be replaced ** GetAppTerminology - given an FSSpec/posix path to an application,
** by a full interface to OpenScripting. ** returns its aevt (scripting terminology) resource(s)
**
** GetSysTerminology - returns the AppleScript language component's
** aeut (scripting terminology) resource
**
** Written by Donovan Preston and slightly modified by Jack and HAS.
*/ */
#include "Python.h" #include "Python.h"
#include "pymactoolbox.h" #include "pymactoolbox.h"
@ -26,12 +29,19 @@ PyOSA_GetAppTerminology(PyObject* self, PyObject* args)
if (!PyArg_ParseTuple(args, "O&|i", PyMac_GetFSSpec, &fss, &modeFlags)) if (!PyArg_ParseTuple(args, "O&|i", PyMac_GetFSSpec, &fss, &modeFlags))
return NULL; return NULL;
/*
** Note that we have to use the AppleScript component here. Who knows why
** OSAGetAppTerminology should require a scripting component in the
** first place, but it does. Note: doesn't work with the generic scripting
** component, which is unfortunate as the AS component is currently very
** slow (~1 sec?) to load, but we just have to live with this.
*/
defaultComponent = OpenDefaultComponent (kOSAComponentType, 'ascr'); defaultComponent = OpenDefaultComponent (kOSAComponentType, 'ascr');
err = GetComponentInstanceError (defaultComponent); err = GetComponentInstanceError (defaultComponent);
if (err) return PyMac_Error(err); if (err) return PyMac_Error(err);
err = OSAGetAppTerminology ( err = OSAGetAppTerminology (
defaultComponent, defaultComponent,
modeFlags, kOSAModeNull,
&fss, &fss,
defaultTerminology, defaultTerminology,
&didLaunch, &didLaunch,
@ -45,29 +55,23 @@ static PyObject *
PyOSA_GetSysTerminology(PyObject* self, PyObject* args) PyOSA_GetSysTerminology(PyObject* self, PyObject* args)
{ {
AEDesc theDesc = {0,0}; AEDesc theDesc = {0,0};
FSSpec fss;
ComponentInstance defaultComponent = NULL; ComponentInstance defaultComponent = NULL;
SInt16 defaultTerminology = 0; SInt16 defaultTerminology = 0;
Boolean didLaunch = 0;
OSAError err; OSAError err;
long modeFlags = 0;
if (!PyArg_ParseTuple(args, "O&|i", PyMac_GetFSSpec, &fss, &modeFlags)) /* Accept any args for sake of backwards compatibility, then ignore them. */
return NULL;
defaultComponent = OpenDefaultComponent (kOSAComponentType, 'ascr'); defaultComponent = OpenDefaultComponent (kOSAComponentType, 'ascr');
err = GetComponentInstanceError (defaultComponent); err = GetComponentInstanceError (defaultComponent);
if (err) return PyMac_Error(err); if (err) return PyMac_Error(err);
err = OSAGetAppTerminology ( err = OSAGetSysTerminology (
defaultComponent, defaultComponent,
modeFlags, kOSAModeNull,
&fss,
defaultTerminology, defaultTerminology,
&didLaunch,
&theDesc &theDesc
); );
if (err) return PyMac_Error(err); if (err) return PyMac_Error(err);
return Py_BuildValue("O&i", AEDesc_New, &theDesc, didLaunch); return Py_BuildValue("O&", AEDesc_New, &theDesc);
} }
#endif /* !__LP64__ */ #endif /* !__LP64__ */
@ -80,11 +84,11 @@ static struct PyMethodDef OSATerminology_methods[] =
{"GetAppTerminology", {"GetAppTerminology",
(PyCFunction) PyOSA_GetAppTerminology, (PyCFunction) PyOSA_GetAppTerminology,
METH_VARARGS, METH_VARARGS,
"Get an applications terminology, as an AEDesc object."}, "Get an application's terminology. GetAppTerminology(path) --> AEDesc"},
{"GetSysTerminology", {"GetSysTerminology",
(PyCFunction) PyOSA_GetSysTerminology, (PyCFunction) PyOSA_GetSysTerminology,
METH_VARARGS, METH_VARARGS,
"Get an applications system terminology, as an AEDesc object."}, "Get the AppleScript language's terminology. GetSysTerminology() --> AEDesc"},
#endif /* !__LP64__ */ #endif /* !__LP64__ */
{NULL, (PyCFunction) NULL, 0, NULL} {NULL, (PyCFunction) NULL, 0, NULL}
}; };