mirror of
https://github.com/python/cpython
synced 2024-09-18 21:11:40 +00:00
Make _PyUnicode_FromId return borrowed references.
http://mail.python.org/pipermail/python-dev/2011-November/114347.html
This commit is contained in:
parent
e9b11c1cd8
commit
d10759f6ed
|
@ -2024,7 +2024,7 @@ PyAPI_FUNC(int) _PyUnicode_CheckConsistency(
|
|||
shutdown, all strings are released (through _PyUnicode_ClearStaticStrings).
|
||||
|
||||
Alternatively, _Py_static_string allows to choose the variable name.
|
||||
_PyUnicode_FromId returns a new reference to the interned string.
|
||||
_PyUnicode_FromId returns a borrowed reference to the interned string.
|
||||
_PyObject_{Get,Set,Has}AttrId are __getattr__ versions using _Py_Identifier*.
|
||||
*/
|
||||
typedef struct _Py_Identifier {
|
||||
|
|
|
@ -814,11 +814,10 @@ PyObject *
|
|||
_PyObject_GetAttrId(PyObject *v, _Py_Identifier *name)
|
||||
{
|
||||
PyObject *result;
|
||||
PyObject *oname = _PyUnicode_FromId(name);
|
||||
PyObject *oname = _PyUnicode_FromId(name); /* borrowed */
|
||||
if (!oname)
|
||||
return NULL;
|
||||
result = PyObject_GetAttr(v, oname);
|
||||
Py_DECREF(oname);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
@ -826,11 +825,10 @@ int
|
|||
_PyObject_HasAttrId(PyObject *v, _Py_Identifier *name)
|
||||
{
|
||||
int result;
|
||||
PyObject *oname = _PyUnicode_FromId(name);
|
||||
PyObject *oname = _PyUnicode_FromId(name); /* borrowed */
|
||||
if (!oname)
|
||||
return -1;
|
||||
result = PyObject_HasAttr(v, oname);
|
||||
Py_DECREF(oname);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
@ -838,11 +836,10 @@ int
|
|||
_PyObject_SetAttrId(PyObject *v, _Py_Identifier *name, PyObject *w)
|
||||
{
|
||||
int result;
|
||||
PyObject *oname = _PyUnicode_FromId(name);
|
||||
PyObject *oname = _PyUnicode_FromId(name); /* borrowed */
|
||||
if (!oname)
|
||||
return -1;
|
||||
result = PyObject_SetAttr(v, oname, w);
|
||||
Py_DECREF(oname);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
|
|
@ -1716,11 +1716,10 @@ get_dict_descriptor(PyTypeObject *type)
|
|||
PyObject *dict_str;
|
||||
PyObject *descr;
|
||||
|
||||
dict_str = _PyUnicode_FromId(&PyId___dict__);
|
||||
dict_str = _PyUnicode_FromId(&PyId___dict__); /* borrowed */
|
||||
if (dict_str == NULL)
|
||||
return NULL;
|
||||
descr = _PyType_Lookup(type, dict_str);
|
||||
Py_DECREF(dict_str);
|
||||
if (descr == NULL || !PyDescr_IsData(descr))
|
||||
return NULL;
|
||||
|
||||
|
|
|
@ -1723,7 +1723,6 @@ _PyUnicode_FromId(_Py_Identifier *id)
|
|||
id->next = static_strings;
|
||||
static_strings = id;
|
||||
}
|
||||
Py_INCREF(id->object);
|
||||
return id->object;
|
||||
}
|
||||
|
||||
|
|
|
@ -666,10 +666,8 @@ warnings_warn_explicit(PyObject *self, PyObject *args, PyObject *kwds)
|
|||
|
||||
if ((tmp = _PyUnicode_FromId(&PyId_get_source)) == NULL)
|
||||
return NULL;
|
||||
Py_DECREF(tmp);
|
||||
if ((tmp = _PyUnicode_FromId(&PyId_splitlines)) == NULL)
|
||||
return NULL;
|
||||
Py_DECREF(tmp);
|
||||
|
||||
/* Check/get the requisite pieces needed for the loader. */
|
||||
loader = PyDict_GetItemString(module_globals, "__loader__");
|
||||
|
|
Loading…
Reference in a new issue