Skip to content

Commit 4650f48

Browse files
committed
revert change that shouldn't be part of this pull request
1 parent 02e9ab8 commit 4650f48

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

neo/core/epoch.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
'''
77

88
from copy import deepcopy, copy
9-
from numbers import Number
109

1110
import numpy as np
1211
import quantities as pq
@@ -89,10 +88,8 @@ def __new__(cls, times=None, durations=None, labels=None, units=None, name=None,
8988
raise ValueError("Times array has more than 1 dimension")
9089
if isinstance(durations, (list, tuple)):
9190
durations = np.array(durations)
92-
elif durations is None:
91+
if durations is None:
9392
durations = np.array([]) * pq.s
94-
elif isinstance(durations, Number):
95-
durations = durations * np.ones(times.shape)
9693
elif durations.size != times.size:
9794
if durations.size == 1:
9895
durations = durations * np.ones_like(times.magnitude)

0 commit comments

Comments
 (0)