[pypy-commit] pypy backend-vector-ops: ugh, fix the merge

fijal noreply at buildbot.pypy.org
Wed Feb 22 04:27:11 CET 2012


Author: Maciej Fijalkowski <fijall at 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)
 


More information about the pypy-commit mailing list