Author: Manuel Jacob
Branch: remove-remaining-smm
Changeset: r69307:3f359859555e
Date: 2014-02-23 23:13 +0100
http://bitbucket.org/pypy/pypy/changeset/3f359859555e/
Log: Move descr_conjugate.
diff --git a/pypy/objspace/std/complexobject.py
b/pypy/objspace/std/complexobject.py
--- a/pypy/objspace/std/complexobject.py
+++ b/pypy/objspace/std/complexobject.py
@@ -336,10 +336,6 @@
return space.newtuple([space.newfloat(self.realval),
space.newfloat(self.imagval)])
- def descr_conjugate(self, space):
- """(A+Bj).conjugate() -> A-Bj"""
- return space.newcomplex(self.realval, -self.imagval)
-
def descr_add(self, space, w_rhs):
w_rhs = to_complex(space, w_rhs)
return W_ComplexObject(self.realval + w_rhs.realval,
@@ -445,6 +441,10 @@
raise OperationError(space.w_OverflowError, space.wrap("complex
exponentiation"))
return w_p
+ def descr_conjugate(self, space):
+ """(A+Bj).conjugate() -> A-Bj"""
+ return space.newcomplex(self.realval, -self.imagval)
+
registerimplementation(W_ComplexObject)
w_one = W_ComplexObject(1, 0)
@@ -581,7 +581,6 @@
__getnewargs__ = interp2app(W_ComplexObject.descr___getnewargs__),
real = complexwprop('realval'),
imag = complexwprop('imagval'),
- conjugate = interp2app(W_ComplexObject.descr_conjugate),
__add__ = interp2app(W_ComplexObject.descr_add),
__radd__ = interp2app(W_ComplexObject.descr_radd),
@@ -600,6 +599,8 @@
__divmod__ = interp2app(W_ComplexObject.descr_divmod),
__rdivmod__ = interp2app(W_ComplexObject.descr_rdivmod),
__pow__ = interp2app(W_ComplexObject.descr_pow),
+
+ conjugate = interp2app(W_ComplexObject.descr_conjugate),
)
W_ComplexObject.typedef.registermethods(globals())
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
