diff options
author | Benjamin Peterson <benjamin@python.org> | 2009-11-19 03:11:09 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2009-11-19 03:11:09 (GMT) |
commit | 6481e09084718ac87333e0ba183588142bbde93b (patch) | |
tree | 1a89e121a6c9bd761f2560bfe6dd3b68bbe8970f /Objects | |
parent | 1aef4440fb49e876150bb90814e231e0342eb417 (diff) | |
download | cpython-6481e09084718ac87333e0ba183588142bbde93b.zip cpython-6481e09084718ac87333e0ba183588142bbde93b.tar.gz cpython-6481e09084718ac87333e0ba183588142bbde93b.tar.bz2 |
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
........
Diffstat (limited to 'Objects')
-rw-r--r-- | Objects/weakrefobject.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c index 9cdd021..1a998b6 100644 --- a/Objects/weakrefobject.c +++ b/Objects/weakrefobject.c @@ -433,6 +433,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 */ @@ -593,6 +600,15 @@ proxy_iternext(PyWeakReference *proxy) } +WRAP_METHOD(proxy_unicode, "__unicode__"); + + +static PyMethodDef proxy_methods[] = { + {"__unicode__", (PyCFunction)proxy_unicode, METH_NOARGS}, + {NULL, NULL} +}; + + static PyNumberMethods proxy_as_number = { proxy_add, /*nb_add*/ proxy_sub, /*nb_subtract*/ @@ -684,6 +700,7 @@ _PyWeakref_ProxyType = { 0, /* tp_weaklistoffset */ (getiterfunc)proxy_iter, /* tp_iter */ (iternextfunc)proxy_iternext, /* tp_iternext */ + proxy_methods, /* tp_methods */ }; |