From 471281d29e5c7b8e293f59ac3c3330ecda687d19 Mon Sep 17 00:00:00 2001
From: Andrey Rakhmatullin <wrar@wrar.name>
Date: Sun, 6 Aug 2023 23:05:02 +0400
Subject: [PATCH] Fixes for scrapy/utils/iterators.py typing.

---
 scrapy/utils/iterators.py     | 11 ++++++-----
 tests/test_utils_iterators.py |  7 +------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/scrapy/utils/iterators.py b/scrapy/utils/iterators.py
index 58850b843..40af68dec 100644
--- a/scrapy/utils/iterators.py
+++ b/scrapy/utils/iterators.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import csv
 import logging
 import re
@@ -78,7 +76,7 @@ def xmliter(
 
 
 def xmliter_lxml(
-    obj: Union[TextResponse, str, bytes],
+    obj: Union[Response, str, bytes],
     nodename: str,
     namespace: Optional[str] = None,
     prefix: str = "x",
@@ -87,8 +85,9 @@ def xmliter_lxml(
 
     reader = _StreamReader(obj)
     tag = f"{{{namespace}}}{nodename}" if namespace else nodename
+    # technically, etree.iterparse only needs .read() AFAICS, but this is how it's typed
     iterable = etree.iterparse(
-        cast(SupportsReadClose[bytes], reader), tag=tag, encoding=reader.encoding
+        cast("SupportsReadClose[bytes]", reader), tag=tag, encoding=reader.encoding
     )
     selxpath = "//" + (f"{prefix}:{nodename}" if namespace else nodename)
     for _, node in iterable:
@@ -101,11 +100,13 @@ def xmliter_lxml(
 
 
 class _StreamReader:
-    def __init__(self, obj: Union[TextResponse, str, bytes]):
+    def __init__(self, obj: Union[Response, str, bytes]):
         self._ptr: int = 0
         self._text: Union[str, bytes]
         if isinstance(obj, TextResponse):
             self._text, self.encoding = obj.body, obj.encoding
+        elif isinstance(obj, Response):
+            self._text, self.encoding = obj.body, "utf-8"
         else:
             self._text, self.encoding = obj, "utf-8"
         self._is_unicode: bool = isinstance(self._text, str)
diff --git a/tests/test_utils_iterators.py b/tests/test_utils_iterators.py
index 5dfd7e7ac..3598fa0bb 100644
--- a/tests/test_utils_iterators.py
+++ b/tests/test_utils_iterators.py
@@ -1,18 +1,13 @@
-from typing import Callable, Iterable, Union
-
 from pytest import mark
 from twisted.trial import unittest
 
-from scrapy import Selector
 from scrapy.http import Response, TextResponse, XmlResponse
 from scrapy.utils.iterators import _body_or_str, csviter, xmliter, xmliter_lxml
 from tests import get_testdata
 
 
 class XmliterTestCase(unittest.TestCase):
-    xmliter: Callable[
-        [Union[TextResponse, str, bytes], str], Iterable[Selector]
-    ] = staticmethod(xmliter)
+    xmliter = staticmethod(xmliter)
 
     def test_xmliter(self):
         body = b"""