[pypy-commit] pypy numpy-dtype-refactor: __module__ is now correctly, numpypy

[alex_gaynor]

Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch: numpy-dtype-refactor
Changeset: r50067:adbd652dc0ca
Date: 2011-12-02 12:27 -0500
http://bitbucket.org/pypy/pypy/changeset/adbd652dc0ca/

Log:	__module__ is now correctly, numpypy

diff --git a/pypy/module/micronumpy/REVIEW b/pypy/module/micronumpy/REVIEW
--- a/pypy/module/micronumpy/REVIEW
+++ b/pypy/module/micronumpy/REVIEW
@@ -1,5 +1,3 @@
-* Why we pass __module__ = 'numpy' to typedefs? Most stuff in pypy has
-  __module__ == '__builtin__' for good or bad, but if so, we should pass numpypy
 * why int16/int32 are not exported in __init__.py?
 * W_GenericBox.descr_int is not tested
 * setitem_w no longer calls invalidated(), why? doesn't it break some stuff?
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
@@ -154,7 +154,7 @@
 
 
 W_GenericBox.typedef = TypeDef("generic",
-    __module__ = "numpy",
+    __module__ = "numpypy",
 
     __new__ = interp2app(W_GenericBox.descr__new__.im_func),
 
@@ -184,45 +184,45 @@
 )
 
 W_BoolBox.typedef = TypeDef("bool_", W_GenericBox.typedef,
-    __module__ = "numpy",
+    __module__ = "numpypy",
     __new__ = interp2app(W_BoolBox.descr__new__.im_func),
 )
 
 W_NumberBox.typedef = TypeDef("number", W_GenericBox.typedef,
-    __module__ = "numpy",
+    __module__ = "numpypy",
 )
 
 W_IntegerBox.typedef = TypeDef("integer", W_NumberBox.typedef,
-    __module__ = "numpy",
+    __module__ = "numpypy",
 )
 
 W_SignedIntegerBox.typedef = TypeDef("signedinteger", W_IntegerBox.typedef,
-    __module__ = "numpy",
+    __module__ = "numpypy",
 )
 
 W_Int8Box.typedef = TypeDef("int8", W_SignedIntegerBox.typedef,
-    __module__ = "numpy",
+    __module__ = "numpypy",
     __new__ = interp2app(W_Int8Box.descr__new__.im_func),
 )
 
 W_UInt8Box.typedef = TypeDef("uint8", W_UnsignedIntgerBox.typedef,
-    __module__ = "numpy",
+    __module__ = "numpypy",
 )
 
 W_Int16Box.typedef = TypeDef("int16", W_SignedIntegerBox.typedef,
-    __module__ = "numpy",
+    __module__ = "numpypy",
 )
 
 W_UInt16Box.typedef = TypeDef("uint16", W_UnsignedIntgerBox.typedef,
-    __module__ = "numpy",
+    __module__ = "numpypy",
 )
 
 W_Int32Box.typedef = TypeDef("int32", W_SignedIntegerBox.typedef,
-    __module__ = "numpy",
+    __module__ = "numpypy",
 )
 
 W_UInt32Box.typedef = TypeDef("uint32", W_UnsignedIntgerBox.typedef,
-    __module__ = "numpy",
+    __module__ = "numpypy",
 )
 
 if LONG_BIT == 32:
@@ -230,36 +230,36 @@
 elif LONG_BIT == 64:
     long_name = "int64"
 W_LongBox.typedef = TypeDef(long_name, (W_SignedIntegerBox.typedef, int_typedef,),
-    __module__ = "numpy",
+    __module__ = "numpypy",
 )
 
 W_ULongBox.typedef = TypeDef("u" + long_name, W_UnsignedIntgerBox.typedef,
-    __module__ = "numpy",
+    __module__ = "numpypy",
 )
 
 W_Int64Box.typedef = TypeDef("int64", (W_SignedIntegerBox.typedef,) + MIXIN_64,
-    __module__ = "numpy",
+    __module__ = "numpypy",
     __new__ = interp2app(W_Int64Box.descr__new__.im_func),
 )
 
 W_UInt64Box.typedef = TypeDef("uint64", W_UnsignedIntgerBox.typedef,
-    __module__ = "numpy",
+    __module__ = "numpypy",
 )
 
 W_InexactBox.typedef = TypeDef("inexact", W_NumberBox.typedef,
-    __module__ = "numpy",
+    __module__ = "numpypy",
 )
 
 W_FloatingBox.typedef = TypeDef("floating", W_InexactBox.typedef,
-    __module__ = "numpy",
+    __module__ = "numpypy",
 )
 
 W_Float32Box.typedef = TypeDef("float32", W_FloatingBox.typedef,
-    __module__ = "numpy",
+    __module__ = "numpypy",
 )
 
 W_Float64Box.typedef = TypeDef("float64", (W_FloatingBox.typedef, float_typedef),
-    __module__ = "numpy",
+    __module__ = "numpypy",
 
     __new__ = interp2app(W_Float64Box.descr__new__.im_func),
 )
\ No newline at end of file
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
@@ -84,7 +84,7 @@
         return space.newtuple([])
 
 W_Dtype.typedef = TypeDef("dtype",
-    __module__ = "numpy",
+    __module__ = "numpypy",
     __new__ = interp2app(W_Dtype.descr__new__.im_func),
 
     __str__= interp2app(W_Dtype.descr_str),
diff --git a/pypy/module/micronumpy/interp_ufuncs.py b/pypy/module/micronumpy/interp_ufuncs.py
--- a/pypy/module/micronumpy/interp_ufuncs.py
+++ b/pypy/module/micronumpy/interp_ufuncs.py
@@ -168,7 +168,7 @@
 
 
 W_Ufunc.typedef = TypeDef("ufunc",
-    __module__ = "numpy",
+    __module__ = "numpypy",
 
     __call__ = interp2app(W_Ufunc.descr_call),
     __repr__ = interp2app(W_Ufunc.descr_repr),