Fix from_format() trying to parse escaped tokens

Author: sdispater

CHANGELOG.md

@@ -8,6 +8,7 @@
 - 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()`
+- Fixed `from_format()` trying to parse escaped tokens.
 
 
 ## [2.0.3] - 2018-07-30

pendulum/formatting/formatter.py

@@ -58,6 +58,8 @@ class Formatter:
 
     _FORMAT_RE = re.compile(_TOKENS)
 
+    _FROM_FORMAT_RE = re.compile(r"(?<!\\\[)" + _TOKENS + r"(?!\\\])")
+
     _LOCALIZABLE_TOKENS = {
         "Qo": None,
         "MMMM": "months.wide",
@@ -372,7 +374,7 @@ def parse(
         """
         escaped_fmt = re.escape(fmt)
 
-        tokens = self._FORMAT_RE.findall(escaped_fmt)
+        tokens = self._FROM_FORMAT_RE.findall(escaped_fmt)
         if not tokens:
             return time
 
@@ -397,7 +399,7 @@ def parse(
             "timestamp": None,
         }
 
-        pattern = self._FORMAT_RE.sub(
+        pattern = self._FROM_FORMAT_RE.sub(
             lambda m: self._replace_tokens(m.group(0), locale), escaped_fmt
         )
 

tests/datetime/test_from_format.py

@@ -37,6 +37,12 @@ def test_from_format_with_escaped_elements():
     assert "+00:00" == d.timezone_name
 
 
+def test_from_format_with_escaped_elements_valid_tokens():
+    d = pendulum.from_format("1975-05-21T22:32:11.123Z", "YYYY-MM-DD[T]HH:mm:ss.SSS[Z]")
+    assert_datetime(d, 1975, 5, 21, 22, 32, 11)
+    assert "UTC" == d.timezone_name
+
+
 def test_from_format_with_millis():
     d = pendulum.from_format("1975-05-21 22:32:11.123456", "YYYY-MM-DD HH:mm:ss.SSSSSS")
     assert_datetime(d, 1975, 5, 21, 22, 32, 11, 123456)