Skip to content

Commit 5e6238d

Browse files
committed
Fixes for newer Scrapy.
1 parent b4d7101 commit 5e6238d

File tree

4 files changed

+4
-9
lines changed

4 files changed

+4
-9
lines changed

scrapy_poet/spidermiddlewares.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ def process_spider_exception(
2121

2222
if not isinstance(exception, Retry):
2323
return None
24+
assert response.request
2425
new_request_or_none = get_retry_request(
2526
response.request,
2627
spider=spider,

scrapy_poet/utils/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020
try:
2121
from scrapy.http.request import NO_CALLBACK # available on Scrapy >= 2.8
2222
except ImportError:
23-
# NO_CALLBACK = lambda: None # noqa: E731
24-
NO_CALLBACK = None
23+
NO_CALLBACK = None # type: ignore[assignment]
2524

2625

2726
def get_scrapy_data_path(createdir: bool = True, default_dir: str = ".scrapy") -> str:

tests/test_downloader.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,7 @@ async def __call__(
444444
custom_request = Request(
445445
request.url, body=request.body, callback=NO_CALLBACK
446446
)
447+
assert crawler.engine
447448
scrapy_response: Response = await maybe_deferred_to_future(
448449
crawler.engine.download(custom_request)
449450
)

tests/test_response_required_logic.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,7 @@
2222
HttpResponseProvider,
2323
PageObjectInputProvider,
2424
)
25-
from scrapy_poet.utils import is_min_scrapy_version
26-
27-
# See: https://github.com/scrapinghub/scrapy-poet/issues/118
28-
try:
29-
from scrapy.http.request import NO_CALLBACK # available on Scrapy >= 2.8
30-
except ImportError:
31-
NO_CALLBACK = lambda: None # type: ignore[misc] # noqa: E731
25+
from scrapy_poet.utils import NO_CALLBACK, is_min_scrapy_version
3226

3327

3428
@attr.s(auto_attribs=True)

0 commit comments

Comments
 (0)