File tree Expand file tree Collapse file tree 2 files changed +4
-2
lines changed Expand file tree Collapse file tree 2 files changed +4
-2
lines changed Original file line number Diff line number Diff line change 26
26
from scrapy .http import Request
27
27
from scrapy .utils .misc import md5sum
28
28
from scrapy .utils .log import failure_to_exc_info
29
+ from scrapy .utils .python import to_bytes
29
30
30
31
logger = logging .getLogger (__name__ )
31
32
@@ -330,7 +331,7 @@ def _warn():
330
331
return self .file_key (url )
331
332
## end of deprecation warning block
332
333
333
- media_guid = hashlib .sha1 (url ).hexdigest () # change to request.url after deprecation
334
+ media_guid = hashlib .sha1 (to_bytes ( url ) ).hexdigest () # change to request.url after deprecation
334
335
media_ext = os .path .splitext (url )[1 ] # change to request.url after deprecation
335
336
return 'full/%s%s' % (media_guid , media_ext )
336
337
Original file line number Diff line number Diff line change 12
12
from scrapy .item import Item , Field
13
13
from scrapy .http import Request , Response
14
14
from scrapy .settings import Settings
15
+ from scrapy .utils .python import to_bytes
15
16
16
17
from tests import mock
17
18
@@ -103,7 +104,7 @@ def test_file_expired(self):
103
104
104
105
class DeprecatedFilesPipeline (FilesPipeline ):
105
106
def file_key (self , url ):
106
- media_guid = hashlib .sha1 (url ).hexdigest ()
107
+ media_guid = hashlib .sha1 (to_bytes ( url ) ).hexdigest ()
107
108
media_ext = os .path .splitext (url )[1 ]
108
109
return 'empty/%s%s' % (media_guid , media_ext )
109
110
You can’t perform that action at this time.
0 commit comments