Fixes from_format() raising an error with the alternative formatter

Author: sdispater

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [Unreleased]
+
+### Fixed
+
+- Fixed `from_format()` raising an error with the alternative formatter.
+
+
 ## [1.3.2] - 2017-11-16
 
 ### Fixed

pendulum/formatting/alternative_formatter.py

@@ -330,6 +330,7 @@ def parse(self, time, fmt):
 
         :rtype: tuple
         """
+        fmt = re.escape(fmt)
         tokens = self._FORMAT_RE.findall(fmt)
         if not tokens:
             return time
@@ -397,7 +398,7 @@ def _replace_tokens(self, token):
         if token.startswith('[') and token.endswith(']'):
             return token[1:-1]
         elif token.startswith('\\'):
-            return token[1:]
+            return token
         elif token not in self._REGEX_TOKENS:
             raise ValueError('Unsupported token: {}'.format(token))
 

tests/pendulum_tests/test_create_from_format.py

@@ -62,6 +62,8 @@ def test_strptime_is_create_from_format(self):
     ('1234567890', 'X', '2009-02-13T23:31:30+00:00'),
     ('1234567890123', 'x', '2009-02-13T23:31:30.123000+00:00'),
     ('2016-10-06', 'YYYY-MM-DD', '2016-10-06T00:00:00+00:00'),
+    ('2016|10|06', 'YYYY|MM|DD', '2016-10-06T00:00:00+00:00'),
+    ('2016(10|06)', 'YYYY(MM|DD)', '2016-10-06T00:00:00+00:00'),
 ])
 def test_from_format(text, fmt, expected):
     with pendulum.test(pendulum.create(2015, 11, 12)):