Skip to content

Commit

Permalink
ENH: support decimal option in PythonParser pandas-dev#12933
Browse files Browse the repository at this point in the history
closes pandas-dev#12933

Author: Camilo Cota <ccota@riplife.es>

Closes pandas-dev#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 pandas-dev#12933
  • Loading branch information
Camilo Cota authored and RahulHP committed May 27, 2016
1 parent ed726cd commit 1a73316
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions pandas/io/tests/parser/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -1285,6 +1285,7 @@ def test_euro_decimal_format(self):
self.assertEqual(df2['Number1'].dtype, float)
self.assertEqual(df2['Number2'].dtype, float)
self.assertEqual(df2['Number3'].dtype, float)
<<<<<<< HEAD

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

0 comments on commit 1a73316

Please sign in to comment.