Update changes

open-contracting · Oct 5, 2020 · 37d4763 · 37d4763
1 parent fccbd4a
commit 37d4763
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/kingfisher_scrapy/base_spider.py b/kingfisher_scrapy/base_spider.py
@@ -76,7 +76,8 @@ class BaseSpider(scrapy.Spider):
 
     ocds_version = '1.1'
     date_format = 'date'
-    date_required = None
+    # Set `date_required` to True in class attribute to always set the `from` and `until` date parameters.
+    date_required = False
 
     def __init__(self, sample=None, note=None, from_date=None, until_date=None, crawl_time=None,
                  keep_collection_open=None, package_pointer=None, release_pointer=None, truncate=None, qs=None, *args,
@@ -131,14 +132,14 @@ def from_crawler(cls, crawler, *args, **kwargs):
             except ValueError as e:
                 raise SpiderArgumentError('spider argument crawl_time: invalid date value: {}'.format(e))
 
-        # Checks Spider date ranges arguments
+        # Checks Spider date ranges arguments and `date_required` class attribute.
         if spider.from_date or spider.until_date or spider.date_required:
             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
+                    # Convert to date format, if needed.
                     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))

diff --git a/kingfisher_scrapy/spiders/nicaragua_solid_waste.py b/kingfisher_scrapy/spiders/nicaragua_solid_waste.py
@@ -26,9 +26,7 @@ def start_requests(self):
             # date parameter setting to get one release from 2013
             url = url.format('20130123', '20130123')
         else:
-            if self.from_date and self.until_date:
-                # date parameter obtained
-                url = url.format(self.from_date.strftime("%Y%m%d"), self.until_date.strftime("%Y%m%d"))
-
+            # date parameter obtained
+            url = url.format(self.from_date.strftime("%Y%m%d"), self.until_date.strftime("%Y%m%d"))
         # url looks like http://www.gekoware.com/swmp/api/ocds/20190101/20201005
         yield self.build_request(url, formatter=components(-2))