@@ -370,37 +370,29 @@ def test_today(self):
370
370
- ts_from_method_tz .tz_localize (None )) < delta )
371
371
372
372
def test_fields (self ):
373
+
374
+ def check (value , equal ):
375
+ # that we are int/long like
376
+ self .assertTrue (isinstance (value , (int , long )))
377
+ self .assertEqual (value , equal )
378
+
373
379
# GH 10050
374
380
ts = Timestamp ('2015-05-10 09:06:03.000100001' )
375
- self .assertEqual (ts .year , 2015 )
376
- self .assertTrue (isinstance (ts .year , int ))
377
- self .assertEqual (ts .month , 5 )
378
- self .assertTrue (isinstance (ts .month , int ))
379
- self .assertEqual (ts .day , 10 )
380
- self .assertTrue (isinstance (ts .day , int ))
381
- self .assertEqual (ts .hour , 9 )
382
- self .assertTrue (isinstance (ts .hour , int ))
383
- self .assertEqual (ts .minute , 6 )
384
- self .assertTrue (isinstance (ts .minute , int ))
385
- self .assertEqual (ts .second , 3 )
386
- self .assertTrue (isinstance (ts .second , int ))
381
+ check (ts .year , 2015 )
382
+ check (ts .month , 5 )
383
+ check (ts .day , 10 )
384
+ check (ts .hour , 9 )
385
+ check (ts .minute , 6 )
386
+ check (ts .second , 3 )
387
387
self .assertRaises (AttributeError , lambda : ts .millisecond )
388
- self .assertEqual (ts .microsecond , 100 )
389
- self .assertTrue (isinstance (ts .microsecond , int ))
390
- self .assertEqual (ts .nanosecond , 1 )
391
- self .assertTrue (isinstance (ts .nanosecond , int ))
392
- self .assertEqual (ts .dayofweek , 6 )
393
- self .assertTrue (isinstance (ts .dayofweek , int ))
394
- self .assertEqual (ts .quarter , 2 )
395
- self .assertTrue (isinstance (ts .quarter , int ))
396
- self .assertEqual (ts .dayofyear , 130 )
397
- self .assertTrue (isinstance (ts .dayofyear , int ))
398
- self .assertEqual (ts .week , 19 )
399
- self .assertTrue (isinstance (ts .week , int ))
400
- self .assertEqual (ts .daysinmonth , 31 )
401
- self .assertTrue (isinstance (ts .days_in_month , int ))
402
- self .assertEqual (ts .daysinmonth , 31 )
403
- self .assertTrue (isinstance (ts .daysinmonth , int ))
388
+ check (ts .microsecond , 100 )
389
+ check (ts .nanosecond , 1 )
390
+ check (ts .dayofweek , 6 )
391
+ check (ts .quarter , 2 )
392
+ check (ts .dayofyear , 130 )
393
+ check (ts .week , 19 )
394
+ check (ts .daysinmonth , 31 )
395
+ check (ts .daysinmonth , 31 )
404
396
405
397
def test_nat_fields (self ):
406
398
# GH 10050
0 commit comments