Author: mattip <[email protected]>
Branch: python-numpy
Changeset: r56691:91a022decde3
Date: 2012-08-10 14:29 +0300
http://bitbucket.org/pypy/pypy/changeset/91a022decde3/
Log: add enough hacks so that 'import numpy' fails for non-trivial
reasons
diff --git a/lib_pypy/numpy/__init__.py b/lib_pypy/numpy/__init__.py
--- a/lib_pypy/numpy/__init__.py
+++ b/lib_pypy/numpy/__init__.py
@@ -134,6 +134,8 @@
loader = PackageLoader(infunc=True)
return loader(*packages, **options)
+ import numpypy
+
import add_newdocs
__all__ = ['add_newdocs']
@@ -142,7 +144,7 @@
from testing import Tester
test = Tester().test
bench = Tester().bench
-
+
import core
from core import *
import compat
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
@@ -1,5 +1,15 @@
-from _numpypy import *
-from .core import *
+#from _numpypy import *
+#from .core import *
-import sys
-sys.modules.setdefault('numpy', sys.modules['numpypy'])
+import sys, types
+#sys.modules.setdefault('numpy', sys.modules['numpypy'])
+
+nt = types.ModuleType('numerictype','fake numerictypes module')
+setattr(nt, 'sctypeDict',{})
+import _numpypy as umath
+import multiarray
+sys.modules['numpy.core.multiarray'] = multiarray
+sys.modules['numpy.core.umath'] = umath
+
+sys.modules['numerictypes'] = nt
+sys.modules['numpy.core.numerictypes'] = nt
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
