[pypy-commit] pypy kill-someobject: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: kill-someobject
Changeset: r58075:d2ffb5175e87
Date: 2012-10-12 18:52 +0200
http://bitbucket.org/pypy/pypy/changeset/d2ffb5175e87/

Log:	merge heads

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
@@ -535,7 +535,8 @@
 @unwrap_spec(offset=int)
 def descr_new_array(space, w_subtype, w_shape, w_dtype=None, w_buffer=None,
                     offset=0, w_strides=None, w_order=None):
-    if (offset != 0 or space.is_none(w_strides) or not space.is_none(w_order) or
+    if (offset != 0 or not space.is_none(w_strides) or
+        not space.is_none(w_order) or
         not space.is_none(w_buffer)):
         raise OperationError(space.w_NotImplementedError,
                              space.wrap("unsupported param"))