Author: Brian Kearns <[email protected]>
Branch:
Changeset: r69907:f70fd9b07a96
Date: 2014-03-12 14:49 -0400
http://bitbucket.org/pypy/pypy/changeset/f70fd9b07a96/
Log: export some numpy constants
diff --git a/pypy/module/micronumpy/__init__.py
b/pypy/module/micronumpy/__init__.py
--- a/pypy/module/micronumpy/__init__.py
+++ b/pypy/module/micronumpy/__init__.py
@@ -6,23 +6,26 @@
interpleveldefs = {
'ndarray': 'ndarray.W_NDimArray',
'dtype': 'descriptor.W_Dtype',
+ 'flatiter': 'flatiter.W_FlatIterator',
+ '_reconstruct' : 'ndarray._reconstruct',
+ 'scalar' : 'ctors.build_scalar',
'array': 'ctors.array',
'zeros': 'ctors.zeros',
'empty': 'ctors.zeros',
'empty_like': 'ctors.empty_like',
- '_reconstruct' : 'ndarray._reconstruct',
- 'scalar' : 'ctors.build_scalar',
+ 'fromstring': 'ctors.fromstring',
+
+ 'concatenate': 'arrayops.concatenate',
+ 'count_nonzero': 'arrayops.count_nonzero',
'dot': 'arrayops.dot',
- 'fromstring': 'ctors.fromstring',
- 'flatiter': 'flatiter.W_FlatIterator',
- 'concatenate': 'arrayops.concatenate',
'where': 'arrayops.where',
- 'count_nonzero': 'arrayops.count_nonzero',
'set_string_function': 'appbridge.set_string_function',
'typeinfo': 'descriptor.get_dtype_cache(space).w_typeinfo',
}
+ for c in ['CLIP', 'WRAP', 'RAISE']:
+ interpleveldefs[c] = 'space.wrap(constants.%s)' % c
class UMathModule(MixedModule):
diff --git a/pypy/module/micronumpy/test/test_ndarray.py
b/pypy/module/micronumpy/test/test_ndarray.py
--- a/pypy/module/micronumpy/test/test_ndarray.py
+++ b/pypy/module/micronumpy/test/test_ndarray.py
@@ -246,6 +246,12 @@
return CustomIntObject(value)
+ def test_constants(self):
+ import numpy as np
+ assert np.CLIP is 0
+ assert np.WRAP is 1
+ assert np.RAISE is 2
+
def test_ndarray(self):
from numpy import ndarray, array, dtype, flatiter
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
