diff options
author | Martin v. Löwis <martin@v.loewis.de> | 2011-10-14 08:20:37 (GMT) |
---|---|---|
committer | Martin v. Löwis <martin@v.loewis.de> | 2011-10-14 08:20:37 (GMT) |
commit | bd928fef428e48084ff29ece0e21d07ad86d0793 (patch) | |
tree | 0fd61d271dabb554cc4824e7e80b4c6d915f6ae2 /Objects | |
parent | 01277d166a993742814c772d01987fbaafb528d4 (diff) | |
download | cpython-bd928fef428e48084ff29ece0e21d07ad86d0793.zip cpython-bd928fef428e48084ff29ece0e21d07ad86d0793.tar.gz cpython-bd928fef428e48084ff29ece0e21d07ad86d0793.tar.bz2 |
Rename _Py_identifier to _Py_IDENTIFIER.
Diffstat (limited to 'Objects')
-rw-r--r-- | Objects/abstract.c | 6 | ||||
-rw-r--r-- | Objects/bytearrayobject.c | 2 | ||||
-rw-r--r-- | Objects/classobject.c | 2 | ||||
-rw-r--r-- | Objects/descrobject.c | 12 | ||||
-rw-r--r-- | Objects/dictobject.c | 6 | ||||
-rw-r--r-- | Objects/fileobject.c | 8 | ||||
-rw-r--r-- | Objects/moduleobject.c | 2 | ||||
-rw-r--r-- | Objects/setobject.c | 2 | ||||
-rw-r--r-- | Objects/typeobject.c | 14 | ||||
-rw-r--r-- | Objects/weakrefobject.c | 4 |
10 files changed, 29 insertions, 29 deletions
diff --git a/Objects/abstract.c b/Objects/abstract.c index 57424a6..bce9794 100644 --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -2082,7 +2082,7 @@ PyMapping_Keys(PyObject *o) { PyObject *keys; PyObject *fast; - _Py_identifier(keys); + _Py_IDENTIFIER(keys); if (PyDict_CheckExact(o)) return PyDict_Keys(o); @@ -2099,7 +2099,7 @@ PyMapping_Items(PyObject *o) { PyObject *items; PyObject *fast; - _Py_identifier(items); + _Py_IDENTIFIER(items); if (PyDict_CheckExact(o)) return PyDict_Items(o); @@ -2116,7 +2116,7 @@ PyMapping_Values(PyObject *o) { PyObject *values; PyObject *fast; - _Py_identifier(values); + _Py_IDENTIFIER(values); if (PyDict_CheckExact(o)) return PyDict_Values(o); diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c index 41ea2dd..0c9add0 100644 --- a/Objects/bytearrayobject.c +++ b/Objects/bytearrayobject.c @@ -2698,7 +2698,7 @@ static PyObject * bytearray_reduce(PyByteArrayObject *self) { PyObject *latin1, *dict; - _Py_identifier(__dict__); + _Py_IDENTIFIER(__dict__); if (self->ob_bytes) latin1 = PyUnicode_DecodeLatin1(self->ob_bytes, diff --git a/Objects/classobject.c b/Objects/classobject.c index 40161ef..09b95bf 100644 --- a/Objects/classobject.c +++ b/Objects/classobject.c @@ -14,7 +14,7 @@ static int numfree = 0; #define PyMethod_MAXFREELIST 256 #endif -_Py_identifier(__name__); +_Py_IDENTIFIER(__name__); PyObject * PyMethod_Function(PyObject *im) diff --git a/Objects/descrobject.c b/Objects/descrobject.c index d664789..6e2d34e 100644 --- a/Objects/descrobject.c +++ b/Objects/descrobject.c @@ -703,7 +703,7 @@ static PyObject * proxy_get(proxyobject *pp, PyObject *args) { PyObject *key, *def = Py_None; - _Py_identifier(get); + _Py_IDENTIFIER(get); if (!PyArg_UnpackTuple(args, "get", 1, 2, &key, &def)) return NULL; @@ -713,28 +713,28 @@ proxy_get(proxyobject *pp, PyObject *args) static PyObject * proxy_keys(proxyobject *pp) { - _Py_identifier(keys); + _Py_IDENTIFIER(keys); return _PyObject_CallMethodId(pp->dict, &PyId_keys, NULL); } static PyObject * proxy_values(proxyobject *pp) { - _Py_identifier(values); + _Py_IDENTIFIER(values); return _PyObject_CallMethodId(pp->dict, &PyId_values, NULL); } static PyObject * proxy_items(proxyobject *pp) { - _Py_identifier(items); + _Py_IDENTIFIER(items); return _PyObject_CallMethodId(pp->dict, &PyId_items, NULL); } static PyObject * proxy_copy(proxyobject *pp) { - _Py_identifier(copy); + _Py_IDENTIFIER(copy); return _PyObject_CallMethodId(pp->dict, &PyId_copy, NULL); } @@ -1299,7 +1299,7 @@ property_init(PyObject *self, PyObject *args, PyObject *kwds) /* if no docstring given and the getter has one, use that one */ if ((doc == NULL || doc == Py_None) && get != NULL) { - _Py_identifier(__doc__); + _Py_IDENTIFIER(__doc__); PyObject *get_doc = _PyObject_GetAttrId(get, &PyId___doc__); if (get_doc) { if (Py_TYPE(self) == &PyProperty_Type) { diff --git a/Objects/dictobject.c b/Objects/dictobject.c index 28c3dc1..3896b31 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -2707,7 +2707,7 @@ dictviews_sub(PyObject* self, PyObject *other) { PyObject *result = PySet_New(self); PyObject *tmp; - _Py_identifier(difference_update); + _Py_IDENTIFIER(difference_update); if (result == NULL) return NULL; @@ -2727,7 +2727,7 @@ dictviews_and(PyObject* self, PyObject *other) { PyObject *result = PySet_New(self); PyObject *tmp; - _Py_identifier(intersection_update); + _Py_IDENTIFIER(intersection_update); if (result == NULL) return NULL; @@ -2767,7 +2767,7 @@ dictviews_xor(PyObject* self, PyObject *other) { PyObject *result = PySet_New(self); PyObject *tmp; - _Py_identifier(symmetric_difference_update); + _Py_IDENTIFIER(symmetric_difference_update); if (result == NULL) return NULL; diff --git a/Objects/fileobject.c b/Objects/fileobject.c index 324e2ee..e1c47ce 100644 --- a/Objects/fileobject.c +++ b/Objects/fileobject.c @@ -30,7 +30,7 @@ PyFile_FromFd(int fd, char *name, char *mode, int buffering, char *encoding, char *errors, char *newline, int closefd) { PyObject *io, *stream; - _Py_identifier(open); + _Py_IDENTIFIER(open); io = PyImport_ImportModule("io"); if (io == NULL) @@ -59,7 +59,7 @@ PyFile_GetLine(PyObject *f, int n) { PyObject *reader; PyObject *args; - _Py_identifier(readline); + _Py_IDENTIFIER(readline); reader = _PyObject_GetAttrId(f, &PyId_readline); if (reader == NULL) @@ -128,7 +128,7 @@ int PyFile_WriteObject(PyObject *v, PyObject *f, int flags) { PyObject *writer, *value, *args, *result; - _Py_identifier(write); + _Py_IDENTIFIER(write); if (f == NULL) { PyErr_SetString(PyExc_TypeError, "writeobject with NULL file"); @@ -197,7 +197,7 @@ PyObject_AsFileDescriptor(PyObject *o) { int fd; PyObject *meth; - _Py_identifier(fileno); + _Py_IDENTIFIER(fileno); if (PyLong_Check(o)) { fd = PyLong_AsLong(o); diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c index 32c4b9e..b69bce6 100644 --- a/Objects/moduleobject.c +++ b/Objects/moduleobject.c @@ -415,7 +415,7 @@ module_clear(PyModuleObject *m) static PyObject * module_dir(PyObject *self, PyObject *args) { - _Py_identifier(__dict__); + _Py_IDENTIFIER(__dict__); PyObject *result = NULL; PyObject *dict = _PyObject_GetAttrId(self, &PyId___dict__); diff --git a/Objects/setobject.c b/Objects/setobject.c index 8f6325a..d7990d8 100644 --- a/Objects/setobject.c +++ b/Objects/setobject.c @@ -1933,7 +1933,7 @@ static PyObject * set_reduce(PySetObject *so) { PyObject *keys=NULL, *args=NULL, *result=NULL, *dict=NULL; - _Py_identifier(__dict__); + _Py_IDENTIFIER(__dict__); keys = PySequence_List((PyObject *)so); if (keys == NULL) diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 61f5bb1..130e8fe 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -35,8 +35,8 @@ struct method_cache_entry { static struct method_cache_entry method_cache[1 << MCACHE_SIZE_EXP]; static unsigned int next_version_tag = 0; -_Py_identifier(__dict__); -_Py_identifier(__class__); +_Py_IDENTIFIER(__dict__); +_Py_IDENTIFIER(__class__); unsigned int PyType_ClearCache(void) @@ -1284,7 +1284,7 @@ tail_contains(PyObject *list, int whence, PyObject *o) { static PyObject * class_name(PyObject *cls) { - _Py_identifier(__name__); + _Py_IDENTIFIER(__name__); PyObject *name = _PyObject_GetAttrId(cls, &PyId___name__); if (name == NULL) { PyErr_Clear(); @@ -2599,7 +2599,7 @@ merge_class_dict(PyObject *dict, PyObject *aclass) { PyObject *classdict; PyObject *bases; - _Py_identifier(__bases__); + _Py_IDENTIFIER(__bases__); assert(PyDict_Check(dict)); assert(aclass); @@ -2901,7 +2901,7 @@ object_new(PyTypeObject *type, PyObject *args, PyObject *kwds) PyObject *sorted; PyObject *sorted_methods = NULL; PyObject *joined = NULL; - _Py_identifier(join); + _Py_IDENTIFIER(join); /* Compute ", ".join(sorted(type.__abstractmethods__)) into joined. */ @@ -3189,7 +3189,7 @@ slotnames(PyObject *cls) PyObject *copyreg; PyObject *slotnames; static PyObject *str_slotnames; - _Py_identifier(_slotnames); + _Py_IDENTIFIER(_slotnames); if (str_slotnames == NULL) { str_slotnames = PyUnicode_InternFromString("__slotnames__"); @@ -3329,7 +3329,7 @@ reduce_2(PyObject *obj) Py_INCREF(dictitems); } else { - _Py_identifier(items); + _Py_IDENTIFIER(items); PyObject *items = _PyObject_CallMethodId(obj, &PyId_items, ""); if (items == NULL) goto end; diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c index 374e720..e07adb2 100644 --- a/Objects/weakrefobject.c +++ b/Objects/weakrefobject.c @@ -157,7 +157,7 @@ static PyObject * weakref_repr(PyWeakReference *self) { PyObject *name, *repr; - _Py_identifier(__name__); + _Py_IDENTIFIER(__name__); if (PyWeakref_GET_OBJECT(self) == Py_None) return PyUnicode_FromFormat("<weakref at %p; dead>", self); @@ -441,7 +441,7 @@ proxy_checkref(PyWeakReference *proxy) #define WRAP_METHOD(method, special) \ static PyObject * \ method(PyObject *proxy) { \ - _Py_identifier(special); \ + _Py_IDENTIFIER(special); \ UNWRAP(proxy); \ return _PyObject_CallMethodId(proxy, &PyId_##special, ""); \ } |