fix conflict

Author: charlesdong1991

doc/source/whatsnew/v0.24.1.rst

@@ -22,7 +22,7 @@ Fixed Regressions
 
 - Bug in :meth:`DataFrame.itertuples` with ``records`` orient raising an ``AttributeError`` when the ``DataFrame`` contained more than 255 columns (:issue:`24939`)
 - Bug in :meth:`DataFrame.itertuples` orient converting integer column names to strings prepended with an underscore (:issue:`24940`)
-- Fixed regression in :class:`Index.intersection` incorrectly sorting the values by default (:issue:`24959`).
+- Bug in :meth:`to_string` with ``index`` set to ``False``, leading space is added. (:issue:`24980`)
 
 .. _whatsnew_0241.enhancements:
 

pandas/core/generic.py

@@ -2834,9 +2834,9 @@ def to_latex(self, buf=None, columns=None, col_space=None, header=True,
         ...                    'mask': ['red', 'purple'],
         ...                    'weapon': ['sai', 'bo staff']})
         >>> df.to_latex(index=False) # doctest: +NORMALIZE_WHITESPACE
-        '\\begin{tabular}{lll}\n\\toprule\n      name &    mask &    weapon
-        \\\\\n\\midrule\n   Raphael &     red &       sai \\\\\n Donatello &
-         purple &  bo staff \\\\\n\\bottomrule\n\\end{tabular}\n'
+        '\\begin{tabular}{lll}\n\\toprule\n     name &   mask &   weapon
+        \\\\\n\\midrule\n  Raphael &    red &      sai \\\\\nDonatello &
+        purple & bo staff \\\\\n\\bottomrule\n\\end{tabular}\n'
         """
         # Get defaults from the pandas config
         if self.ndim == 1:

pandas/io/formats/format.py

@@ -252,8 +252,15 @@ def _get_formatted_index(self):
 
     def _get_formatted_values(self):
         values_to_format = self.tr_series._formatting_values()
+
+        if self.index:
+            leading_space = None
+        else:
+            leading_space = False
         return format_array(values_to_format, None,
-                            float_format=self.float_format, na_rep=self.na_rep)
+                            float_format=self.float_format,
+                            na_rep=self.na_rep,
+                            leading_space=leading_space)
 
     def to_string(self):
         series = self.tr_series
@@ -703,9 +710,15 @@ def _format_col(self, i):
         frame = self.tr_frame
         formatter = self._get_formatter(i)
         values_to_format = frame.iloc[:, i]._formatting_values()
+
+        if self.index:
+            leading_space = None
+        else:
+            leading_space = False
         return format_array(values_to_format, formatter,
                             float_format=self.float_format, na_rep=self.na_rep,
-                            space=self.col_space, decimal=self.decimal)
+                            space=self.col_space, decimal=self.decimal,
+                            leading_space=leading_space)
 
     def to_html(self, classes=None, notebook=False, border=None):
         """
@@ -1080,7 +1093,11 @@ def format_values_with(float_format):
         # The default is otherwise to use str instead of a formatting string
         if self.float_format is None:
             if self.fixed_width:
-                float_format = partial('{value: .{digits:d}f}'.format,
+                if self.leading_space is not False:
+                    fmt_str = '{value: .{digits:d}f}'
+                else:
+                    fmt_str = '{value:.{digits:d}f}'
+                float_format = partial(fmt_str.format,
                                        digits=self.digits)
             else:
                 float_format = self.float_format
@@ -1112,7 +1129,11 @@ def format_values_with(float_format):
                                 (abs_vals > 0)).any()
 
         if has_small_values or (too_long and has_large_values):
