Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r51956:c0a95b1a7b87
Date: 2012-01-29 19:56 +0100
http://bitbucket.org/pypy/pypy/changeset/c0a95b1a7b87/
Log: merge heads
diff --git a/pypy/module/micronumpy/tool/numready/main.py
b/pypy/module/micronumpy/tool/numready/main.py
--- a/pypy/module/micronumpy/tool/numready/main.py
+++ b/pypy/module/micronumpy/tool/numready/main.py
@@ -88,7 +88,7 @@
l[i].append(lst[k * lgt + i])
return l
-SPECIAL_NAMES = ["ndarray", "dtype", "generic"]
+SPECIAL_NAMES = ["ndarray", "dtype", "generic", "flatiter"]
def main(argv):
cpy_items = find_numpy_items("/usr/bin/python")
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
