Author: Maciej Fijalkowski <[email protected]>
Branch:
Changeset: r64619:f5f6bc6f2837
Date: 2013-05-28 16:00 +0200
http://bitbucket.org/pypy/pypy/changeset/f5f6bc6f2837/
Log: fix broken merge
diff --git a/pypy/module/micronumpy/interp_numarray.py
b/pypy/module/micronumpy/interp_numarray.py
--- a/pypy/module/micronumpy/interp_numarray.py
+++ b/pypy/module/micronumpy/interp_numarray.py
@@ -1051,7 +1051,7 @@
def _reconstruct(space, w_subtype, w_shape, w_dtype):
return descr_new_array(space, w_subtype, w_shape, w_dtype)
- def build_scalar(space, w_dtype, w_state):
+def build_scalar(space, w_dtype, w_state):
from rpython.rtyper.lltypesystem import rffi, lltype
assert isinstance(w_dtype, interp_dtype.W_Dtype)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
