traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #19515: Remove identifiers duplicated in the same file. 

Patch written by Andrei Dorian Duma.
This commit is contained in:
Victor Stinner 2013-11-12 21:39:02 +01:00
parent dcf17f8a55
commit 3f36a5736b
5 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Modules/_io/bufferedio.c
View File

@ -52,7 +52,6 @@ bufferediobase_readinto(PyObject *self, PyObject *args)
Py_buffer buf; Py_buffer buf;
Py_ssize_t len; Py_ssize_t len;
PyObject *data; PyObject *data;
_Py_IDENTIFIER(read);
if (!PyArg_ParseTuple(args, "w*:readinto", &buf)) { if (!PyArg_ParseTuple(args, "w*:readinto", &buf)) {
return NULL; return NULL;

5
Modules/_io/iobase.c
View File

@ -63,6 +63,8 @@ _Py_IDENTIFIER(__IOBase_closed);
#define IS_CLOSED(self) \ #define IS_CLOSED(self) \
_PyObject_HasAttrId(self, &PyId___IOBase_closed) _PyObject_HasAttrId(self, &PyId___IOBase_closed)
_Py_IDENTIFIER(read);
/* Internal methods */ /* Internal methods */
static PyObject * static PyObject *
iobase_unsupported(const char *message) iobase_unsupported(const char *message)
@ -180,7 +182,6 @@ static PyObject *
iobase_close(PyObject *self, PyObject *args) iobase_close(PyObject *self, PyObject *args)
{ {
PyObject *res; PyObject *res;
_Py_IDENTIFIER(__IOBase_closed);
if (IS_CLOSED(self)) if (IS_CLOSED(self))
Py_RETURN_NONE; Py_RETURN_NONE;
@ -454,7 +455,6 @@ iobase_readline(PyObject *self, PyObject *args)
int has_peek = 0; int has_peek = 0;
PyObject *buffer, *result; PyObject *buffer, *result;
Py_ssize_t old_size = -1; Py_ssize_t old_size = -1;
_Py_IDENTIFIER(read);
_Py_IDENTIFIER(peek); _Py_IDENTIFIER(peek);
if (!PyArg_ParseTuple(args, "|O&:readline", &_PyIO_ConvertSsize_t, &limit)) { if (!PyArg_ParseTuple(args, "|O&:readline", &_PyIO_ConvertSsize_t, &limit)) {
@ -848,7 +848,6 @@ rawiobase_readall(PyObject *self, PyObject *args)
return NULL; return NULL;
while (1) { while (1) {
_Py_IDENTIFIER(read);
PyObject *data = _PyObject_CallMethodId(self, &PyId_read, PyObject *data = _PyObject_CallMethodId(self, &PyId_read,
"i", DEFAULT_BUFFER_SIZE); "i", DEFAULT_BUFFER_SIZE);
if (!data) { if (!data) {

4
Modules/cjkcodecs/multibytecodec.c
View File

@ -51,6 +51,8 @@ static PyObject *multibytecodec_encode(MultibyteCodec *,
#define MBENC_RESET MBENC_MAX<<1 /* reset after an encoding session */ #define MBENC_RESET MBENC_MAX<<1 /* reset after an encoding session */
_Py_IDENTIFIER(write);
static PyObject * static PyObject *
make_tuple(PyObject *object, Py_ssize_t len) make_tuple(PyObject *object, Py_ssize_t len)
{ {
@ -1569,7 +1571,6 @@ mbstreamwriter_iwrite(MultibyteStreamWriterObject *self,
PyObject *unistr) PyObject *unistr)
{ {
PyObject *str, *wr; PyObject *str, *wr;
_Py_IDENTIFIER(write);
str = encoder_encode_stateful(STATEFUL_ECTX(self), unistr, 0); str = encoder_encode_stateful(STATEFUL_ECTX(self), unistr, 0);
if (str == NULL) if (str == NULL)
@ -1639,7 +1640,6 @@ mbstreamwriter_reset(MultibyteStreamWriterObject *self)
assert(PyBytes_Check(pwrt)); assert(PyBytes_Check(pwrt));
if (PyBytes_Size(pwrt) > 0) { if (PyBytes_Size(pwrt) > 0) {
PyObject *wr; PyObject *wr;
_Py_IDENTIFIER(write);
wr = _PyObject_CallMethodId(self->stream, &PyId_write, "O", pwrt); wr = _PyObject_CallMethodId(self->stream, &PyId_write, "O", pwrt);
if (wr == NULL) { if (wr == NULL) {

1
Objects/typeobject.c
View File

@ -5633,7 +5633,6 @@ slot_tp_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
PyObject *func; PyObject *func;
PyObject *newargs, *x; PyObject *newargs, *x;
Py_ssize_t i, n; Py_ssize_t i, n;
_Py_IDENTIFIER(__new__);
func = _PyObject_GetAttrId((PyObject *)type, &PyId___new__); func = _PyObject_GetAttrId((PyObject *)type, &PyId___new__);
if (func == NULL) if (func == NULL)

6
Python/pythonrun.c
View File

@ -37,9 +37,11 @@
_Py_IDENTIFIER(builtins); _Py_IDENTIFIER(builtins);
_Py_IDENTIFIER(excepthook); _Py_IDENTIFIER(excepthook);
_Py_IDENTIFIER(flush);
_Py_IDENTIFIER(last_traceback); _Py_IDENTIFIER(last_traceback);
_Py_IDENTIFIER(last_type); _Py_IDENTIFIER(last_type);
_Py_IDENTIFIER(last_value); _Py_IDENTIFIER(last_value);
_Py_IDENTIFIER(name);
_Py_IDENTIFIER(ps1); _Py_IDENTIFIER(ps1);
_Py_IDENTIFIER(ps2); _Py_IDENTIFIER(ps2);
_Py_IDENTIFIER(stdin); _Py_IDENTIFIER(stdin);
@ -215,7 +217,6 @@ get_codec_name(const char *encoding)
{ {
char *name_utf8, *name_str; char *name_utf8, *name_str;
PyObject *codec, *name = NULL; PyObject *codec, *name = NULL;
_Py_IDENTIFIER(name);
codec = _PyCodec_Lookup(encoding); codec = _PyCodec_Lookup(encoding);
if (!codec) if (!codec)
@ -512,7 +513,6 @@ flush_std_files(void)
PyObject *fout = _PySys_GetObjectId(&PyId_stdout); PyObject *fout = _PySys_GetObjectId(&PyId_stdout);
PyObject *ferr = _PySys_GetObjectId(&PyId_stderr); PyObject *ferr = _PySys_GetObjectId(&PyId_stderr);
PyObject *tmp; PyObject *tmp;
_Py_IDENTIFIER(flush);
if (fout != NULL && fout != Py_None && !file_is_closed(fout)) { if (fout != NULL && fout != Py_None && !file_is_closed(fout)) {
tmp = _PyObject_CallMethodId(fout, &PyId_flush, ""); tmp = _PyObject_CallMethodId(fout, &PyId_flush, "");
@ -1009,7 +1009,6 @@ create_stdio(PyObject* io,
_Py_IDENTIFIER(open); _Py_IDENTIFIER(open);
_Py_IDENTIFIER(isatty); _Py_IDENTIFIER(isatty);
_Py_IDENTIFIER(TextIOWrapper); _Py_IDENTIFIER(TextIOWrapper);
_Py_IDENTIFIER(name);
_Py_IDENTIFIER(mode); _Py_IDENTIFIER(mode);
/* stdin is always opened in buffered mode, first because it shouldn't /* stdin is always opened in buffered mode, first because it shouldn't
@ -2130,7 +2129,6 @@ flush_io(void)
{ {
PyObject *f, *r; PyObject *f, *r;
PyObject *type, *value, *traceback; PyObject *type, *value, *traceback;
_Py_IDENTIFIER(flush);
/* Save the current exception */ /* Save the current exception */
PyErr_Fetch(&type, &value, &traceback); PyErr_Fetch(&type, &value, &traceback);