Merge bd1fb00 into dc7e783

pytimeparse/tests/testtimeparse.py

@@ -177,6 +177,13 @@ def test_timeparse_granularity_4(self):
         self.assertEqual(timeparse.timeparse('+0:02', granularity='seconds'), 2)
         self.assertEqual(timeparse.timeparse('-0:02', granularity='seconds'), -2)
 
+    def test_timeparse_unparsed(self):
+        '''Check that unparsed values tries to converts into int(). '''
+        self.assertEqual(timeparse.timeparse(100), 100)
+        self.assertEqual(timeparse.timeparse(-18.333), -18)
+        self.assertEqual(timeparse.timeparse('99.1'), 99)
+        self.assertEqual(timeparse.timeparse('-99.1'), -99)
+
     def test_timeparse_11(self):
         '''timeparse test case 11.'''
         # uptime format

pytimeparse/timeparse.py

@@ -33,7 +33,7 @@
 
 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?)'
@@ -153,6 +153,8 @@ def timeparse(sval, granularity='seconds'):
     >>> timeparse('1:30', granularity='minutes')
     5400
     '''
+    if isinstance(sval, (int, float)):
+        return int(sval)
     match = COMPILED_SIGN.match(sval)
     sign = -1 if match.groupdict()['sign'] == '-' else 1
     sval = match.groupdict()['unsigned']
@@ -179,3 +181,8 @@ def timeparse(sval, granularity='seconds'):
                 # SECS is a float, we will return a float
                 return sign * sum([MULTIPLIERS[k] * float(v) for (k, v) in
                             list(mdict.items()) if v is not None])
+
+    try:
+        return int(float(sval)) * sign
+    except ValueError:
+        pass