Skip to content

Commit 9e35bd6

Browse files
committed
CLN: skip without np 1.7
1 parent 02158e6 commit 9e35bd6

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

pandas/tseries/tests/test_offsets.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1698,6 +1698,8 @@ def test_Microsecond():
16981698

16991699

17001700
def test_NanosecondGeneric():
1701+
if _np_version_under1p7:
1702+
raise nose.SkipTest('numpy >= 1.7 required')
17011703
timestamp = Timestamp(datetime(2010, 1, 1))
17021704
assert timestamp.nanosecond == 0
17031705

pandas/tslib.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,7 @@ cdef class _Timestamp(datetime):
583583
if self.offset is None:
584584
raise ValueError("Cannot add integral value to Timestamp "
585585
"without offset.")
586-
return Timestamp(self.offset.__mul__(other).apply(self))
586+
return Timestamp((self.offset * other).apply(self))
587587

588588
if isinstance(other, timedelta) or hasattr(other, 'delta'):
589589
nanos = _delta_to_nanoseconds(other)

0 commit comments

Comments
 (0)