merge branche "@"

sat/tools/common/date_utils.py

@@ -25,6 +25,7 @@ import datetime
 from dateutil import tz, parser
 from dateutil.relativedelta import relativedelta
 from dateutil.utils import default_tzinfo
+from dateutil.parser import ParserError
 from babel import dates
 import calendar
 import time
@@ -64,9 +65,15 @@ def date_parse(value, default_tz=TZ_UTC):
     value = str(value).strip()
     dayfirst = False if YEAR_FIRST_RE.match(value) else True
 
-    dt = default_tzinfo(
-        parser.parse(value, default=DEFAULT_DATETIME, dayfirst=dayfirst),
-        default_tz)
+    try:
+        dt = default_tzinfo(
+            parser.parse(value, default=DEFAULT_DATETIME, dayfirst=dayfirst),
+            default_tz)
+    except ParserError as e:
+        if value == "now":
+            dt = datetime.datetime.now(tz.tzutc())
+        else:
+            raise e
     return calendar.timegm(dt.utctimetuple())
 
 def date_parse_ext(value, default_tz=TZ_UTC):