Author: Brian Kearns <bdkea...@gmail.com>
Branch: cleanup-numpypy-namespace
Changeset: r61760:409e32c0f00e
Date: 2013-02-25 08:36 -0500
http://bitbucket.org/pypy/pypy/changeset/409e32c0f00e/
Log: fix choose/repeat name clashes
diff --git a/lib_pypy/numpypy/core/fromnumeric.py
b/lib_pypy/numpypy/core/fromnumeric.py
--- a/lib_pypy/numpypy/core/fromnumeric.py
+++ b/lib_pypy/numpypy/core/fromnumeric.py
@@ -16,7 +16,7 @@
######################################################################
import numpypy
-from _numpypy import choose, repeat
+import _numpypy
# Module containing non-deprecated functions borrowed from Numeric.
__docformat__ = "restructuredtext en"
@@ -275,7 +275,7 @@
[-1, -2, -3, -4, -5]]])
"""
- return choose(a, choices, out, mode)
+ return _numpypy.choose(a, choices, out, mode)
def repeat(a, repeats, axis=None):
@@ -317,7 +317,7 @@
[3, 4]])
"""
- return repeat(a, repeats, axis)
+ return _numpypy.repeat(a, repeats, axis)
def put(a, ind, v, mode='raise'):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
