[browser2] add a combine filter
This commit is contained in:
parent
4924d6eb66
commit
f04c5a4ae9
1 changed files with 8 additions and 1 deletions
|
|
@ -302,7 +302,6 @@ class Date(DateTime):
|
||||||
if datetime is not None:
|
if datetime is not None:
|
||||||
return datetime.date
|
return datetime.date
|
||||||
|
|
||||||
|
|
||||||
class Time(Filter):
|
class Time(Filter):
|
||||||
klass = datetime.time
|
klass = datetime.time
|
||||||
regexp = re.compile(ur'(?P<hh>\d+):?(?P<mm>\d+)(:(?P<ss>\d+))?')
|
regexp = re.compile(ur'(?P<hh>\d+):?(?P<mm>\d+)(:(?P<ss>\d+))?')
|
||||||
|
|
@ -340,6 +339,14 @@ class MultiFilter(Filter):
|
||||||
raise NotImplementedError()
|
raise NotImplementedError()
|
||||||
|
|
||||||
|
|
||||||
|
class Combine(MultiFilter):
|
||||||
|
def __init__(self, date, time):
|
||||||
|
super(Combine, self).__init__(date, time)
|
||||||
|
|
||||||
|
def filter(self, values):
|
||||||
|
return datetime.datetime.combine(values[0], values[1])
|
||||||
|
|
||||||
|
|
||||||
class Format(MultiFilter):
|
class Format(MultiFilter):
|
||||||
def __init__(self, fmt, *args):
|
def __init__(self, fmt, *args):
|
||||||
super(Format, self).__init__(*args)
|
super(Format, self).__init__(*args)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue