[pypy-commit] pypy str-dtype-improvement: whoops

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: str-dtype-improvement
Changeset: r62389:5c6294722df9
Date: 2013-03-17 17:56 +0200
http://bitbucket.org/pypy/pypy/changeset/5c6294722df9/

Log:	whoops

diff --git a/pypy/module/micronumpy/interp_ufuncs.py b/pypy/module/micronumpy/interp_ufuncs.py
--- a/pypy/module/micronumpy/interp_ufuncs.py
+++ b/pypy/module/micronumpy/interp_ufuncs.py
@@ -414,7 +414,7 @@
     if promote_to_float:
         return find_unaryop_result_dtype(space, dt2, promote_to_float=True)
     # If they're the same kind, choose the greater one.
-    if dt1.kind == dt2.kind and dt2.is_flexible_type():
+    if dt1.kind == dt2.kind and not dt2.is_flexible_type():
         return dt2
 
     # Everything promotes to float, and bool promotes to everything.