Merge branch 'tersers-master'

Author: sdispater

CHANGELOG.md

@@ -7,6 +7,7 @@
 - Fixed `from_format()` not recognizing input strings when the specified pattern had escaped elements.
 - Fixed missing `x` token for string formatting.
 - Fixed reading timezone files.
+- Added support for parsing padded 2-digit days of the month with `from_format()`
 
 
 ## [2.0.3] - 2018-07-30

pendulum/formatting/formatter.py

@@ -17,6 +17,7 @@
 _MATCH_4 = "\d{4}"
 _MATCH_6 = "[+-]?\d{6}"
 _MATCH_1_TO_2 = "\d\d?"
+_MATCH_1_TO_2_LEFT_PAD = "[0-9 ]\d?"
 _MATCH_1_TO_3 = "\d{1,3}"
 _MATCH_1_TO_4 = "\d{1,4}"
 _MATCH_1_TO_6 = "[+-]?\d{1,6}"
@@ -157,7 +158,7 @@ class Formatter:
         "MMM": _MATCH_WORD,
         "MMMM": _MATCH_WORD,
         "D": _MATCH_1_TO_2,
-        "DD": (_MATCH_1_TO_2, _MATCH_2),
+        "DD": (_MATCH_1_TO_2_LEFT_PAD, _MATCH_2),
         "DDD": _MATCH_1_TO_3,
         "DDDD": _MATCH_3,
         "dddd": _MATCH_WORD,

tests/datetime/test_from_format.py

@@ -42,6 +42,16 @@ def test_from_format_with_millis():
     assert_datetime(d, 1975, 5, 21, 22, 32, 11, 123456)
 
 
+def test_from_format_with_padded_day():
+    d = pendulum.from_format("Apr  2 12:00:00 2020 GMT", "MMM DD HH:mm:ss YYYY z")
+    assert_datetime(d, 2020, 4, 2, 12)
+
+
+def test_from_format_with_invalid_padded_day():
+    with pytest.raises(ValueError):
+        d = pendulum.from_format("Apr   2 12:00:00 2020 GMT", "MMM DD HH:mm:ss YYYY z")
+
+
 @pytest.mark.parametrize(
     "text,fmt,expected,now",
     [