Author: Armin Rigo <[email protected]>
Branch: py3.5-newtext
Changeset: r90132:0d12eeeab7ce
Date: 2017-02-15 08:10 +0100
http://bitbucket.org/pypy/pypy/changeset/0d12eeeab7ce/
Log: hg merge 2e449c823765
diff --git a/pypy/interpreter/error.py b/pypy/interpreter/error.py
--- a/pypy/interpreter/error.py
+++ b/pypy/interpreter/error.py
@@ -71,7 +71,7 @@
if self.__class__ is not OperationError and s is None:
s = self._compute_value(space)
try:
- s = space.str_w(s)
+ s = space.text_w(s)
except Exception:
pass
return '[%s: %s]' % (self.w_type, s)
diff --git a/pypy/module/micronumpy/ufuncs.py b/pypy/module/micronumpy/ufuncs.py
--- a/pypy/module/micronumpy/ufuncs.py
+++ b/pypy/module/micronumpy/ufuncs.py
@@ -1203,8 +1203,10 @@
wrapfn="newint"),
nout = interp_attrproperty("nout", cls=W_Ufunc,
wrapfn="newint"),
- nargs = interp_attrproperty("nargs", cls=W_Ufunc),
- signature = interp_attrproperty("signature", cls=W_Ufunc),
+ nargs = interp_attrproperty("nargs", cls=W_Ufunc,
+ wrapfn="newint"),
+ signature = interp_attrproperty("signature", cls=W_Ufunc,
+ wrapfn="newtext"),
reduce = interp2app(W_Ufunc.descr_reduce),
outer = interp2app(W_Ufunc.descr_outer),
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
