@@ -193,20 +193,18 @@ def test_getitem_seconds(self):
193
193
"2013/02/01 9H" ,
194
194
"2013/02/01 09:00" ,
195
195
]
196
- for v in values :
196
+ for val in values :
197
197
# GH7116
198
198
# these show deprecations as we are trying
199
199
# to slice with non-integer indexers
200
- # FIXME: don't leave commented-out
201
- # with pytest.raises(IndexError):
202
- # idx[v]
203
- continue
200
+ with pytest .raises (IndexError , match = "only integers, slices" ):
201
+ idx [val ]
204
202
205
- s = Series (np .random .rand (len (idx )), index = idx )
206
- tm .assert_series_equal (s ["2013/01/01 10:00" ], s [3600 :3660 ])
207
- tm .assert_series_equal (s ["2013/01/01 9H" ], s [:3600 ])
203
+ ser = Series (np .random .rand (len (idx )), index = idx )
204
+ tm .assert_series_equal (ser ["2013/01/01 10:00" ], ser [3600 :3660 ])
205
+ tm .assert_series_equal (ser ["2013/01/01 9H" ], ser [:3600 ])
208
206
for d in ["2013/01/01" , "2013/01" , "2013" ]:
209
- tm .assert_series_equal (s [d ], s )
207
+ tm .assert_series_equal (ser [d ], ser )
210
208
211
209
def test_getitem_day (self ):
212
210
# GH#6716
@@ -223,24 +221,23 @@ def test_getitem_day(self):
223
221
"2013/02/01 9H" ,
224
222
"2013/02/01 09:00" ,
225
223
]
226
- for v in values :
224
+ for val in values :
227
225
228
226
# GH7116
229
227
# these show deprecations as we are trying
230
228
# to slice with non-integer indexers
231
- # with pytest.raises(IndexError):
232
- # idx[v]
233
- continue
229
+ with pytest .raises (IndexError , match = "only integers, slices" ):
230
+ idx [val ]
234
231
235
- s = Series (np .random .rand (len (idx )), index = idx )
236
- tm .assert_series_equal (s ["2013/01" ], s [0 :31 ])
237
- tm .assert_series_equal (s ["2013/02" ], s [31 :59 ])
238
- tm .assert_series_equal (s ["2014" ], s [365 :])
232
+ ser = Series (np .random .rand (len (idx )), index = idx )
233
+ tm .assert_series_equal (ser ["2013/01" ], ser [0 :31 ])
234
+ tm .assert_series_equal (ser ["2013/02" ], ser [31 :59 ])
235
+ tm .assert_series_equal (ser ["2014" ], ser [365 :])
239
236
240
237
invalid = ["2013/02/01 9H" , "2013/02/01 09:00" ]
241
- for v in invalid :
242
- with pytest .raises (KeyError , match = v ):
243
- s [ v ]
238
+ for val in invalid :
239
+ with pytest .raises (KeyError , match = val ):
240
+ ser [ val ]
244
241
245
242
246
243
class TestGetLoc :
0 commit comments