Remove date conversions from base_spider

open-contracting · Sep 17, 2020 · 9bd5665 · 9bd5665
1 parent be0eba6
commit 9bd5665
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/kingfisher_scrapy/base_spider.py b/kingfisher_scrapy/base_spider.py
@@ -116,26 +116,20 @@ def from_crawler(cls, crawler, *args, **kwargs):
             if not spider.from_date:
                 # Default to `default_from_date` class attribute.
                 spider.from_date = spider.default_from_date
+            try:
                 if isinstance(spider.from_date, str):
                     # convert to date format, if needed
                     spider.from_date = datetime.strptime(spider.from_date, spider.date_format)
-            else:
-                try:
-                    if isinstance(spider.from_date, str):
-                        spider.from_date = datetime.strptime(spider.from_date, spider.date_format)
-                except ValueError as e:
-                    raise SpiderArgumentError('spider argument from_date: invalid date value: {}'.format(e))
+            except ValueError as e:
+                raise SpiderArgumentError('spider argument from_date: invalid date value: {}'.format(e))
 
             if not spider.until_date:
                 spider.until_date = cls.get_default_until_date(spider)
+            try:
                 if isinstance(spider.until_date, str):
-                    # convert to date format, if needed
-                    spider.until_date = datetime.strptime(spider.until_date, spider.date_format)
-            else:
-                try:
                     spider.until_date = datetime.strptime(spider.until_date, spider.date_format)
-                except ValueError as e:
-                    raise SpiderArgumentError('spider argument until_date: invalid date value: {}'.format(e))
+            except ValueError as e:
+                raise SpiderArgumentError('spider argument until_date: invalid date value: {}'.format(e))
 
         return spider