From 0bd1918ac8f0a0e604a0c3f070ec860826fec50b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Chaves?= Date: Wed, 15 Apr 2020 16:07:05 +0200 Subject: [PATCH] =?UTF-8?q?UriUserinfo=20=E2=86=92=20UriUserInfo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/topics/downloader-middleware.rst | 6 +++--- docs/topics/settings.rst | 6 +++--- scrapy/downloadermiddlewares/uriuserinfo.py | 2 +- scrapy/settings/default_settings.py | 2 +- tests/test_downloadermiddleware_uriuserinfo.py | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/topics/downloader-middleware.rst b/docs/topics/downloader-middleware.rst index b9b81aa54..fc88ac03d 100644 --- a/docs/topics/downloader-middleware.rst +++ b/docs/topics/downloader-middleware.rst @@ -332,7 +332,7 @@ HttpAuthMiddleware You can alternatively specify ``http_user`` and ``http_pass`` in :attr:`Request.meta `, or use - :class:`~scrapy.downloadermiddlewares.uriuserinfo.UriUserinfoMiddleware`. + :class:`~scrapy.downloadermiddlewares.uriuserinfo.UriUserInfoMiddleware`. .. _Basic access authentication: https://en.wikipedia.org/wiki/Basic_access_authentication @@ -1140,13 +1140,13 @@ DownloaderStats setting. -UriUserinfoMiddleware +UriUserInfoMiddleware --------------------- .. module:: scrapy.downloadermiddlewares.uriuserinfo :synopsis: URI Userinfo Middleware -.. autoclass:: UriUserinfoMiddleware +.. autoclass:: UriUserInfoMiddleware UserAgentMiddleware diff --git a/docs/topics/settings.rst b/docs/topics/settings.rst index 611009680..21bf0969f 100644 --- a/docs/topics/settings.rst +++ b/docs/topics/settings.rst @@ -534,7 +534,7 @@ Default:: { 'scrapy.downloadermiddlewares.robotstxt.RobotsTxtMiddleware': 100, - 'scrapy.downloadermiddlewares.uriuserinfo.UriUserinfoMiddleware': 200, + 'scrapy.downloadermiddlewares.uriuserinfo.UriUserInfoMiddleware': 200, 'scrapy.downloadermiddlewares.httpauth.HttpAuthMiddleware': 300, 'scrapy.downloadermiddlewares.downloadtimeout.DownloadTimeoutMiddleware': 350, 'scrapy.downloadermiddlewares.defaultheaders.DefaultHeadersMiddleware': 400, @@ -824,7 +824,7 @@ It can be overriden in a request in any of the following ways: - Specifying ``ftp_password`` in :attr:`Request.meta ` - Specifying the password in :attr:`Request.url ` - (see :class:`~scrapy.downloadermiddlewares.uriuserinfo.UriUserinfoMiddleware`) + (see :class:`~scrapy.downloadermiddlewares.uriuserinfo.UriUserInfoMiddleware`) .. note:: Paraphrasing `RFC 1635`_, although it is common to use either the password @@ -849,7 +849,7 @@ It can be overriden in a request in any of the following ways: - Specifying ``ftp_user`` in :attr:`Request.meta ` - Specifying the username in :attr:`Request.url ` - (see :class:`~scrapy.downloadermiddlewares.uriuserinfo.UriUserinfoMiddleware`) + (see :class:`~scrapy.downloadermiddlewares.uriuserinfo.UriUserInfoMiddleware`) .. setting:: ITEM_PIPELINES diff --git a/scrapy/downloadermiddlewares/uriuserinfo.py b/scrapy/downloadermiddlewares/uriuserinfo.py index 7eabe15d6..8c9f64f36 100644 --- a/scrapy/downloadermiddlewares/uriuserinfo.py +++ b/scrapy/downloadermiddlewares/uriuserinfo.py @@ -3,7 +3,7 @@ from urllib.parse import unquote, urlunparse from scrapy.utils.httpobj import urlparse_cached -class UriUserinfoMiddleware: +class UriUserInfoMiddleware: """Downloader middleware that replaces `URI userinfo`_ data (user credentials for HTTP or FTP specified in the request URL) with the corresponding meta keys for later middlewares or download handlers to use them for diff --git a/scrapy/settings/default_settings.py b/scrapy/settings/default_settings.py index 96c4555cf..736a121aa 100644 --- a/scrapy/settings/default_settings.py +++ b/scrapy/settings/default_settings.py @@ -94,7 +94,7 @@ DOWNLOADER_MIDDLEWARES = {} DOWNLOADER_MIDDLEWARES_BASE = { # Engine side 'scrapy.downloadermiddlewares.robotstxt.RobotsTxtMiddleware': 100, - 'scrapy.downloadermiddlewares.uriuserinfo.UriUserinfoMiddleware': 200, + 'scrapy.downloadermiddlewares.uriuserinfo.UriUserInfoMiddleware': 200, 'scrapy.downloadermiddlewares.httpauth.HttpAuthMiddleware': 300, 'scrapy.downloadermiddlewares.downloadtimeout.DownloadTimeoutMiddleware': 350, 'scrapy.downloadermiddlewares.defaultheaders.DefaultHeadersMiddleware': 400, diff --git a/tests/test_downloadermiddleware_uriuserinfo.py b/tests/test_downloadermiddleware_uriuserinfo.py index 5a0c12506..2cdc3312d 100644 --- a/tests/test_downloadermiddleware_uriuserinfo.py +++ b/tests/test_downloadermiddleware_uriuserinfo.py @@ -1,7 +1,7 @@ import unittest from scrapy.http import Request -from scrapy.downloadermiddlewares.uriuserinfo import UriUserinfoMiddleware +from scrapy.downloadermiddlewares.uriuserinfo import UriUserInfoMiddleware from scrapy.spiders import Spider @@ -10,7 +10,7 @@ class BaseTestCase: class Implementation(unittest.TestCase): def setUp(self): - self.mw = UriUserinfoMiddleware() + self.mw = UriUserInfoMiddleware() self.spider = Spider('bar') def tearDown(self): @@ -65,19 +65,19 @@ class BaseTestCase: self.assertEqual(req.meta[self.password_field], 'b@r') -class UriUserinfoMiddlewareFTPTest(BaseTestCase.Implementation): +class UriUserInfoMiddlewareFTPTest(BaseTestCase.Implementation): protocol = 'ftp' username_field = 'ftp_user' password_field = 'ftp_password' -class UriUserinfoMiddlewareHTTPTest(BaseTestCase.Implementation): +class UriUserInfoMiddlewareHTTPTest(BaseTestCase.Implementation): protocol = 'http' username_field = 'http_user' password_field = 'http_pass' -class UriUserinfoMiddlewareHTTPSTest(BaseTestCase.Implementation): +class UriUserInfoMiddlewareHTTPSTest(BaseTestCase.Implementation): protocol = 'https' username_field = 'http_user' password_field = 'http_pass'