Scrapy, a fast high-level web crawling & scraping framework for Python.
Fix dangling file descriptor in FeedExporter when FEED_STORE_EMPTY is False (#4023)
Adrián Chaves1d5c270ce8ca
diff --git a/scrapy/extensions/feedexport.py b/scrapy/extensions/feedexport.pyindex ce2846eba..6fb6397b1 100644--- a/scrapy/extensions/feedexport.py+++ b/scrapy/extensions/feedexport.py@@ -242,7 +242,9 @@ class FeedExporter(object):def close_spider(self, spider):slot = self.slotif not slot.itemcount and not self.store_empty:- return+ # We need to call slot.storage.store nonetheless to get the file+ # properly closed.+ return defer.maybeDeferred(slot.storage.store, slot.file)if self._exporting:slot.exporter.finish_exporting()self._exporting = Falsediff --git a/tests/test_feedexport.py b/tests/test_feedexport.pyindex f32ac2a4b..e1436fbe5 100644--- a/tests/test_feedexport.py+++ b/tests/test_feedexport.py@@ -417,7 +417,7 @@ class FeedExportTest(unittest.TestCase):content = f.read()finally:- shutil.rmtree(tmpdir, ignore_errors=True)+ shutil.rmtree(tmpdir)defer.returnValue(content)