Imported read_table and using self.readcsv · mattip/pandas@e019e95 (original) (raw)

`@@ -22,10 +22,10 @@

`

22

22

`from pandas import DataFrame, Series, Index, DatetimeIndex

`

23

23

`from pandas import compat

`

24

24

`from pandas.compat import parse_date, StringIO, lrange

`

``

25

`+

from pandas.compat.numpy import np_array_datetime64_compat

`

``

26

`+

from pandas.io.parsers import read_table

`

25

27

`from pandas.tseries.index import date_range

`

26

28

``

27

``

`-

from pandas.io.parsers import read_table

`

28

``

`-

from pandas.compat.numpy import np_array_datetime64_compat

`

29

29

``

30

30

`class ParseDatesTests(object):

`

31

31

``

`@@ -617,7 +617,7 @@ def test_generic(self):

`

617

617

`self.assertEqual(df.ym.loc[0], date(2001, 1, 1))

`

618

618

``

619

619

`def test_dateparser_resolution_if_not_ns(self):

`

620

``

`-

issue 10245

`

``

620

`+

GH 10245

`

621

621

`data = """\

`

622

622

`date,time,prn,rxstatus

`

623

623

`2013-11-03,19:00:00,126,00E80000

`

`@@ -630,7 +630,8 @@ def date_parser(date, time):

`

630

630

`date + 'T' + time + 'Z', dtype='datetime64[s]')

`

631

631

`return datetime

`

632

632

``

633

``

`-

df = read_csv(StringIO(data), date_parser=date_parser,

`

``

633

+

``

634

`+

df = self.read_csv(StringIO(data), date_parser=date_parser,

`

634

635

`parse_dates={'datetime': ['date', 'time']},

`

635

636

`index_col=['datetime', 'prn'])

`

636

637

``

`@@ -650,7 +651,7 @@ def test_parse_date_column_with_empty_string(self):

`

650

651

` 7,10/18/2006

`

651

652

` 7,10/18/2008

`

652

653

` 621, """

`

653

``

`-

result = read_csv(StringIO(data), parse_dates=['opdate'])

`

``

654

`+

result = self.read_csv(StringIO(data), parse_dates=['opdate'])

`

654

655

`expected_data = [[7, '10/18/2006'],

`

655

656

` [7, '10/18/2008'],

`

656

657

` [621, ' ']]

`