Skip to content

Scrapy, a fast high-level web crawling & scraping framework for Python.

Use kwargs-only parameters in `ftp_store_file`

OmarFarrag06ab668ec7f8
diff --git a/scrapy/extensions/feedexport.py b/scrapy/extensions/feedexport.py
index 1ddc55f93..06b5a0dd9 100644
--- a/scrapy/extensions/feedexport.py
+++ b/scrapy/extensions/feedexport.py
@@ -175,9 +175,9 @@ class FTPFeedStorage(BlockingFeedStorage):
def _store_in_thread(self, file):
ftp_store_file(
- self.path, file, self.host,
- self.port, self.username,
- self.password, self.use_active_mode
+ path=self.path, file=file, host=self.host,
+ port=self.port, username=self.username,
+ password=self.password, use_active_mode=self.use_active_mode
)
diff --git a/scrapy/pipelines/files.py b/scrapy/pipelines/files.py
index 5780f63bd..5383b05fe 100644
--- a/scrapy/pipelines/files.py
+++ b/scrapy/pipelines/files.py
@@ -269,9 +269,9 @@ class FTPFilesStore(object):
def persist_file(self, path, buf, info, meta=None, headers=None):
path = '%s/%s' % (self.basedir, path)
return threads.deferToThread(
- ftp_store_file, path,buf,
- self.host, self.port,self.username,
- self.password, self.USE_ACTIVE_MODE
+ ftp_store_file, path=path, file=buf,
+ host=self.host, port=self.port, username=self.username,
+ password=self.password, use_active_mode=self.USE_ACTIVE_MODE
)
def stat_file(self, path, info):
diff --git a/scrapy/utils/ftp.py b/scrapy/utils/ftp.py
index b3e9ec2ed..752e3c953 100644
--- a/scrapy/utils/ftp.py
+++ b/scrapy/utils/ftp.py
@@ -17,7 +17,7 @@ def ftp_makedirs_cwd(ftp, path, first_call=True):
ftp.cwd(path)
def ftp_store_file(
- path, file, host, port,
+ *, path, file, host, port,
username, password, use_active_mode=False):
"""Opens a FTP connection with passed credentials,sets current directory
to the directory extracted from given path, then uploads the file to server