diff options
| author | Georg Brandl <georg@python.org> | 2006-05-28 21:57:35 +0000 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2006-05-28 21:57:35 +0000 |
| commit | 88b5133bb06e26052cd9c158a8e61e073c40b7cc (patch) | |
| tree | 74d4ead52cc49b2cacabd2491992f625fc81d5e5 /Mac | |
| parent | c291c37d73ef958faeccd8ed2fb597868475d599 (diff) | |
| download | cpython-88b5133bb06e26052cd9c158a8e61e073c40b7cc.tar.gz | |
Correct None refcount issue in Mac modules. (Are they
still used?)
Diffstat (limited to 'Mac')
| -rw-r--r-- | Mac/Modules/dlg/_Dlgmodule.c | 2 | ||||
| -rw-r--r-- | Mac/Modules/dlg/dlgsupport.py | 2 | ||||
| -rw-r--r-- | Mac/Modules/file/_Filemodule.c | 2 | ||||
| -rw-r--r-- | Mac/Modules/file/filesupport.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Mac/Modules/dlg/_Dlgmodule.c b/Mac/Modules/dlg/_Dlgmodule.c index 64ddac8d33..46009a8c67 100644 --- a/Mac/Modules/dlg/_Dlgmodule.c +++ b/Mac/Modules/dlg/_Dlgmodule.c @@ -139,7 +139,7 @@ typedef struct DialogObject { PyObject *DlgObj_New(DialogPtr itself) { DialogObject *it; - if (itself == NULL) return Py_None; + if (itself == NULL) { Py_INCREF(Py_None); return Py_None; } it = PyObject_NEW(DialogObject, &Dialog_Type); if (it == NULL) return NULL; it->ob_itself = itself; diff --git a/Mac/Modules/dlg/dlgsupport.py b/Mac/Modules/dlg/dlgsupport.py index 1c0cc6a9f9..fa1442ec37 100644 --- a/Mac/Modules/dlg/dlgsupport.py +++ b/Mac/Modules/dlg/dlgsupport.py @@ -202,7 +202,7 @@ class MyObjectDefinition(PEP253Mixin, GlobalObjectDefinition): Output("SetWRefCon(GetDialogWindow(itself), (long)it);") def outputCheckNewArg(self): - Output("if (itself == NULL) return Py_None;") + Output("if (itself == NULL) { Py_INCREF(Py_None); return Py_None; }") def outputCheckConvertArg(self): Output("if (v == Py_None) { *p_itself = NULL; return 1; }") diff --git a/Mac/Modules/file/_Filemodule.c b/Mac/Modules/file/_Filemodule.c index c211de136f..07bd341297 100644 --- a/Mac/Modules/file/_Filemodule.c +++ b/Mac/Modules/file/_Filemodule.c @@ -153,7 +153,7 @@ typedef struct FSCatalogInfoObject { static PyObject *FSCatalogInfo_New(FSCatalogInfo *itself) { FSCatalogInfoObject *it; - if (itself == NULL) return Py_None; + if (itself == NULL) { Py_INCREF(Py_None); return Py_None; } it = PyObject_NEW(FSCatalogInfoObject, &FSCatalogInfo_Type); if (it == NULL) return NULL; it->ob_itself = *itself; diff --git a/Mac/Modules/file/filesupport.py b/Mac/Modules/file/filesupport.py index f2d419328b..37aeb508a0 100644 --- a/Mac/Modules/file/filesupport.py +++ b/Mac/Modules/file/filesupport.py @@ -475,7 +475,7 @@ class FSCatalogInfoDefinition(PEP253Mixin, ObjectDefinition): self.argref = "*" # Store FSSpecs, but pass them by address def outputCheckNewArg(self): - Output("if (itself == NULL) return Py_None;") + Output("if (itself == NULL) { Py_INCREF(Py_None); return Py_None; }") def output_tp_newBody(self): Output("PyObject *self;"); |