@@ -215,10 +215,10 @@ def func(*date_cols):
215
215
'actual' : [1 ,3 ]})
216
216
self .assert_ ('nominal' in df )
217
217
self .assert_ ('actual' in df )
218
- self .assert_ ('X.2 ' not in df )
219
- self .assert_ ('X.3 ' not in df )
220
- self .assert_ ('X.4 ' not in df )
221
- from datetime import datetime
218
+ self .assert_ ('X1 ' not in df )
219
+ self .assert_ ('X2 ' not in df )
220
+ self .assert_ ('X3 ' not in df )
221
+
222
222
d = datetime (1999 , 1 , 27 , 19 , 0 )
223
223
self .assert_ (df .ix [0 , 'nominal' ] == d )
224
224
@@ -229,9 +229,10 @@ def func(*date_cols):
229
229
keep_date_col = True )
230
230
self .assert_ ('nominal' in df )
231
231
self .assert_ ('actual' in df )
232
- self .assert_ ('X.2' in df )
233
- self .assert_ ('X.3' in df )
234
- self .assert_ ('X.4' in df )
232
+
233
+ self .assert_ ('X1' in df )
234
+ self .assert_ ('X2' in df )
235
+ self .assert_ ('X3' in df )
235
236
236
237
data = """\
237
238
KORD,19990127, 19:00:00, 18:56:00, 0.8100, 2.8100, 7.2000, 0.0000, 280.0000
@@ -243,22 +244,24 @@ def func(*date_cols):
243
244
"""
244
245
df = read_csv (StringIO (data ), header = None ,
245
246
parse_dates = [[1 , 2 ], [1 ,3 ]])
246
- self .assert_ ('X.2_X.3' in df )
247
- self .assert_ ('X.2_X.4' in df )
248
- self .assert_ ('X.2' not in df )
249
- self .assert_ ('X.3' not in df )
250
- self .assert_ ('X.4' not in df )
251
- from datetime import datetime
247
+
248
+ self .assert_ ('X1_X2' in df )
249
+ self .assert_ ('X1_X3' in df )
250
+ self .assert_ ('X1' not in df )
251
+ self .assert_ ('X2' not in df )
252
+ self .assert_ ('X3' not in df )
253
+
252
254
d = datetime (1999 , 1 , 27 , 19 , 0 )
253
- self .assert_ (df .ix [0 , 'X.2_X.3 ' ] == d )
255
+ self .assert_ (df .ix [0 , 'X1_X2 ' ] == d )
254
256
255
257
df = read_csv (StringIO (data ), header = None ,
256
258
parse_dates = [[1 , 2 ], [1 ,3 ]], keep_date_col = True )
257
- self .assert_ ('X.2_X.3' in df )
258
- self .assert_ ('X.2_X.4' in df )
259
- self .assert_ ('X.2' in df )
260
- self .assert_ ('X.3' in df )
261
- self .assert_ ('X.4' in df )
259
+
260
+ self .assert_ ('X1_X2' in df )
261
+ self .assert_ ('X1_X3' in df )
262
+ self .assert_ ('X1' in df )
263
+ self .assert_ ('X2' in df )
264
+ self .assert_ ('X3' in df )
262
265
263
266
data = '''\
264
267
KORD,19990127 19:00:00, 18:56:00, 0.8100, 2.8100, 7.2000, 0.0000, 280.0000
@@ -269,7 +272,6 @@ def func(*date_cols):
269
272
'''
270
273
df = read_csv (StringIO (data ), sep = ',' , header = None ,
271
274
parse_dates = [1 ], index_col = 1 )
272
- from datetime import datetime
273
275
d = datetime (1999 , 1 , 27 , 19 , 0 )
274
276
self .assert_ (df .index [0 ] == d )
275
277
@@ -561,7 +563,7 @@ def test_skiprows_bug(self):
561
563
index_col = 0 , parse_dates = True )
562
564
563
565
expected = DataFrame (np .arange (1. , 10. ).reshape ((3 ,3 )),
564
- columns = ['X.2 ' , 'X.3 ' , 'X.4 ' ],
566
+ columns = ['X1 ' , 'X2 ' , 'X3 ' ],
565
567
index = [datetime (2000 , 1 , 1 ), datetime (2000 , 1 , 2 ),
566
568
datetime (2000 , 1 , 3 )])
567
569
assert_frame_equal (data , expected )
@@ -706,7 +708,7 @@ def test_no_header(self):
706
708
assert_almost_equal (df .values , expected )
707
709
assert_almost_equal (df .values , df2 .values )
708
710
self .assert_ (np .array_equal (df .columns ,
709
- ['X.1 ' , 'X.2 ' , 'X.3 ' , 'X.4 ' , 'X.5 ' ]))
711
+ ['X0 ' , 'X1 ' , 'X2 ' , 'X3 ' , 'X4 ' ]))
710
712
self .assert_ (np .array_equal (df2 .columns , names ))
711
713
712
714
def test_header_with_index_col (self ):
@@ -848,7 +850,7 @@ def test_parse_cols_list(self):
848
850
def test_read_table_unicode (self ):
849
851
fin = StringIO ('\u0141 aski, Jan;1' )
850
852
df1 = read_table (fin , sep = ";" , encoding = "utf-8" , header = None )
851
- self .assert_ (isinstance (df1 ['X.1 ' ].values [0 ], unicode ))
853
+ self .assert_ (isinstance (df1 ['X0 ' ].values [0 ], unicode ))
852
854
853
855
def test_read_table_wrong_num_columns (self ):
854
856
data = """A,B,C,D,E,F
@@ -1286,8 +1288,8 @@ def test_read_csv_parse_simple_list(self):
1286
1288
foo
1287
1289
bar"""
1288
1290
df = read_csv (StringIO (text ), header = None )
1289
- expected = DataFrame ({'X.1 ' : ['foo' , 'bar baz' , 'qux foo' ,
1290
- 'foo' , 'bar' ]})
1291
+ expected = DataFrame ({'X0 ' : ['foo' , 'bar baz' , 'qux foo' ,
1292
+ 'foo' , 'bar' ]})
1291
1293
assert_frame_equal (df , expected )
1292
1294
1293
1295
def test_parse_dates_custom_euroformat (self ):
0 commit comments