1.1 --- a/vRecurrence.py Sun Dec 03 19:19:14 2017 +0100
1.2 +++ b/vRecurrence.py Sun Dec 03 19:50:50 2017 +0100
1.3 @@ -955,7 +955,22 @@
1.4 self.args["interval"] = interval
1.5 self.update_step()
1.6
1.7 -class WeekDayFilter(Selector):
1.8 +class Enum(Selector):
1.9 +
1.10 + "A generic value selector."
1.11 +
1.12 + def __init__(self, level, args, qualifier, selecting=None, first=False):
1.13 + Selector.__init__(self, level, args, qualifier, selecting, first)
1.14 + self.step = scale(1, level)
1.15 +
1.16 + def materialise_items(self, context, start, end, inclusive=False):
1.17 + return EnumIterator(self, context, start, end, inclusive, self.step,
1.18 + self.get_values())
1.19 +
1.20 + def get_values(self, limit=None):
1.21 + return sort_values(self.args["values"], limit)
1.22 +
1.23 +class WeekDayFilter(Enum):
1.24
1.25 "A selector of instances specified in terms of day numbers."
1.26
1.27 @@ -1007,21 +1022,6 @@
1.28 values.append(value)
1.29 return values
1.30
1.31 -class Enum(Selector):
1.32 -
1.33 - "A generic value selector."
1.34 -
1.35 - def __init__(self, level, args, qualifier, selecting=None, first=False):
1.36 - Selector.__init__(self, level, args, qualifier, selecting, first)
1.37 - self.step = scale(1, level)
1.38 -
1.39 - def materialise_items(self, context, start, end, inclusive=False):
1.40 - return EnumIterator(self, context, start, end, inclusive, self.step,
1.41 - self.get_values())
1.42 -
1.43 - def get_values(self, limit=None):
1.44 - return sort_values(self.args["values"], limit)
1.45 -
1.46 class MonthDayFilter(Enum):
1.47
1.48 "A selector of month days."