mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 14:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

fix __bytes__ handling here in py3x

Browse source 
Merged revisions 76395 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76395 | benjamin.peterson | 2009-11-18 21:00:02 -0600 (Wed, 18 Nov 2009) | 1 line

  #5037 proxy __unicode__ correctly
........
This commit is contained in:
Benjamin Peterson 2009-11-19 03:08:32 +00:00
parent 36c3c027ad
commit 32019774b9
3 changed files with 31 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Objects/weakrefobject.c
View file

@ -435,6 +435,13 @@ proxy_checkref(PyWeakReference *proxy)
return generic(proxy, v, w); \
}
#define WRAP_METHOD(method, special) \
static PyObject * \
method(PyObject *proxy) { \
UNWRAP(proxy); \
return PyObject_CallMethod(proxy, special, ""); \
}
/* direct slots */
@ -576,6 +583,15 @@ proxy_iternext(PyWeakReference *proxy)
}
WRAP_METHOD(proxy_bytes, "__bytes__");
static PyMethodDef proxy_methods[] = {
{"__bytes__", (PyCFunction)proxy_bytes, METH_NOARGS},
{NULL, NULL}
};
static PyNumberMethods proxy_as_number = {
proxy_add, /*nb_add*/
proxy_sub, /*nb_subtract*/
@ -661,6 +677,7 @@ _PyWeakref_ProxyType = {
0, /* tp_weaklistoffset */
(getiterfunc)proxy_iter, /* tp_iter */
(iternextfunc)proxy_iternext, /* tp_iternext */
proxy_methods, /* tp_methods */
};