Preliminary round of cleanup in time.py

Author: Taaku18

core/time.py

@@ -1,76 +1,89 @@
-'''
+"""
 UserFriendlyTime by Rapptz
 Source:
 https://github.com/Rapptz/RoboDanny/blob/rewrite/cogs/utils/time.py
-'''
+"""
 
 import datetime
 import parsedatetime as pdt
 from dateutil.relativedelta import relativedelta
 from discord.ext import commands
 import re
 
+
 class ShortTime:
-    compiled = re.compile("""(?:(?P<years>[0-9])(?:years?|y))?             # e.g. 2y
-                             (?:(?P<months>[0-9]{1,2})(?:months?|mo))?     # e.g. 2months
-                             (?:(?P<weeks>[0-9]{1,4})(?:weeks?|w))?        # e.g. 10w
-                             (?:(?P<days>[0-9]{1,5})(?:days?|d))?          # e.g. 14d
-                             (?:(?P<hours>[0-9]{1,5})(?:hours?|h))?        # e.g. 12h
-                             (?:(?P<minutes>[0-9]{1,5})(?:minutes?|m))?    # e.g. 10m
-                             (?:(?P<seconds>[0-9]{1,5})(?:seconds?|s))?    # e.g. 15s
+    compiled = re.compile("""
+                   (?:(?P<years>[0-9])(?:years?|y))?             # e.g. 2y
+                   (?:(?P<months>[0-9]{1,2})(?:months?|mo))?     # e.g. 9mo
+                   (?:(?P<weeks>[0-9]{1,4})(?:weeks?|w))?        # e.g. 10w
+                   (?:(?P<days>[0-9]{1,5})(?:days?|d))?          # e.g. 14d
+                   (?:(?P<hours>[0-9]{1,5})(?:hours?|h))?        # e.g. 12h
+                   (?:(?P<minutes>[0-9]{1,5})(?:minutes?|m))?    # e.g. 10m
+                   (?:(?P<seconds>[0-9]{1,5})(?:seconds?|s))?    # e.g. 15s
                           """, re.VERBOSE)
 
     def __init__(self, argument):
         match = self.compiled.fullmatch(argument)
         if match is None or not match.group(0):
             raise commands.BadArgument('invalid time provided')
 
-        data = { k: int(v) for k, v in match.groupdict(default=0).items() }
+        data = {k: int(v) for k, v in match.groupdict(default='0').items()}
         now = datetime.datetime.utcnow()
         self.dt = now + relativedelta(**data)
 
+
 class HumanTime:
     calendar = pdt.Calendar(version=pdt.VERSION_CONTEXT_STYLE)
 
     def __init__(self, argument):
         now = datetime.datetime.utcnow()
         dt, status = self.calendar.parseDT(argument, sourceTime=now)
         if not status.hasDateOrTime:
-            raise commands.BadArgument('invalid time provided, try e.g. "tomorrow" or "3 days"')
+            raise commands.BadArgument(
+                'invalid time provided, try e.g. "tomorrow" or "3 days"'
+            )
 
         if not status.hasTime:
             # replace it with the current time
-            dt = dt.replace(hour=now.hour, minute=now.minute, second=now.second, microsecond=now.microsecond)
+            dt = dt.replace(hour=now.hour,
+                            minute=now.minute,
+                            second=now.second,
+                            microsecond=now.microsecond)
 
         self.dt = dt
         self._past = dt < now
 
+
 class Time(HumanTime):
     def __init__(self, argument):
         try:
             o = ShortTime(argument)
-        except Exception as e:
+        except:
             super().__init__(argument)
         else:
             self.dt = o.dt
             self._past = False
 
+
 class FutureTime(Time):
     def __init__(self, argument):
         super().__init__(argument)
 
         if self._past:
             raise commands.BadArgument('this time is in the past')
 
+
 class UserFriendlyTime(commands.Converter):
     """That way quotes aren't absolutely necessary."""
     def __init__(self, converter=None):
