summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>2003-12-03 20:52:07 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>2003-12-03 20:52:07 (GMT)
commit07f1dfa91cd74fbdad9f88ea6aa80249cd0ada14 (patch)
tree434ffe0282ba5bc64918af3aab0c621ddc5892cf
parentc8de4585a6e52e1186828dd929671d3a6c36db95 (diff)
downloadcpython-07f1dfa91cd74fbdad9f88ea6aa80249cd0ada14.zip
cpython-07f1dfa91cd74fbdad9f88ea6aa80249cd0ada14.tar.gz
cpython-07f1dfa91cd74fbdad9f88ea6aa80249cd0ada14.tar.bz2
Blacklisting LSInit and LSTerm, which are deprecated. Partial fix for 853558.
-rw-r--r--Mac/Modules/launch/_Launchmodule.c32
-rw-r--r--Mac/Modules/launch/launchscan.py2
2 files changed, 2 insertions, 32 deletions
diff --git a/Mac/Modules/launch/_Launchmodule.c b/Mac/Modules/launch/_Launchmodule.c
index 165e45c..cb3007f 100644
--- a/Mac/Modules/launch/_Launchmodule.c
+++ b/Mac/Modules/launch/_Launchmodule.c
@@ -57,34 +57,6 @@ LSItemInfoRecord_New(LSItemInfoRecord *it)
static PyObject *Launch_Error;
-static PyObject *Launch_LSInit(PyObject *_self, PyObject *_args)
-{
- PyObject *_res = NULL;
- OSStatus _err;
- LSInitializeFlags inFlags;
- if (!PyArg_ParseTuple(_args, "l",
- &inFlags))
- return NULL;
- _err = LSInit(inFlags);
- if (_err != noErr) return PyMac_Error(_err);
- Py_INCREF(Py_None);
- _res = Py_None;
- return _res;
-}
-
-static PyObject *Launch_LSTerm(PyObject *_self, PyObject *_args)
-{
- PyObject *_res = NULL;
- OSStatus _err;
- if (!PyArg_ParseTuple(_args, ""))
- return NULL;
- _err = LSTerm();
- if (_err != noErr) return PyMac_Error(_err);
- Py_INCREF(Py_None);
- _res = Py_None;
- return _res;
-}
-
static PyObject *Launch_LSCopyItemInfoForRef(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
@@ -347,10 +319,6 @@ static PyObject *Launch_LSOpenCFURLRef(PyObject *_self, PyObject *_args)
}
static PyMethodDef Launch_methods[] = {
- {"LSInit", (PyCFunction)Launch_LSInit, 1,
- PyDoc_STR("(LSInitializeFlags inFlags) -> None")},
- {"LSTerm", (PyCFunction)Launch_LSTerm, 1,
- PyDoc_STR("() -> None")},
{"LSCopyItemInfoForRef", (PyCFunction)Launch_LSCopyItemInfoForRef, 1,
PyDoc_STR("(FSRef inItemRef, LSRequestedInfo inWhichInfo) -> (LSItemInfoRecord outItemInfo)")},
{"LSCopyItemInfoForURL", (PyCFunction)Launch_LSCopyItemInfoForURL, 1,
diff --git a/Mac/Modules/launch/launchscan.py b/Mac/Modules/launch/launchscan.py
index 8dd6dfd..8d0f3e9 100644
--- a/Mac/Modules/launch/launchscan.py
+++ b/Mac/Modules/launch/launchscan.py
@@ -44,6 +44,8 @@ class MyScanner(Scanner):
def makeblacklistnames(self):
return [
+ "LSInit",
+ "LSTerm",
"kLSRequestAllInfo",
"kLSRolesAll",
]