[pypy-commit] pypy numpypy-nditer: fix merge, re-export name into module namespace
mattip
noreply at buildbot.pypy.org
Thu Apr 17 18:28:42 CEST 2014
Author: Matti Picus <matti.picus at gmail.com>
Branch: numpypy-nditer
Changeset: r70707:963c427d19ab
Date: 2014-04-17 19:27 +0300
http://bitbucket.org/pypy/pypy/changeset/963c427d19ab/
Log: fix merge, re-export name into module namespace
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
@@ -23,6 +23,7 @@
'set_string_function': 'appbridge.set_string_function',
'typeinfo': 'descriptor.get_dtype_cache(space).w_typeinfo',
+ 'nditer': 'nditer.nditer',
}
for c in ['MAXDIMS', 'CLIP', 'WRAP', 'RAISE']:
interpleveldefs[c] = 'space.wrap(constants.%s)' % c
More information about the pypy-commit
mailing list