Author: Matti Picus <[email protected]>
Branch: python-numpy
Changeset: r56817:ebe070ee8a92
Date: 2012-08-23 11:30 +0300
http://bitbucket.org/pypy/pypy/changeset/ebe070ee8a92/
Log: stub out frompyfunc, mod, scalarmath
diff --git a/lib_pypy/numpypy/__init__.py b/lib_pypy/numpypy/__init__.py
--- a/lib_pypy/numpypy/__init__.py
+++ b/lib_pypy/numpypy/__init__.py
@@ -2,17 +2,24 @@
#from .core import *
import sys
+import math as _math
#sys.modules.setdefault('numpy', sys.modules['numpypy'])
-import _numpypy as umath
+import _numpypy
+umath = _numpypy
+
import multiarray
sys.modules['numpy.core.multiarray'] = multiarray
-sys.modules['numpy.core.umath'] = umath
+sys.modules['numpy.core.umath'] = _numpypy
import numerictypes
sys.modules['numerictypes'] = numerictypes
sys.modules['numpy.core.numerictypes'] = numerictypes
+import scalarmath
+sys.modules['scalarmath'] = scalarmath
+sys.modules['numpy.core.scalarmath'] = scalarmath
+
umath.ERR_IGNORE = 0
umath.ERR_WARN = 1
umath.ERR_RAISE = 2
@@ -39,3 +46,12 @@
umath.PINF = float('inf')
umath.NAN = float('nan')
+umath.pi = _math.pi
+
+del _math
+
+def not_implemented_func(*args, **kwargs):
+ raise NotImplementedError("implemented yet")
+
+setattr(_numpypy, 'frompyfunc', not_implemented_func)
+setattr(_numpypy, 'mod', not_implemented_func)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
