Merge remote-tracking branch 'upstream/master' into public-data

pandas-dev · jreback · Nov 29, 2018 · Oct 30, 2018 · Nov 6, 2018 · Nov 11, 2018
commit fe813ffc15db7493e352830a43c083041121aed6
diff --git a/doc/source/whatsnew/v0.24.0.rst b/doc/source/whatsnew/v0.24.0.rst
@@ -24,6 +24,7 @@ New features
   the user to override the engine's default behavior to include or omit the
   dataframe's indexes from the resulting Parquet file. (:issue:`20768`)
 - :meth:`DataFrame.corr` and :meth:`Series.corr` now accept a callable for generic calculation methods of correlation, e.g. histogram intersection (:issue:`22684`)
+- :func:`DataFrame.to_string` now accepts ``decimal`` as an argument, allowing the user to specify which decimal separator should be used in the output. (:issue:`23614`)
 
 .. _whatsnew_0240.values_api:
 

diff --git a/pandas/core/indexes/base.py b/pandas/core/indexes/base.py
@@ -522,7 +522,7 @@ def _simple_new(cls, values, name=None, dtype=None, **kwargs):
                     values = cls(values, name=name, dtype=dtype,
                                  **kwargs)._ndarray_values
 
-        if isinstance(values, (ABCSeries, cls)):
+        if isinstance(values, (ABCSeries, ABCIndexClass)):
             # Index._data must always be an ndarray.
             # This is no-copy for when _values is an ndarray,
             # which should be always at this point.

diff --git a/pandas/tests/indexes/test_base.py b/pandas/tests/indexes/test_base.py
@@ -504,11 +504,12 @@ def test_constructor_cast(self):
         with pytest.raises(ValueError, match=msg):
             Index(["a", "b", "c"], dtype=float)
 
-    def test_constructor_unwraps_index(self):
-        a = pd.Index([True, False])
-        b = pd.Index(a)
-        expected = np.array([True, False], dtype=object)
-        tm.assert_numpy_array_equal(b._data, expected)
+    def test_constructor_unwraps_index(self, indices):
+        if isinstance(indices, pd.MultiIndex):
+            raise pytest.skip("MultiIndex has no ._data")
+        a = indices
+        b = type(a)(a)
+        tm.assert_equal(a._data, b._data)
 
     def test_view_with_args(self):