v2.1.1: allow bad Begin and End date strings

(TSV reports with formatting like "Begin_Date=2019-01-01; End_Date=2019-12-31"
exist in the wild; better to allow this than to hope the vendors will fix
things any time soon...)

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
-## 2.1.0 (unreleased)
+## 2.1.1 (2020-01-24)
+* less strict date handling in Begin/End date strings to allow working with
+badly-formatted reports that exist in the wild.
+
+## 2.1.0 (2019-11-06)
 * add support for COUNTER 4 title-level turnaways reports (JR2 and BR3).
 
 ## 2.0.0 (2019-09-13)

pycounter/helpers.py

@@ -3,6 +3,7 @@
 import datetime
 
 import six
+import re
 
 
 def convert_covered(datestring):
@@ -17,8 +18,15 @@ def convert_covered(datestring):
     (Will also accept MM/DD/YYYY format, ISO 8601 timestamps, or existing
     datetime objects; these shouldn't be in COUNTER reports, but they
     do show up in real world data...)
+
+    Also accepts strings of the form 'Begin_Date=2019-01-01; End_Date=2019-12-31'
+    for better compatibility with some (broken) COUNTER 5 implementations.
     """
-    start_string, end_string = datestring.split(" to ")
+    try:
+        start_string, end_string = datestring.split(" to ")
+    except ValueError:
+        start_string, end_string = tuple(re.findall(r"\d{4}-\d{2}-\d{2}", datestring))
+
     start_date = convert_date_run(start_string)
     end_date = convert_date_run(end_string)
 

pycounter/test/test_helpers.py

@@ -6,7 +6,7 @@
 
 import pytest
 
-from pycounter.helpers import is_first_last, next_month, prev_month
+from pycounter.helpers import convert_covered, is_first_last, next_month, prev_month
 
 
 @pytest.mark.parametrize(
@@ -46,3 +46,15 @@ def test_prevmonth(pair):
 def test_is_first_last(period, expected):
     dt_period = tuple(datetime.date(*part) for part in period)
     assert is_first_last(dt_period) == expected
+
+
+@pytest.mark.parametrize(
+    "covered_line, expected",
+    [
+        ("2017-01-01 to 2017-06-30", ((2017, 1, 1), (2017, 6, 30))),
+        ("Begin_Date=2019-01-01; End_Date=2019-12-31", ((2019, 1, 1), (2019, 12, 31))),
+    ],
+)
+def test_convert_covered(covered_line, expected):
+    expected_dates = tuple(datetime.date(*val) for val in expected)
+    assert convert_covered(covered_line) == expected_dates

pycounter/version.py

@@ -1,2 +1,2 @@
 """version information."""
-__version__ = "2.1.0"
+__version__ = "2.1.1"