-        if isinstance(converter, type) and issubclass(converter, commands.Converter):
+        if isinstance(converter, type) and issubclass(converter,
+                                                      commands.Converter):
             converter = converter()
 
-        if converter is not None and not isinstance(converter, commands.Converter):
+        if converter is not None and not isinstance(converter,
+                                                    commands.Converter):
             raise TypeError('commands.Converter subclass necessary.')
-
+        self.dt = self.arg = None
         self.converter = converter
 
     async def check_constraints(self, ctx, now, remaining):
@@ -84,21 +97,23 @@ async def check_constraints(self, ctx, now, remaining):
         return self
 
     async def convert(self, ctx, argument):
+        remaining = ''
         try:
             calendar = HumanTime.calendar
             regex = ShortTime.compiled
             self.dt = now = datetime.datetime.utcnow()
 
             match = regex.match(argument)
             if match is not None and match.group(0):
-                data = { k: int(v) for k, v in match.groupdict(default=0).items() }
+                data = {k: int(v) for k, v in
+                        match.groupdict(default='0').items()}
                 remaining = argument[match.end():].strip()
                 self.dt = now + relativedelta(**data)
                 return await self.check_constraints(ctx, now, remaining)
 
-
             # apparently nlp does not like "from now"
-            # it likes "from x" in other cases though so let me handle the 'now' case
+            # it likes "from x" in other cases though
+            # so let me handle the 'now' case
             if argument.endswith('from now'):
                 argument = argument[:-8].strip()
 
@@ -123,28 +138,36 @@ async def convert(self, ctx, argument):
                 return await self.check_constraints(ctx, now, argument)
 
             if begin not in (0, 1) and end != len(argument):
-                raise commands.BadArgument('Time is either in an inappropriate location, which ' \
-                                           'must be either at the end or beginning of your input, ' \
-                                           'or I just flat out did not understand what you meant. Sorry.')
+                raise commands.BadArgument(
+                    'Time is either in an inappropriate location, which must '
+                    'be either at the end or beginning of your input, or I '
+                    'just flat out did not understand what you meant. Sorry.')
 
             if not status.hasTime:
                 # replace it with the current time
-                dt = dt.replace(hour=now.hour, minute=now.minute, second=now.second, microsecond=now.microsecond)
+                dt = dt.replace(hour=now.hour,
+                                minute=now.minute,
+                                second=now.second,
+                                microsecond=now.microsecond)
 
             # if midnight is provided, just default to next day
             if status.accuracy == pdt.pdtContext.ACU_HALFDAY:
                 dt = dt.replace(day=now.day + 1)
 
-            self.dt =  dt
+            self.dt = dt
 
             if begin in (0, 1):
                 if begin == 1:
                     # check if it's quoted:
                     if argument[0] != '"':
-                        raise commands.BadArgument('Expected quote before time input...')
+                        raise commands.BadArgument(
+                            'Expected quote before time input...'
+                        )
 
                     if not (end < len(argument) and argument[end] == '"'):
-                        raise commands.BadArgument('If the time is quoted, you must unquote it.')
+                        raise commands.BadArgument(
+                            'If the time is quoted, you must unquote it.'
+                        )
 
                     remaining = argument[end + 1:].lstrip(' ,.!')
                 else:
@@ -158,6 +181,7 @@ async def convert(self, ctx, argument):
             traceback.print_exc()
             raise
 
+
 def human_timedelta(dt, *, source=None):
     now = source or datetime.datetime.utcnow()
     if dt > now:
@@ -190,4 +214,4 @@ def human_timedelta(dt, *, source=None):
     elif len(output) == 2:
         return f'{output[0]} and {output[1]}{suffix}'
     else:
-        return f'{output[0]}, {output[1]} and {output[2]}{suffix}'
+        return f'{output[0]}, {output[1]} and {output[2]}{suffix}'