From abe0b37d307d40897ca6d7e61aa5c137c8e6a4c1 Mon Sep 17 00:00:00 2001
From: laggardkernel <laggardkernel@users.noreply.github.com>
Date: Tue, 27 Jul 2021 17:11:32 +0800
Subject: [PATCH] Cleanup leftover boto2 code in S3DownloaderHandler (#5209)

S3DownloaderHandler.conn is a leftover attribute from 5e99758.
---
 scrapy/core/downloader/handlers/s3.py | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/scrapy/core/downloader/handlers/s3.py b/scrapy/core/downloader/handlers/s3.py
index 1966570d4c1..31f1be31a73 100644
--- a/scrapy/core/downloader/handlers/s3.py
+++ b/scrapy/core/downloader/handlers/s3.py
@@ -1,5 +1,3 @@
-from urllib.parse import unquote
-
 from scrapy.core.downloader.handlers.http import HTTPDownloadHandler
 from scrapy.exceptions import NotConfigured
 from scrapy.utils.boto import is_botocore_available
@@ -59,7 +57,7 @@ def download_request(self, request, spider):
         url = f'{scheme}://{bucket}.s3.amazonaws.com{path}'
         if self.anon:
             request = request.replace(url=url)
-        elif self._signer is not None:
+        else:
             import botocore.awsrequest
             awsrequest = botocore.awsrequest.AWSRequest(
                 method=request.method,
@@ -69,14 +67,4 @@ def download_request(self, request, spider):
             self._signer.add_auth(awsrequest)
             request = request.replace(
                 url=url, headers=awsrequest.headers.items())
-        else:
-            signed_headers = self.conn.make_request(
-                method=request.method,
-                bucket=bucket,
-                key=unquote(p.path),
-                query_args=unquote(p.query),
-                headers=request.headers,
-                data=request.body,
-            )
-            request = request.replace(url=url, headers=signed_headers)
         return self._download_http(request, spider)