From 532d091d058bca2c43b24bc79b53aa70f5caa365 Mon Sep 17 00:00:00 2001 From: Alexander Belopolsky Date: Fri, 10 Dec 2010 18:14:16 +0000 Subject: Reverted accidental commit (from r87159) --- Objects/moduleobject.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'Objects/moduleobject.c') diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c index 8b22b7dc95..2c095a0968 100644 --- a/Objects/moduleobject.c +++ b/Objects/moduleobject.c @@ -168,8 +168,8 @@ PyModule_GetDict(PyObject *m) return d; } -PyObject * -PyModule_GetNameObject(PyObject *m) +const char * +PyModule_GetName(PyObject *m) { PyObject *d; PyObject *nameobj; @@ -185,21 +185,7 @@ PyModule_GetNameObject(PyObject *m) PyErr_SetString(PyExc_SystemError, "nameless module"); return NULL; } - Py_INCREF(nameobj); - return nameobj; -} - -const char * -PyModule_GetName(PyObject *m) -{ - PyObject *nameobj; - char *utf8; - nameobj = PyModule_GetNameObject(m); - if (nameobj == NULL) - return NULL; - utf8 = _PyUnicode_AsString(nameobj); - Py_DECREF(nameobj); - return utf8; + return _PyUnicode_AsString(nameobj); } PyObject* -- cgit v1.2.1