Merge branch 'mixed_dtype_string_promotion' of https://github.com/dalejung/pandas into dalejung-mixed_dtype_string_promotion

Conflicts:
	doc/source/release.rst

Author: jreback

doc/source/release.rst

@@ -319,6 +319,8 @@ Bug Fixes
 - Bug in Makefile where it didn't remove Cython generated C files with ``make
   clean`` (:issue:`6768`)
 - Bug with numpy < 1.7.2 when reading long strings from ``HDFStore`` (:issue:`6166`)
+- Bug in ``DataFrame._reduce`` where non bool-like (0/1) integers were being
+  coverted into bools. (:issue:`6806`)
 
 pandas 0.13.1
 -------------

pandas/core/common.py

@@ -840,6 +840,9 @@ def conv(r, dtype):
             elif dtype == _TD_DTYPE:
                 r = _coerce_scalar_to_timedelta_type(r)
             elif dtype == np.bool_:
+                # messy. non 0/1 integers do not get converted.
+                if is_integer(r) and r not in [0,1]:
+                    return int(r)
                 r = bool(r)
             elif dtype.kind == 'f':
                 r = float(r)
@@ -850,7 +853,7 @@ def conv(r, dtype):
 
         return r
 
-    return np.array([conv(r, dtype) for r, dtype in zip(result, dtypes)])
+    return [conv(r, dtype) for r, dtype in zip(result, dtypes)]
 
 
 def _infer_dtype_from_scalar(val):

pandas/tests/test_frame.py

@@ -10476,6 +10476,18 @@ def test_bool_describe_in_mixed_frame(self):
         assert_almost_equal(bool_describe['mean'], 0.4)
         assert_almost_equal(bool_describe['50%'], 0)
 
+    def test_reduce_mixed_frame(self):
+        # GH 6806
+        df = DataFrame({
+            'bool_data': [True, True, False, False, False],
+            'int_data': [10, 20, 30, 40, 50],
+            'string_data': ['a', 'b', 'c', 'd', 'e'],
+        })
+        df.reindex(columns=['bool_data', 'int_data', 'string_data'])
+        test = df.sum(axis=0)
+        assert_almost_equal(test.values, [2, 150, 'abcde'])
+        assert_series_equal(test, df.T.sum(axis=1))
+
     def test_count(self):
         f = lambda s: notnull(s).sum()
         self._check_stat_op('count', f,