diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2011-10-14 13:16:45 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2011-10-14 13:16:45 (GMT) |
| commit | 1c67dd9b154d57baf58ed081767e199af1e84923 (patch) | |
| tree | 0d6c95e99785f9b8381c808a5cb433adf319eda5 /Objects | |
| parent | bd928fef428e48084ff29ece0e21d07ad86d0793 (diff) | |
| download | cpython-1c67dd9b154d57baf58ed081767e199af1e84923.zip cpython-1c67dd9b154d57baf58ed081767e199af1e84923.tar.gz cpython-1c67dd9b154d57baf58ed081767e199af1e84923.tar.bz2 | |
Port SetAttrString/HasAttrString to SetAttrId/GetAttrId.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/descrobject.c | 2 | ||||
| -rw-r--r-- | Objects/dictobject.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Objects/descrobject.c b/Objects/descrobject.c index 6e2d34e..b328a45 100644 --- a/Objects/descrobject.c +++ b/Objects/descrobject.c @@ -1311,7 +1311,7 @@ property_init(PyObject *self, PyObject *args, PyObject *kwds) in dict of the subclass instance instead, otherwise it gets shadowed by __doc__ in the class's dict. */ - int err = PyObject_SetAttrString(self, "__doc__", get_doc); + int err = _PyObject_SetAttrId(self, &PyId___doc__, get_doc); Py_DECREF(get_doc); if (err < 0) return -1; diff --git a/Objects/dictobject.c b/Objects/dictobject.c index 3896b31..865feff 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -1387,7 +1387,8 @@ dict_update_common(PyObject *self, PyObject *args, PyObject *kwds, char *methnam result = -1; else if (arg != NULL) { - if (PyObject_HasAttrString(arg, "keys")) + _Py_IDENTIFIER(keys); + if (_PyObject_HasAttrId(arg, &PyId_keys)) result = PyDict_Merge(self, arg, 1); else result = PyDict_MergeFromSeq2(self, arg, 1); @@ -2747,7 +2748,7 @@ dictviews_or(PyObject* self, PyObject *other) { PyObject *result = PySet_New(self); PyObject *tmp; - _Py_identifier(update); + _Py_IDENTIFIER(update); if (result == NULL) return NULL; |