[Secure-testing-commits] r54256 - lib/python/sectracker

[Sebastien Delafond]

Author: seb
Date: 2017-08-04 14:02:00 +0000 (Fri, 04 Aug 2017)
New Revision: 54256

Modified:
   lib/python/sectracker/parsers.py
Log:
Fix parser for DLA/list

Modified: lib/python/sectracker/parsers.py
===================================================================
--- lib/python/sectracker/parsers.py	2017-08-04 10:58:32 UTC (rev 54255)
+++ lib/python/sectracker/parsers.py	2017-08-04 14:02:00 UTC (rev 54256)
@@ -316,10 +316,9 @@
 
 @_xpickle.loader("DLA" + FORMAT)
 def dlalist(path, f):
-    re_header = re.compile(
-        r'^\[([A-Z][a-z]{2,}) (\d\d?)(?:st|nd|rd|th), (\d{4})\] '
-        + r'(DLA-\d+-\d+)\s+'
-        + r'(.*?)\s*$')
+    re_header = re.compile(r'^\[(\d\d) ([A-Z][a-z][a-z]) (\d{4})\] '
+                            + r'(DLA-\d+(?:-\d+)?)\s+'
+                            + r'(.*?)\s*$')
     def parseheader(line):
         match = re_header.match(line)
         if match is None: