Skip to content

Commit 1a73316

Browse files
Camilo CotaRahulHP
Camilo Cota
authored andcommitted
ENH: support decimal option in PythonParser #12933
closes #12933 Author: Camilo Cota <[email protected]> Closes #13189 from camilocot/12933 and squashes the following commits: 465272e [Camilo Cota] Benchmark decimal option in read_csv for c engine 9f42d0c [Camilo Cota] double backticks around decimal and engine='python' dc8ca62 [Camilo Cota] fix test_empty_decimal_marker comment 49613fe [Camilo Cota] Assert read_csv error message in test_empty_decimal_marker d821052 [Camilo Cota] fix test_empty_decimal_marker comment f71509d [Camilo Cota] Include descritive what's new line 803356e [Camilo Cota] set nonnum regex in init method 1472d80 [Camilo Cota] Include the issue number in what's new b560fda [Camilo Cota] Fix what's new dc7acd1 [Camilo Cota] ENH: support decimal option in PythonParser #12933
1 parent ed726cd commit 1a73316

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

pandas/io/tests/parser/common.py

+3
Original file line numberDiff line numberDiff line change
@@ -1285,6 +1285,7 @@ def test_euro_decimal_format(self):
12851285
self.assertEqual(df2['Number1'].dtype, float)
12861286
self.assertEqual(df2['Number2'].dtype, float)
12871287
self.assertEqual(df2['Number3'].dtype, float)
1288+
<<<<<<< HEAD
12881289

12891290
def test_read_duplicate_names(self):
12901291
# See gh-7160
@@ -1323,3 +1324,5 @@ def test_inf_parsing(self):
13231324
# TODO: remove condition when 'na_filter' is supported for Python
13241325
df = self.read_csv(StringIO(data), index_col=0, na_filter=False)
13251326
tm.assert_almost_equal(df['A'].values, expected.values)
1327+
=======
1328+
>>>>>>> ENH: support decimal option in PythonParser #12933

0 commit comments

Comments
 (0)