Skip to content

Commit

Permalink
Rename scrapy-crawlera to scrapy-zyte-smartproxy (scrapy#5074)
Browse files Browse the repository at this point in the history
  • Loading branch information
zloidemon authored Jun 11, 2021
1 parent 23cfdb0 commit e876d8e
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
6 changes: 3 additions & 3 deletions scrapy/core/downloader/handlers/http11.py
Original file line number Diff line number Diff line change
Expand Up @@ -283,9 +283,9 @@ def _get_agent(self, request, timeout):
if omitConnectTunnel:
warnings.warn(
"Using HTTPS proxies in the noconnect mode is deprecated. "
"If you use Zyte Smart Proxy Manager (formerly Crawlera), "
"it doesn't require this mode anymore, so you should "
"update scrapy-crawlera to 1.3.0+ and remove '?noconnect' "
"If you use Zyte Smart Proxy Manager, it doesn't require "
"this mode anymore, so you should update scrapy-crawlera "
"to scrapy-zyte-smartproxy and remove '?noconnect' "
"from the Zyte Smart Proxy Manager URL.",
ScrapyDeprecationWarning,
)
Expand Down
12 changes: 8 additions & 4 deletions scrapy/core/downloader/handlers/http2.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,14 @@ def _get_agent(self, request: Request, timeout: Optional[float]) -> H2Agent:
proxy_host = proxy_host.decode()
omit_connect_tunnel = b'noconnect' in proxy_params
if omit_connect_tunnel:
warnings.warn("Using HTTPS proxies in the noconnect mode is not supported by the "
"downloader handler. If you use Crawlera, it doesn't require this "
"mode anymore, so you should update scrapy-crawlera to 1.3.0+ "
"and remove '?noconnect' from the Crawlera URL.")
warnings.warn(
"Using HTTPS proxies in the noconnect mode is not "
"supported by the downloader handler. If you use Zyte "
"Smart Proxy Manager, it doesn't require this mode "
"anymore, so you should update scrapy-crawlera to "
"scrapy-zyte-smartproxy and remove '?noconnect' from the "
"Zyte Smart Proxy Manager URL."
)

if scheme == b'https' and not omit_connect_tunnel:
# ToDo
Expand Down

0 comments on commit e876d8e

Please sign in to comment.