Skip to content

Commit 2bab718

Browse files
committed
TST: windows tests for allow for int/long #10050
1 parent 91ddf3c commit 2bab718

File tree

2 files changed

+35
-39
lines changed

2 files changed

+35
-39
lines changed

pandas/tseries/tests/test_timedeltas.py

+15-11
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,10 @@ class Other:
309309

310310
def test_fields(self):
311311

312+
def check(value):
313+
# that we are int/long like
314+
self.assertTrue(isinstance(value, (int, long)))
315+
312316
# compat to datetime.timedelta
313317
rng = to_timedelta('1 days, 10:11:12')
314318
self.assertEqual(rng.days, 1)
@@ -321,10 +325,10 @@ def test_fields(self):
321325
self.assertRaises(AttributeError, lambda : rng.milliseconds)
322326

323327
# GH 10050
324-
self.assertTrue(isinstance(rng.days, int))
325-
self.assertTrue(isinstance(rng.seconds, int))
326-
self.assertTrue(isinstance(rng.microseconds, int))
327-
self.assertTrue(isinstance(rng.nanoseconds, int))
328+
check(rng.days)
329+
check(rng.seconds)
330+
check(rng.microseconds)
331+
check(rng.nanoseconds)
328332

329333
td = Timedelta('-1 days, 10:11:12')
330334
self.assertEqual(abs(td), Timedelta('13:48:48'))
@@ -353,13 +357,13 @@ def test_fields(self):
353357
self.assertEqual(tup.nanoseconds, 0)
354358

355359
# GH 10050
356-
self.assertTrue(isinstance(tup.days, int))
357-
self.assertTrue(isinstance(tup.hours, int))
358-
self.assertTrue(isinstance(tup.minutes, int))
359-
self.assertTrue(isinstance(tup.seconds, int))
360-
self.assertTrue(isinstance(tup.milliseconds, int))
361-
self.assertTrue(isinstance(tup.microseconds, int))
362-
self.assertTrue(isinstance(tup.nanoseconds, int))
360+
check(tup.days)
361+
check(tup.hours)
362+
check(tup.minutes)
363+
check(tup.seconds)
364+
check(tup.milliseconds)
365+
check(tup.microseconds)
366+
check(tup.nanoseconds)
363367

364368
tup = Timedelta('-1 days 1 us').components
365369
self.assertEqual(tup.days, -2)

pandas/tseries/tests/test_tslib.py

+20-28
Original file line numberDiff line numberDiff line change
@@ -370,37 +370,29 @@ def test_today(self):
370370
- ts_from_method_tz.tz_localize(None)) < delta)
371371

372372
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+
373379
# GH 10050
374380
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)
387387
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)
404396

405397
def test_nat_fields(self):
406398
# GH 10050

0 commit comments

Comments
 (0)