mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-22 06:32:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Make sure filter() never returns tuple, str or unicode

Browse source 
subclasses. (Discussed in SF patch #665835)
This commit is contained in:
Walter Dörwald 2003-02-04 20:24:45 +00:00
parent 29273c87da
commit c3da83fcd7
2 changed files with 45 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Lib/test/test_builtin.py
View file

@ -408,6 +408,29 @@ class BuiltinTest(unittest.TestCase):
unicode("345") unicode("345")
) )
def test_filter_subclasses(self):
# test, that filter() never returns tuple, str or unicode subclasses
funcs = (None, lambda x: True)
class tuple2(tuple):
pass
class str2(str):
pass
inputs = {
tuple2: [(), (1,2,3)],
str2: ["", "123"]
}
if have_unicode:
class unicode2(unicode):
pass
inputs[unicode2] = [unicode(), unicode("123")]
for func in funcs:
for (cls, inps) in inputs.iteritems():
for inp in inps:
out = filter(func, cls(inp))
self.assertEqual(inp, out)
self.assert_(not isinstance(out, cls))
def test_float(self): def test_float(self):
self.assertEqual(float(3.14), 3.14) self.assertEqual(float(3.14), 3.14)
self.assertEqual(float(314), 314.0) self.assertEqual(float(314), 314.0)

27
Python/bltinmodule.c
View file

@ -1838,7 +1838,10 @@ filtertuple(PyObject *func, PyObject *tuple)
int len = PyTuple_Size(tuple); int len = PyTuple_Size(tuple);
if (len == 0) { if (len == 0) {
Py_INCREF(tuple); if (PyTuple_CheckExact(tuple))
Py_INCREF(tuple);
else
tuple = PyTuple_New(0);
return tuple; return tuple;
} }
@ -1895,8 +1898,15 @@ filterstring(PyObject *func, PyObject *strobj)
int outlen = len; int outlen = len;
if (func == Py_None) { if (func == Py_None) {
/* No character is ever false -- share input string */ /* No character is ever false -- share input string
Py_INCREF(strobj); * (if it's not a subclass) */
if (PyString_CheckExact(strobj))
Py_INCREF(strobj);
else
strobj = PyString_FromStringAndSize(
PyString_AS_STRING(strobj),
len
);
return strobj; return strobj;
} }
if ((result = PyString_FromStringAndSize(NULL, len)) == NULL) if ((result = PyString_FromStringAndSize(NULL, len)) == NULL)
@ -1980,8 +1990,15 @@ filterunicode(PyObject *func, PyObject *strobj)
int outlen = len; int outlen = len;
if (func == Py_None) { if (func == Py_None) {
/* No character is ever false -- share input string */ /* No character is ever false -- share input string
Py_INCREF(strobj); * (it if's not a subclass) */
if (PyUnicode_CheckExact(strobj))
Py_INCREF(strobj);
else
strobj = PyUnicode_FromUnicode(
PyUnicode_AS_UNICODE(strobj),
len
);
return strobj; return strobj;
} }
if ((result = PyUnicode_FromUnicode(NULL, len)) == NULL) if ((result = PyUnicode_FromUnicode(NULL, len)) == NULL)