mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 00:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

More on SF bug [#460020] bug or feature: unicode() and subclasses.

Browse source 
tuple(i) repaired to return a true tuple when i is an instance of a
tuple subclass.
Added PyTuple_CheckExact macro.
PySequence_Tuple():  if a tuple-like object isn't exactly a tuple, it's
not safe to return the object as-is -- make a new tuple of it instead.
This commit is contained in:
Tim Peters 2001-09-10 23:37:46 +00:00
parent caaff8d95d
commit 4c3a0a35cd
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Include/tupleobject.h
View file

@ -27,6 +27,7 @@ typedef struct {
extern DL_IMPORT(PyTypeObject) PyTuple_Type; extern DL_IMPORT(PyTypeObject) PyTuple_Type;
#define PyTuple_Check(op) PyObject_TypeCheck(op, &PyTuple_Type) #define PyTuple_Check(op) PyObject_TypeCheck(op, &PyTuple_Type)
#define PyTuple_CheckExact(op) ((op)->ob_type == &PyTuple_Type)
extern DL_IMPORT(PyObject *) PyTuple_New(int size); extern DL_IMPORT(PyObject *) PyTuple_New(int size);
extern DL_IMPORT(int) PyTuple_Size(PyObject *); extern DL_IMPORT(int) PyTuple_Size(PyObject *);

2
Lib/test/test_descr.py
View file

@ -1416,7 +1416,7 @@ def inherits():
verify(v == t) verify(v == t)
a = madtuple((1,2,3,4,5)) a = madtuple((1,2,3,4,5))
verify(tuple(a) == (1,2,3,4,5)) verify(tuple(a) == (1,2,3,4,5))
#XXX verify(tuple(a).__class__ is tuple) verify(tuple(a).__class__ is tuple)
a = madtuple(()) a = madtuple(())
verify(tuple(a) == ()) verify(tuple(a) == ())
#XXX verify(tuple(a).__class__ is tuple) #XXX verify(tuple(a).__class__ is tuple)

6
Objects/abstract.c
View file

@ -1235,7 +1235,11 @@ PySequence_Tuple(PyObject *v)
return null_error(); return null_error();
/* Special-case the common tuple and list cases, for efficiency. */ /* Special-case the common tuple and list cases, for efficiency. */
if (PyTuple_Check(v)) { if (PyTuple_CheckExact(v)) {
/* Note that we can't know whether it's safe to return
a tuple *subclass* instance as-is, hence the restriction
to exact tuples here. In contrasts, lists always make
a copy, so there's need for exactness below. */
Py_INCREF(v); Py_INCREF(v);
return v; return v;
} }