Merge 85b9a77 into 3d30c45

wroberts · May 3, 2016 · b3d9edf · b3d9edf
2 parents 3d30c45 + 85b9a77
commit b3d9edf
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/pytimeparse/timeparse.py b/pytimeparse/timeparse.py
@@ -71,6 +71,10 @@
         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']