Author: Maciej Fijalkowski <fij...@gmail.com>
Branch: backend-vector-ops
Changeset: r52756:939a94b35997
Date: 2012-02-21 19:46 -0700
http://bitbucket.org/pypy/pypy/changeset/939a94b35997/
Log: ugh, fix the merge
diff --git a/pypy/module/micronumpy/interp_support.py
b/pypy/module/micronumpy/interp_support.py
--- a/pypy/module/micronumpy/interp_support.py
+++ b/pypy/module/micronumpy/interp_support.py
@@ -74,7 +74,7 @@
raise OperationError(space.w_ValueError, space.wrap(
"string is smaller than requested size"))
- a = W_NDimArray(count, [count], dtype=dtype)
+ a = W_NDimArray([count], dtype=dtype)
fromstring_loop(a, count, dtype, itemsize, s)
return space.wrap(a)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
