Rough and dirty job -- allow concatenation of bytes and arbitrary

buffer-supporting objects (Unicode always excluded), and also of
str and bytes.
(For some reason u"" + b"" doesn't fail, I'll investigate later.)
This commit is contained in:
Guido van Rossum 2007-04-13 01:39:34 +00:00
parent dc0b1a1069
commit ad7d8d10b7
5 changed files with 213 additions and 73 deletions

View file

@ -1347,7 +1347,7 @@ merge_class_dict(PyObject* dict, PyObject* aclass)
/* Helper for PyObject_Dir without arguments: returns the local scope. */
static PyObject *
_dir_locals()
_dir_locals(void)
{
PyObject *names;
PyObject *locals = PyEval_GetLocals();
@ -1892,4 +1892,3 @@ _PyTrash_destroy_chain(void)
#ifdef __cplusplus
}
#endif