Author: Brian Kearns <[email protected]>
Branch:
Changeset: r67408:394a633e8c93
Date: 2013-10-16 05:27 -0400
http://bitbucket.org/pypy/pypy/changeset/394a633e8c93/
Log: typos/cleanups
diff --git a/pypy/module/micronumpy/interp_boxes.py
b/pypy/module/micronumpy/interp_boxes.py
--- a/pypy/module/micronumpy/interp_boxes.py
+++ b/pypy/module/micronumpy/interp_boxes.py
@@ -445,10 +445,10 @@
elif long_double_size in (12, 16):
class W_FloatLongBox(W_FloatingBox, PrimitiveBox):
- descr__new__, _get_dtype, descr_reduce = new_dtype_getter("float%d" %
long_double_size * 8)
+ descr__new__, _get_dtype, descr_reduce = new_dtype_getter("float%d" %
(long_double_size * 8))
class W_ComplexLongBox(ComplexBox, W_ComplexFloatingBox):
- descr__new__, _get_dtype, descr_reduce = new_dtype_getter("complex%d"
% long_double_size * 16)
+ descr__new__, _get_dtype, descr_reduce = new_dtype_getter("complex%d"
% (long_double_size * 16))
_COMPONENTS_BOX = W_FloatLongBox
@@ -614,34 +614,50 @@
W_Float16Box.typedef = TypeDef("float16", W_FloatingBox.typedef,
__module__ = "numpypy",
-
__new__ = interp2app(W_Float16Box.descr__new__.im_func),
__reduce__ = interp2app(W_Float16Box.descr_reduce),
)
W_Float32Box.typedef = TypeDef("float32", W_FloatingBox.typedef,
__module__ = "numpypy",
-
__new__ = interp2app(W_Float32Box.descr__new__.im_func),
__reduce__ = interp2app(W_Float32Box.descr_reduce),
)
W_Float64Box.typedef = TypeDef("float64", (W_FloatingBox.typedef,
float_typedef),
__module__ = "numpypy",
-
__new__ = interp2app(W_Float64Box.descr__new__.im_func),
__reduce__ = interp2app(W_Float64Box.descr_reduce),
)
+W_ComplexFloatingBox.typedef = TypeDef("complexfloating", W_InexactBox.typedef,
+ __module__ = "numpypy",
+)
+
+W_Complex64Box.typedef = TypeDef("complex64", (W_ComplexFloatingBox.typedef),
+ __module__ = "numpypy",
+ __new__ = interp2app(W_Complex64Box.descr__new__.im_func),
+ __reduce__ = interp2app(W_Complex64Box.descr_reduce),
+ real = GetSetProperty(W_ComplexFloatingBox .descr_get_real),
+ imag = GetSetProperty(W_ComplexFloatingBox.descr_get_imag),
+)
+
+W_Complex128Box.typedef = TypeDef("complex128", (W_ComplexFloatingBox.typedef,
complex_typedef),
+ __module__ = "numpypy",
+ __new__ = interp2app(W_Complex128Box.descr__new__.im_func),
+ __reduce__ = interp2app(W_Complex128Box.descr_reduce),
+ real = GetSetProperty(W_ComplexFloatingBox.descr_get_real),
+ imag = GetSetProperty(W_ComplexFloatingBox.descr_get_imag),
+)
+
if long_double_size in (12, 16):
- W_FloatLongBox.typedef = TypeDef("float%d" % long_double_size * 8,
(W_FloatingBox.typedef),
+ W_FloatLongBox.typedef = TypeDef("float%d" % (long_double_size * 8),
(W_FloatingBox.typedef),
__module__ = "numpypy",
+ __new__ = interp2app(W_FloatLongBox.descr__new__.im_func),
__reduce__ = interp2app(W_FloatLongBox.descr_reduce),
-
- __new__ = interp2app(W_FloatLongBox.descr__new__.im_func),
)
- W_ComplexLongBox.typedef = TypeDef("complex%d" % long_double_size * 16,
(W_ComplexFloatingBox.typedef, complex_typedef),
+ W_ComplexLongBox.typedef = TypeDef("complex%d" % (long_double_size * 16),
(W_ComplexFloatingBox.typedef, complex_typedef),
__module__ = "numpypy",
__new__ = interp2app(W_ComplexLongBox.descr__new__.im_func),
__reduce__ = interp2app(W_ComplexLongBox.descr_reduce),
@@ -673,24 +689,3 @@
__module__ = "numpypy",
__new__ = interp2app(W_UnicodeBox.descr__new__unicode_box.im_func),
)
-
-W_ComplexFloatingBox.typedef = TypeDef("complexfloating", W_InexactBox.typedef,
- __module__ = "numpypy",
-)
-
-
-W_Complex128Box.typedef = TypeDef("complex128", (W_ComplexFloatingBox.typedef,
complex_typedef),
- __module__ = "numpypy",
- __new__ = interp2app(W_Complex128Box.descr__new__.im_func),
- __reduce__ = interp2app(W_Complex128Box.descr_reduce),
- real = GetSetProperty(W_ComplexFloatingBox.descr_get_real),
- imag = GetSetProperty(W_ComplexFloatingBox.descr_get_imag),
-)
-
-W_Complex64Box.typedef = TypeDef("complex64", (W_ComplexFloatingBox.typedef),
- __module__ = "numpypy",
- __new__ = interp2app(W_Complex64Box.descr__new__.im_func),
- __reduce__ = interp2app(W_Complex64Box.descr_reduce),
- real = GetSetProperty(W_ComplexFloatingBox .descr_get_real),
- imag = GetSetProperty(W_ComplexFloatingBox.descr_get_imag),
-)
diff --git a/pypy/module/micronumpy/interp_dtype.py
b/pypy/module/micronumpy/interp_dtype.py
--- a/pypy/module/micronumpy/interp_dtype.py
+++ b/pypy/module/micronumpy/interp_dtype.py
@@ -607,7 +607,7 @@
types.FloatLong(),
num=13,
kind=FLOATINGLTR,
- name="float%d" % interp_boxes.long_double_size * 8,
+ name="float%d" % (interp_boxes.long_double_size * 8),
char="g",
w_box_type=space.gettypefor(interp_boxes.W_FloatLongBox),
aliases=["longdouble", "longfloat"],
@@ -636,7 +636,7 @@
types.ComplexLong(),
num=16,
kind=COMPLEXLTR,
- name="complex%d" % interp_boxes.long_double_size * 16,
+ name="complex%d" % (interp_boxes.long_double_size * 16),
char="G",
w_box_type = space.gettypefor(interp_boxes.W_ComplexLongBox),
aliases=["clongdouble", "clongfloat"],
diff --git a/pypy/module/micronumpy/types.py b/pypy/module/micronumpy/types.py
--- a/pypy/module/micronumpy/types.py
+++ b/pypy/module/micronumpy/types.py
@@ -1673,7 +1673,6 @@
T = rffi.LONGDOUBLE
BoxType = interp_boxes.W_FloatLongBox
- format_code = "q"
def runpack_str(self, s):
assert len(s) == interp_boxes.long_double_size
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
