Skip to content

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

Flake8: Remove E128 (item, mail, responsetypes)

Eugenio Lacuesta2851f641f2c1
diff --git a/pytest.ini b/pytest.ini
index c0d74f7d9..0a5a172b3 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -152,14 +152,14 @@ flake8-ignore =
scrapy/exceptions.py E501
scrapy/exporters.py E501
scrapy/interfaces.py E501
- scrapy/item.py E501 E128
+ scrapy/item.py E501
scrapy/link.py E501
scrapy/logformatter.py E501
- scrapy/mail.py E402 E128 E501
+ scrapy/mail.py E402 E501
scrapy/middleware.py E501
scrapy/pqueues.py E501
scrapy/resolver.py E501
- scrapy/responsetypes.py E128 E501
+ scrapy/responsetypes.py E501
scrapy/robotstxt.py E501
scrapy/shell.py E501
scrapy/signalmanager.py E501
diff --git a/scrapy/item.py b/scrapy/item.py
index 748368932..b75d04404 100644
--- a/scrapy/item.py
+++ b/scrapy/item.py
@@ -86,8 +86,7 @@ class DictItem(MutableMapping, BaseItem):
if key in self.fields:
self._values[key] = value
else:
- raise KeyError("%s does not support field: %s" %
- (self.__class__.__name__, key))
+ raise KeyError("%s does not support field: %s" % (self.__class__.__name__, key))
def __delitem__(self, key):
del self._values[key]
@@ -99,8 +98,7 @@ class DictItem(MutableMapping, BaseItem):
def __setattr__(self, name, value):
if not name.startswith('_'):
- raise AttributeError("Use item[%r] = %r to set field value" %
- (name, value))
+ raise AttributeError("Use item[%r] = %r to set field value" % (name, value))
super(DictItem, self).__setattr__(name, value)
def __len__(self):
diff --git a/scrapy/mail.py b/scrapy/mail.py
index 9d7896ef6..7d7a2c435 100644
--- a/scrapy/mail.py
+++ b/scrapy/mail.py
@@ -28,8 +28,10 @@ def _to_bytes_or_none(text):
class MailSender:
- def __init__(self, smtphost='localhost', mailfrom='scrapy@localhost',
- smtpuser=None, smtppass=None, smtpport=25, smtptls=False, smtpssl=False, debug=False):
+ def __init__(
+ self, smtphost='localhost', mailfrom='scrapy@localhost', smtpuser=None,
+ smtppass=None, smtpport=25, smtptls=False, smtpssl=False, debug=False
+ ):
self.smtphost = smtphost
self.smtpport = smtpport
self.smtpuser = _to_bytes_or_none(smtpuser)
@@ -41,9 +43,15 @@ class MailSender:
@classmethod
def from_settings(cls, settings):
- return cls(settings['MAIL_HOST'], settings['MAIL_FROM'], settings['MAIL_USER'],
- settings['MAIL_PASS'], settings.getint('MAIL_PORT'),
- settings.getbool('MAIL_TLS'), settings.getbool('MAIL_SSL'))
+ return cls(
+ smtphost=settings['MAIL_HOST'],
+ mailfrom=settings['MAIL_FROM'],
+ smtpuser=settings['MAIL_USER'],
+ smtppass=settings['MAIL_PASS'],
+ smtpport=settings.getint('MAIL_PORT'),
+ smtptls=settings.getbool('MAIL_TLS'),
+ smtpssl=settings.getbool('MAIL_SSL'),
+ )
def send(self, to, subject, body, cc=None, attachs=(), mimetype='text/plain', charset=None, _callback=None):
from twisted.internet import reactor
@@ -89,9 +97,12 @@ class MailSender:
return
dfd = self._sendmail(rcpts, msg.as_string().encode(charset or 'utf-8'))
- dfd.addCallbacks(self._sent_ok, self._sent_failed,
+ dfd.addCallbacks(
+ callback=self._sent_ok,
+ errback=self._sent_failed,
callbackArgs=[to, cc, subject, len(attachs)],
- errbackArgs=[to, cc, subject, len(attachs)])
+ errbackArgs=[to, cc, subject, len(attachs)],
+ )
reactor.addSystemEventTrigger('before', 'shutdown', lambda: dfd)
return dfd
@@ -115,9 +126,10 @@ class MailSender:
from twisted.mail.smtp import ESMTPSenderFactory
msg = BytesIO(msg)
d = defer.Deferred()
- factory = ESMTPSenderFactory(self.smtpuser, self.smtppass, self.mailfrom,
- to_addrs, msg, d, heloFallback=True, requireAuthentication=False,
- requireTransportSecurity=self.smtptls)
+ factory = ESMTPSenderFactory(
+ self.smtpuser, self.smtppass, self.mailfrom, to_addrs, msg, d,
+ heloFallback=True, requireAuthentication=False, requireTransportSecurity=self.smtptls,
+ )
factory.noisy = False
if self.smtpssl:
diff --git a/scrapy/responsetypes.py b/scrapy/responsetypes.py
index 7c5eeac21..d207088e6 100644
--- a/scrapy/responsetypes.py
+++ b/scrapy/responsetypes.py
@@ -58,9 +58,9 @@ class ResponseTypes:
def from_content_disposition(self, content_disposition):
try:
- filename = to_unicode(content_disposition,
- encoding='latin-1', errors='replace').split(';')[1].split('=')[1]
- filename = filename.strip('"\'')
+ filename = to_unicode(
+ content_disposition, encoding='latin-1', errors='replace'
+ ).split(';')[1].split('=')[1].strip('"\'')
return self.from_filename(filename)
except IndexError:
return Response