diff options
| author | Guido van Rossum <guido@python.org> | 2007-04-13 01:39:34 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-04-13 01:39:34 (GMT) |
| commit | ad7d8d10b70b62b25fc8ebd1a6bfef0c008a232a (patch) | |
| tree | 2889cee1ac3e392aac63e7fc848e314d7cf2cda2 /Objects/object.c | |
| parent | dc0b1a106981ee204936221f4e0863bd1d7a6ba6 (diff) | |
| download | cpython-ad7d8d10b70b62b25fc8ebd1a6bfef0c008a232a.zip cpython-ad7d8d10b70b62b25fc8ebd1a6bfef0c008a232a.tar.gz cpython-ad7d8d10b70b62b25fc8ebd1a6bfef0c008a232a.tar.bz2 | |
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.)
Diffstat (limited to 'Objects/object.c')
| -rw-r--r-- | Objects/object.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Objects/object.c b/Objects/object.c index f4ae4f3..0bf0c60 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -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 - |