[pypy-commit] pypy python-numpy: fix merge

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: python-numpy
Changeset: r58290:a75d4ab09850
Date: 2012-10-20 22:42 +0200
http://bitbucket.org/pypy/pypy/changeset/a75d4ab09850/

Log:	fix 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
@@ -784,7 +784,41 @@
     real = GetSetProperty(W_NDimArray.descr_get_real),
     imag = GetSetProperty(W_NDimArray.descr_get_imag),
 
-    __array_interface__ = GetSetProperty(W_NDimArray.descr_array_iface),
+    argsort = interp2app(W_NDimArray.descr_argsort),
+    astype = interp2app(W_NDimArray.descr_astype),
+    base = GetSetProperty(W_NDimArray.descr_base),
+    byteswap = interp2app(W_NDimArray.descr_byteswap),
+    choose = interp2app(W_NDimArray.descr_choose),
+    clip = interp2app(W_NDimArray.descr_clip),
+    conj = interp2app(W_NDimArray.descr_conj),
+    conjugate = interp2app(W_NDimArray.descr_conj),
+    ctypes = GetSetProperty(W_NDimArray.descr_ctypes),
+    cumprod = interp2app(W_NDimArray.descr_cumprod),
+    cumsum = interp2app(W_NDimArray.descr_cumsum),
+    data = GetSetProperty(W_NDimArray.descr_data),
+    diagonal = interp2app(W_NDimArray.descr_diagonal),
+    dump = interp2app(W_NDimArray.descr_dump),
+    dumps = interp2app(W_NDimArray.descr_dumps),
+    flags = GetSetProperty(W_NDimArray.descr_get_flags,
+                           W_NDimArray.descr_set_flags),
+    getfield = interp2app(W_NDimArray.descr_getfield),
+    itemset = interp2app(W_NDimArray.descr_itemset),
+    newbyteorder = interp2app(W_NDimArray.descr_newbyteorder),
+    ptp = interp2app(W_NDimArray.descr_ptp),
+    put = interp2app(W_NDimArray.descr_put),
+    resize = interp2app(W_NDimArray.descr_resize),
+    round = interp2app(W_NDimArray.descr_round),
+    searchsorted = interp2app(W_NDimArray.descr_searchsorted),
+    setasflat = interp2app(W_NDimArray.descr_setasflat),
+    setfield = interp2app(W_NDimArray.descr_setfield),
+    setflags = interp2app(W_NDimArray.descr_setflags),
+    sort = interp2app(W_NDimArray.descr_sort),
+    squeeze = interp2app(W_NDimArray.descr_squeeze),
+    strides = GetSetProperty(W_NDimArray.descr_strides),
+    tofile = interp2app(W_NDimArray.descr_tofile),
+    trace = interp2app(W_NDimArray.descr_trace),
+    view = interp2app(W_NDimArray.descr_view),
+   __array_interface__ = GetSetProperty(W_NDimArray.descr_array_iface),
 )
 
 @unwrap_spec(ndmin=int, copy=bool, subok=bool)
@@ -855,42 +889,6 @@
     return space.wrap(arr)
 
 
-    argsort = interp2app(BaseArray.descr_argsort),
-    astype = interp2app(BaseArray.descr_astype),
-    base = GetSetProperty(BaseArray.descr_base),
-    byteswap = interp2app(BaseArray.descr_byteswap),
-    choose = interp2app(BaseArray.descr_choose),
-    clip = interp2app(BaseArray.descr_clip),
-    conj = interp2app(BaseArray.descr_conj),
-    conjugate = interp2app(BaseArray.descr_conj),
-    ctypes = GetSetProperty(BaseArray.descr_ctypes),
-    cumprod = interp2app(BaseArray.descr_cumprod),
-    cumsum = interp2app(BaseArray.descr_cumsum),
-    data = GetSetProperty(BaseArray.descr_data),
-    diagonal = interp2app(BaseArray.descr_diagonal),
-    dump = interp2app(BaseArray.descr_dump),
-    dumps = interp2app(BaseArray.descr_dumps),
-    flags = GetSetProperty(BaseArray.descr_get_flags,
-                           BaseArray.descr_set_flags),
-    getfield = interp2app(BaseArray.descr_getfield),
-    imag = GetSetProperty(BaseArray.descr_imag),
-    itemset = interp2app(BaseArray.descr_itemset),
-    newbyteorder = interp2app(BaseArray.descr_newbyteorder),
-    ptp = interp2app(BaseArray.descr_ptp),
-    put = interp2app(BaseArray.descr_put),
-    real = GetSetProperty(BaseArray.descr_real),
-    resize = interp2app(BaseArray.descr_resize),
-    round = interp2app(BaseArray.descr_round),
-    searchsorted = interp2app(BaseArray.descr_searchsorted),
-    setasflat = interp2app(BaseArray.descr_setasflat),
-    setfield = interp2app(BaseArray.descr_setfield),
-    setflags = interp2app(BaseArray.descr_setflags),
-    sort = interp2app(BaseArray.descr_sort),
-    squeeze = interp2app(BaseArray.descr_squeeze),
-    strides = GetSetProperty(BaseArray.descr_strides),
-    tofile = interp2app(BaseArray.descr_tofile),
-    trace = interp2app(BaseArray.descr_trace),
-    view = interp2app(BaseArray.descr_view),
 W_FlatIterator.typedef = TypeDef(
     'flatiter',
     __iter__ = interp2app(W_FlatIterator.descr_iter),