Skip to content

Commit c06a662

Browse files
committed
added 'test_concat_date_col_fail' test
1 parent 43dffec commit c06a662

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

pandas/_libs/tslibs/parsing.pyx

-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ _DEFAULT_DATETIME = datetime(1, 1, 1).replace(hour=0, minute=0,
5858
cdef:
5959
set _not_datelike_strings = {'a', 'A', 'm', 'M', 'p', 'P', 't', 'T'}
6060

61-
set _not_datelike_strings = {'a', 'A', 'm', 'M', 'p', 'P', 't', 'T'}
62-
6361
# ----------------------------------------------------------------------
6462
cdef:
6563
const char* delimiters = " /-."

pandas/tests/io/parser/test_parse_dates.py

+13-2
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,11 @@
1919
from pandas.compat.numpy import np_array_datetime64_compat
2020

2121
import pandas as pd
22-
from pandas import DataFrame, DatetimeIndex, Index, MultiIndex
22+
from pandas import DataFrame, DatetimeIndex, Index, MultiIndex, Series
2323
from pandas.core.indexes.datetimes import date_range
2424
import pandas.util.testing as tm
2525

2626
import pandas.io.date_converters as conv
27-
import pandas.io.parsers as parsers
2827

2928
# constant
3029
_DEFAULT_DATETIME = datetime(1, 1, 1)
@@ -117,6 +116,18 @@ def date_parser(*date_cols):
117116
tm.assert_frame_equal(result, expected)
118117

119118

119+
@pytest.mark.parametrize("container", [list, tuple, Index, Series])
120+
@pytest.mark.parametrize("dim", [1, 2])
121+
def test_concat_date_col_fail(container, dim):
122+
msg = "not all elements from date_cols are numpy arrays"
123+
value = "19990127"
124+
125+
date_cols = tuple(container([value]) for _ in range(dim))
126+
127+
with pytest.raises(ValueError, match=msg):
128+
parsing._concat_date_cols(date_cols)
129+
130+
120131
@pytest.mark.parametrize("keep_date_col", [True, False])
121132
def test_multiple_date_col(all_parsers, keep_date_col):
122133
data = """\

0 commit comments

Comments
 (0)