Author: Benjamin Peterson <[email protected]>
Branch:
Changeset: r44603:5fe43779098f
Date: 2011-05-30 19:29 -0500
http://bitbucket.org/pypy/pypy/changeset/5fe43779098f/
Log: convert some more multimethods into simple methods on the type
diff --git a/pypy/objspace/std/floattype.py b/pypy/objspace/std/floattype.py
--- a/pypy/objspace/std/floattype.py
+++ b/pypy/objspace/std/floattype.py
@@ -14,9 +14,7 @@
float_as_integer_ratio = SMM("as_integer_ratio", 1)
float_hex = SMM("hex", 1)
-float_conjugate = SMM("conjugate", 1, doc="Returns self, the complex conjugate
of any float.")
-
-def float_conjugate__ANY(space, w_float):
+def descr_conjugate(space, w_float):
return space.pos(w_float)
register_all(vars(), globals())
@@ -280,6 +278,7 @@
as_classmethod=True),
fromhex = gateway.interp2app(descr_fromhex,
as_classmethod=True),
+ conjugate = gateway.interp2app(descr_conjugate),
real = typedef.GetSetProperty(descr_get_real),
imag = typedef.GetSetProperty(descr_get_imag),
)
diff --git a/pypy/objspace/std/longtype.py b/pypy/objspace/std/longtype.py
--- a/pypy/objspace/std/longtype.py
+++ b/pypy/objspace/std/longtype.py
@@ -4,13 +4,9 @@
from pypy.objspace.std.stdtypedef import StdTypeDef, SMM
from pypy.objspace.std.strutil import string_to_bigint, ParseStringError
-long_conjugate = SMM("conjugate", 1, doc="Returns self, the complex conjugate
of any long.")
-
-def long_conjugate__ANY(space, w_int):
+def descr_conjugate(space, w_int):
return space.pos(w_int)
-register_all(vars(), globals())
-
def descr__new__(space, w_longtype, w_x=0, w_base=gateway.NoneNotWrapped):
from pypy.objspace.std.longobject import W_LongObject
@@ -128,6 +124,7 @@
string, use the optional base. It is an error to supply a base when
converting a non-string.''',
__new__ = gateway.interp2app(descr__new__),
+ conjugate = gateway.interp2app(descr_conjugate),
numerator = typedef.GetSetProperty(descr_get_numerator),
denominator = typedef.GetSetProperty(descr_get_denominator),
real = typedef.GetSetProperty(descr_get_real),
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
