Upstream wroberts/pytimeparse state of the touched files before 3270e0d981

pytimeparse/tests/testtimeparse.py

@@ -83,10 +83,6 @@ class TestTimeparse(unittest.TestCase):
         self.assertEqual(timeparse.timeparse('- 32 m 1 s'), -1921)
         self.assertIsNone(timeparse.timeparse('32 m - 1 s'))
         self.assertIsNone(timeparse.timeparse('32 m + 1 s'))
-        # A stray pipe is not a valid sign and must not be silently accepted.
-        self.assertIsNone(timeparse.timeparse('|5m'))
-        self.assertIsNone(timeparse.timeparse('| 5m'))
-        self.assertIsNone(timeparse.timeparse('|1:24'))
 
     def test_timeparse_1(self):
         '''timeparse test case 1.'''

pytimeparse/timeparse.py

@@ -33,7 +33,7 @@ kinds of time expressions.
 
 import re
 
-SIGN        = r'(?P<sign>[+-])?'
+SIGN        = r'(?P<sign>[+|-])?'
 #YEARS      = r'(?P<years>\d+)\s*(?:ys?|yrs?.?|years?)'
 #MONTHS     = r'(?P<months>\d+)\s*(?:mos?.?|mths?.?|months?)'
 WEEKS       = r'(?P<weeks>[\d.]+)\s*(?:w|wks?|weeks?)'