Changeset 24:3501b870f565 in stamper

Timestamp:

Jul 26, 2014, 6:18:22 PM (10 years ago)

Author:

Borja Lopez <borja@…>

Branch:

default

Phase:

public

Message:

Fixed the date-range validator, so date ranges YYYY-MM-DD--YYYY-MM-DD
are identified as valid filters.
Replaced -YYYY-MM-DD with _YYYY-MM-DD to prevent conflicts with argparse

File:

• stamper/stamper.py (modified) (2 diffs)

stamper/stamper.py

@@ -61 +61 @@
         - %Y-%m-%d--%Y-%m-%d: Times recorded between two dates
 
-        - -%Y-%m-%d: Times recorded before a given date
+        - _%Y-%m-%d: Times recorded before a given date
 
         - +%Y-%m-%d: Times recorded after a given date
@@ -68 +68 @@
         """
         # First try the date filters, one by one
-        matches = ['%Y-%m-%d', '-%Y-%m-%d', '+%Y-%m-%d']
+        matches = ['%Y-%m-%d', '_%Y-%m-%d', '+%Y-%m-%d']
         for match in matches:
             try:
                 if '--' in stamp_filter:
                     filter_from, filter_to = stamp_filter.split('--')
-                    filter_from = datetime.strptime(stamp_filter, match)
-                    filter_to = datetime.strptime(stamp_filter, match)
+                    filter_from = datetime.strptime(filter_from, match)
+                    filter_to = datetime.strptime(filter_to, match)
                 else:
                     valid_filter = datetime.strptime(stamp_filter, match)