summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2013-11-12 20:39:02 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2013-11-12 20:39:02 (GMT)
commit3f36a5736b92457273d06cc17d55dd379381873d (patch)
tree81b290f15766d544f0962fed401f52036bf961cc
parentdcf17f8a553f51fc77d6bb72f4563f625af0d639 (diff)
downloadcpython-3f36a5736b92457273d06cc17d55dd379381873d.zip
cpython-3f36a5736b92457273d06cc17d55dd379381873d.tar.gz
cpython-3f36a5736b92457273d06cc17d55dd379381873d.tar.bz2
Issue #19515: Remove identifiers duplicated in the same file.
Patch written by Andrei Dorian Duma.
-rw-r--r--Modules/_io/bufferedio.c1
-rw-r--r--Modules/_io/iobase.c5
-rw-r--r--Modules/cjkcodecs/multibytecodec.c4
-rw-r--r--Objects/typeobject.c1
-rw-r--r--Python/pythonrun.c6
5 files changed, 6 insertions, 11 deletions
diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c
index 6fe5d58..a04b48d 100644
--- a/Modules/_io/bufferedio.c
+++ b/Modules/_io/bufferedio.c
@@ -52,7 +52,6 @@ bufferediobase_readinto(PyObject *self, PyObject *args)
Py_buffer buf;
Py_ssize_t len;
PyObject *data;
- _Py_IDENTIFIER(read);
if (!PyArg_ParseTuple(args, "w*:readinto", &buf)) {
return NULL;
diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c
index 3da7e5d..1b7cb0f 100644
--- a/Modules/_io/iobase.c
+++ b/Modules/_io/iobase.c
@@ -63,6 +63,8 @@ _Py_IDENTIFIER(__IOBase_closed);
#define IS_CLOSED(self) \
_PyObject_HasAttrId(self, &PyId___IOBase_closed)
+_Py_IDENTIFIER(read);
+
/* Internal methods */
static PyObject *
iobase_unsupported(const char *message)
@@ -180,7 +182,6 @@ static PyObject *
iobase_close(PyObject *self, PyObject *args)
{
PyObject *res;
- _Py_IDENTIFIER(__IOBase_closed);
if (IS_CLOSED(self))
Py_RETURN_NONE;
@@ -454,7 +455,6 @@ iobase_readline(PyObject *self, PyObject *args)
int has_peek = 0;
PyObject *buffer, *result;
Py_ssize_t old_size = -1;
- _Py_IDENTIFIER(read);
_Py_IDENTIFIER(peek);
if (!PyArg_ParseTuple(args, "|O&:readline", &_PyIO_ConvertSsize_t, &limit)) {
@@ -848,7 +848,6 @@ rawiobase_readall(PyObject *self, PyObject *args)
return NULL;
while (1) {
- _Py_IDENTIFIER(read);
PyObject *data = _PyObject_CallMethodId(self, &PyId_read,
"i", DEFAULT_BUFFER_SIZE);
if (!data) {
diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c
index 3c5173f..087ae9b 100644
--- a/Modules/cjkcodecs/multibytecodec.c
+++ b/Modules/cjkcodecs/multibytecodec.c
@@ -51,6 +51,8 @@ static PyObject *multibytecodec_encode(MultibyteCodec *,
#define MBENC_RESET MBENC_MAX<<1 /* reset after an encoding session */
+_Py_IDENTIFIER(write);
+
static PyObject *
make_tuple(PyObject *object, Py_ssize_t len)
{
@@ -1569,7 +1571,6 @@ mbstreamwriter_iwrite(MultibyteStreamWriterObject *self,
PyObject *unistr)
{
PyObject *str, *wr;
- _Py_IDENTIFIER(write);
str = encoder_encode_stateful(STATEFUL_ECTX(self), unistr, 0);
if (str == NULL)
@@ -1639,7 +1640,6 @@ mbstreamwriter_reset(MultibyteStreamWriterObject *self)
assert(PyBytes_Check(pwrt));
if (PyBytes_Size(pwrt) > 0) {
PyObject *wr;
- _Py_IDENTIFIER(write);
wr = _PyObject_CallMethodId(self->stream, &PyId_write, "O", pwrt);
if (wr == NULL) {
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 0708d67..09f77fa 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -5633,7 +5633,6 @@ slot_tp_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
PyObject *func;
PyObject *newargs, *x;
Py_ssize_t i, n;
- _Py_IDENTIFIER(__new__);
func = _PyObject_GetAttrId((PyObject *)type, &PyId___new__);
if (func == NULL)
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 8a59169..8ccf70d 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -37,9 +37,11 @@
_Py_IDENTIFIER(builtins);
_Py_IDENTIFIER(excepthook);
+_Py_IDENTIFIER(flush);
_Py_IDENTIFIER(last_traceback);
_Py_IDENTIFIER(last_type);
_Py_IDENTIFIER(last_value);
+_Py_IDENTIFIER(name);
_Py_IDENTIFIER(ps1);
_Py_IDENTIFIER(ps2);
_Py_IDENTIFIER(stdin);
@@ -215,7 +217,6 @@ get_codec_name(const char *encoding)
{
char *name_utf8, *name_str;
PyObject *codec, *name = NULL;
- _Py_IDENTIFIER(name);
codec = _PyCodec_Lookup(encoding);
if (!codec)
@@ -512,7 +513,6 @@ flush_std_files(void)
PyObject *fout = _PySys_GetObjectId(&PyId_stdout);
PyObject *ferr = _PySys_GetObjectId(&PyId_stderr);
PyObject *tmp;
- _Py_IDENTIFIER(flush);
if (fout != NULL && fout != Py_None && !file_is_closed(fout)) {
tmp = _PyObject_CallMethodId(fout, &PyId_flush, "");
@@ -1009,7 +1009,6 @@ create_stdio(PyObject* io,
_Py_IDENTIFIER(open);
_Py_IDENTIFIER(isatty);
_Py_IDENTIFIER(TextIOWrapper);
- _Py_IDENTIFIER(name);
_Py_IDENTIFIER(mode);
/* stdin is always opened in buffered mode, first because it shouldn't
@@ -2130,7 +2129,6 @@ flush_io(void)
{
PyObject *f, *r;
PyObject *type, *value, *traceback;
- _Py_IDENTIFIER(flush);
/* Save the current exception */
PyErr_Fetch(&type, &value, &traceback);