6
6
"""
7
7
8
8
from distutils .version import LooseVersion
9
- from datetime import datetime
9
+ from datetime import datetime , date
10
10
11
11
import pytest
12
12
import numpy as np
19
19
import pandas .util .testing as tm
20
20
21
21
import pandas .io .date_converters as conv
22
- from pandas import DataFrame , Series , Index , DatetimeIndex
22
+ from pandas import DataFrame , Series , Index , DatetimeIndex , MultiIndex
23
23
from pandas import compat
24
24
from pandas .compat import parse_date , StringIO , lrange
25
25
from pandas .compat .numpy import np_array_datetime64_compat
26
26
from pandas .io .parsers import read_table
27
27
from pandas .tseries .index import date_range
28
28
29
29
30
+
30
31
class ParseDatesTests (object ):
31
32
32
33
def test_separator_date_conflict (self ):
@@ -542,7 +543,7 @@ def test_parse_date_time(self):
542
543
"KORD,19990127, 23:00:00, 22:56:00, -0.5900" )
543
544
544
545
date_spec = {'nominal' : [1 , 2 ], 'actual' : [1 , 3 ]}
545
- df = read_csv (StringIO (data ), header = None , parse_dates = date_spec ,
546
+ df = self . read_csv (StringIO (data ), header = None , parse_dates = date_spec ,
546
547
date_parser = conv .parse_date_time )
547
548
548
549
def test_parse_date_fields (self ):
@@ -630,7 +631,7 @@ def date_parser(date, time):
630
631
date + 'T' + time + 'Z' , dtype = 'datetime64[s]' )
631
632
return datetime
632
633
633
-
634
+
634
635
df = self .read_csv (StringIO (data ), date_parser = date_parser ,
635
636
parse_dates = {'datetime' : ['date' , 'time' ]},
636
637
index_col = ['datetime' , 'prn' ])
@@ -656,4 +657,4 @@ def test_parse_date_column_with_empty_string(self):
656
657
[7 , '10/18/2008' ],
657
658
[621 , ' ' ]]
658
659
expected = DataFrame (expected_data , columns = ['case' , 'opdate' ])
659
- assert_frame_equal (result , expected )
660
+ tm . assert_frame_equal (result , expected )
0 commit comments