Merge branch 'master' of github.com:wroberts/pytimeparse

.travis.yml

@@ -6,7 +6,7 @@ python:
   - "3.4"
   - "3.5"
 # command to install dependencies
-install: "pip install . coveralls"
+install: "pip install . 'coverage<4' coveralls"
 # command to run tests
 script:
   coverage run --source=pytimeparse setup.py test

pytimeparse/timeparse.py

@@ -71,6 +71,10 @@ TIMEFORMATS = [
         DAYCLOCK=DAYCLOCK),
     r'{SECCLOCK}'.format(
         SECCLOCK=SECCLOCK),
+    #r'{YEARS}'.format(
+        #YEARS=YEARS),
+    #r'{MONTHS}'.format(
+        #MONTHS=MONTHS),
     ]
 
 MULTIPLIERS = dict([
@@ -98,6 +102,8 @@ def _interpret_as_minutes(sval, mdict):
         and (('hours' not in mdict) or (mdict['hours'] is None))
         and (('days' not in mdict) or (mdict['days'] is None))
         and (('weeks' not in mdict) or (mdict['weeks'] is None))
+        #and (('months' not in mdict) or (mdict['months'] is None))
+        #and (('years' not in mdict) or (mdict['years'] is None))
         ):   
         mdict['hours'] = mdict['mins']
         mdict['mins'] = mdict['secs']