(original) (raw)

Index: Objects/weakrefobject.c =================================================================== --- Objects/weakrefobject.c (revision 68904) +++ Objects/weakrefobject.c (working copy) @@ -433,7 +433,14 @@ return generic(proxy, v, w); \ } +#define WRAP_METHOD(method, special) \ + static PyObject * \ + method(PyObject *proxy) { \ + UNWRAP(proxy); \ + return PyObject_CallMethod(proxy, special, ""); \ + } + /* direct slots */ WRAP_BINARY(proxy_getattr, PyObject_GetAttr) @@ -593,6 +600,15 @@ } +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 @@ 0, /* tp_weaklistoffset */ (getiterfunc)proxy_iter, /* tp_iter */ (iternextfunc)proxy_iternext, /* tp_iternext */ + proxy_methods, /* tp_methods */ }; Index: Lib/test/test_weakref.py =================================================================== --- Lib/test/test_weakref.py (revision 68904) +++ Lib/test/test_weakref.py (working copy) @@ -187,6 +187,17 @@ self.assertEqual(L3[5:], p3[5:]) self.assertEqual(L3[:5], p3[:5]) self.assertEqual(L3[2:5], p3[2:5]) + + def test_proxy_unicode(self): + # See bug 5037 + class C(object): + def __str__(self): + return "string" + def __unicode__(self): + return u"unicode" + instance = C() + self.assertTrue("__unicode__" in dir(weakref.proxy(instance))) + self.assertEqual(unicode(weakref.proxy(instance)), u"unicode") def test_proxy_index(self): class C: