Author: Matti Picus <[email protected]>
Branch: python-numpy
Changeset: r56822:b4051ca970be
Date: 2012-08-23 15:22 +0300
http://bitbucket.org/pypy/pypy/changeset/b4051ca970be/
Log: skip 'import ma' for now, which allows 'import numpy' to complete
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
@@ -155,7 +155,7 @@
import polynomial
import random
import ctypeslib
- import ma
+ #import ma
import matrixlib as _mat
from matrixlib import *
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
@@ -82,7 +82,8 @@
import mtrand
sys.modules['mtrand'] = mtrand
+sys.modules['ma'] = mtrand
+sys.modules['matrixlib'] = mtrand
-
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
