X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=dateparse%2Fdateparse_utils.py;h=026a5137a07a6027924080f27ec03d41d0913016;hb=a5c4feeac240a446a38147130b51ad96a046f6e1;hp=cd8bc3543513d147b030c5303424964aaa49b5b9;hpb=b843703134a166013518c707fa5a77373f1bf0bf;p=python_utils.git

diff --git a/dateparse/dateparse_utils.py b/dateparse/dateparse_utils.py
index cd8bc35..026a513 100755
--- a/dateparse/dateparse_utils.py
+++ b/dateparse/dateparse_utils.py
@@ -50,7 +50,6 @@ def debug_parse(enter_or_exit_f: Callable[[Any, Any], None]):
 class ParseException(Exception):
     """An exception thrown during parsing because of unrecognized input."""
     def __init__(self, message: str) -> None:
-        logger.error(message)
         self.message = message
 
 
@@ -59,7 +58,6 @@ class RaisingErrorListener(antlr4.DiagnosticErrorListener):
     def syntaxError(
             self, recognizer, offendingSymbol, line, column, msg, e
     ):
-        logger.error(msg)
         raise ParseException(msg)
 
     def reportAmbiguity(
@@ -194,6 +192,8 @@ class DateParser(dateparse_utilsListener):
 
         This is the main entrypoint to this class for caller code.
         """
+        date_string = date_string.strip()
+        date_string = re.sub('\s+', ' ', date_string)
         self._reset()
         listener = RaisingErrorListener()
         input_stream = antlr4.InputStream(date_string)
@@ -269,9 +269,9 @@ class DateParser(dateparse_utilsListener):
             return TimeUnit.MONTHS
         txt = orig.lower()[:3]
         if txt in self.day_name_to_number:
-            return(self.day_name_to_number[txt])
+            return(TimeUnit(self.day_name_to_number[txt]))
         elif txt in self.delta_unit_to_constant:
-            return(self.delta_unit_to_constant[txt])
+            return(TimeUnit(self.delta_unit_to_constant[txt]))
         raise ParseException(f'Invalid date unit: {orig}')
 
     def _figure_out_time_unit(self, orig: str) -> int:
@@ -507,7 +507,7 @@ class DateParser(dateparse_utilsListener):
         unit = self.context['delta_unit']
         dt = n_timeunits_from_base(
             count,
-            unit,
+            TimeUnit(unit),
             date_to_datetime(self.date)
         )
         self.date = datetime_to_date(dt)
@@ -888,7 +888,7 @@ class DateParser(dateparse_utilsListener):
         unit = self._figure_out_date_unit(unit)
         d = n_timeunits_from_base(
             count,
-            unit,
+            TimeUnit(unit),
             d)
         self.context['year'] = d.year
         self.context['month'] = d.month
@@ -918,7 +918,7 @@ class DateParser(dateparse_utilsListener):
         unit = self._figure_out_date_unit(unit)
         d = n_timeunits_from_base(
             count,
-            unit,
+            TimeUnit(unit),
             d)
         self.context['year'] = d.year
         self.context['month'] = d.month