-            float_format = partial('{value: .{digits:d}e}'.format,
+            if self.leading_space is not False:
+                fmt_str = '{value: .{digits:d}e}'
+            else:
+                fmt_str = '{value:.{digits:d}e}'
+            float_format = partial(fmt_str.format,
                                    digits=self.digits)
             formatted_values = format_values_with(float_format)
 
@@ -1129,7 +1150,12 @@ def _format_strings(self):
 class IntArrayFormatter(GenericArrayFormatter):
 
     def _format_strings(self):
-        formatter = self.formatter or (lambda x: '{x: d}'.format(x=x))
+        if self.leading_space is False:
+            fmt_str = '{x:d}'
+        else:
+            fmt_str = '{x: d}'
+        formatter = self.formatter or (lambda x: fmt_str.format(x=x))
+#        formatter = self.formatter or (lambda x: '{x: d}'.format(x=x))
         fmt_values = [formatter(x) for x in self.values]
         return fmt_values
 

pandas/tests/io/formats/test_format.py

@@ -1291,15 +1291,15 @@ def test_to_string_no_index(self):
 
         df_s = df.to_string(index=False)
         # Leading space is expected for positive numbers.
-        expected = ("  x   y    z\n"
-                    " 11  33  AAA\n"
-                    " 22 -44     ")
+        expected = (" x   y   z\n"
+                    "11  33 AAA\n"
+                    "22 -44    ")
         assert df_s == expected
 
         df_s = df[['y', 'x', 'z']].to_string(index=False)
-        expected = ("  y   x    z\n"
-                    " 33  11  AAA\n"
-                    "-44  22     ")
+        expected = ("  y  x   z\n"
+                    " 33 11 AAA\n"
+                    "-44 22    ")
         assert df_s == expected
 
     def test_to_string_line_width_no_index(self):
@@ -1314,7 +1314,7 @@ def test_to_string_line_width_no_index(self):
         df = DataFrame({'x': [11, 22, 33], 'y': [4, 5, 6]})
 
         df_s = df.to_string(line_width=1, index=False)
-        expected = "  x  \\\n 11   \n 22   \n 33   \n\n y  \n 4  \n 5  \n 6  "
+        expected = " x  \\\n11   \n22   \n33   \n\n y  \n 4  \n 5  \n 6  "
 
         assert df_s == expected
 
@@ -1887,7 +1887,7 @@ def test_to_string_without_index(self):
         # GH 11729 Test index=False option
         s = Series([1, 2, 3, 4])
         result = s.to_string(index=False)
-        expected = (u(' 1\n') + ' 2\n' + ' 3\n' + ' 4')
+        expected = (u('1\n') + '2\n' + '3\n' + '4')
         assert result == expected
 
     def test_unicode_name_in_footer(self):
@@ -2777,3 +2777,28 @@ def test_format_percentiles():
         fmt.format_percentiles([2, 0.1, 0.5])
     with pytest.raises(ValueError, match=msg):
         fmt.format_percentiles([0.1, 0.5, 'a'])
+
+
+@pytest.mark.parametrize("input_array, expected", [
+    ("a", "a"),
+    (["a", "b"], "a\nb"),
+    ([1, "a"], "1\na"),
+    (1, "1"),
+    ([0, -1], " 0\n-1"),
+    (1.0, '1.0')
+])
+def test_format_remove_leading_space_series(input_array, expected):
+    # GH: 24980
+    s = pd.Series(input_array).to_string(index=False)
+    assert s == expected
+
+
+@pytest.mark.parametrize("input_array, expected", [
+    ({"A": ["a"]}, "A\na"),
+    ({"A": ["a", "b"], "B": ["c", "dd"]}, "A  B\na  c\nb dd"),
+    ({"A": ["a", 1], "B": ["aa", 1]}, "A  B\na aa\n1  1")
+])
+def test_format_remove_leading_space_dataframe(input_array, expected):
+    # GH: 24980
+    df = pd.DataFrame(input_array).to_string(index=False)
+    assert df == expected

pandas/tests/io/formats/test_to_latex.py

@@ -64,10 +64,10 @@ def test_to_latex(self, frame):
         withoutindex_result = df.to_latex(index=False)
         withoutindex_expected = r"""\begin{tabular}{rl}
 \toprule
- a &   b \\
+ a &  b \\
 \midrule
- 1 &  b1 \\
- 2 &  b2 \\
+ 1 & b1 \\
+ 2 & b2 \\
 \bottomrule
 \end{tabular}
 """
@@ -423,7 +423,7 @@ def test_to_latex_longtable(self, frame):
         withoutindex_result = df.to_latex(index=False, longtable=True)
         withoutindex_expected = r"""\begin{longtable}{rl}
 \toprule
- a &   b \\
+ a &  b \\
 \midrule
 \endhead
 \midrule
@@ -433,8 +433,8 @@ def test_to_latex_longtable(self, frame):
 
 \bottomrule
 \endlastfoot
- 1 &  b1 \\
- 2 &  b2 \\
+ 1 & b1 \\
+ 2 & b2 \\
 \end{longtable}
 """
 
@@ -490,8 +490,8 @@ def test_to_latex_no_header(self):
         withoutindex_result = df.to_latex(index=False, header=False)
         withoutindex_expected = r"""\begin{tabular}{rl}
 \toprule
- 1 &  b1 \\
- 2 &  b2 \\
+1 & b1 \\
+2 & b2 \\
 \bottomrule
 \end{tabular}
 """
@@ -517,10 +517,10 @@ def test_to_latex_specified_header(self):
         withoutindex_result = df.to_latex(header=['AA', 'BB'], index=False)
         withoutindex_expected = r"""\begin{tabular}{rl}
 \toprule
-AA &  BB \\
+AA & BB \\
 \midrule
- 1 &  b1 \\
- 2 &  b2 \\
+ 1 & b1 \\
+ 2 & b2 \\
 \bottomrule
 \end{tabular}
 """