Remove Stream._read_loop
authorHarmon <Harmon758@gmail.com>
Sat, 23 Jan 2021 17:18:44 +0000 (11:18 -0600)
committerHarmon <Harmon758@gmail.com>
Sat, 23 Jan 2021 17:18:44 +0000 (11:18 -0600)
tweepy/streaming.py

index 2e0ec1346b793316f9e9c900a6cc41c86f9fd78b..5f4d079a087c2f0055ee4298b9d0ea6079d6d419 100644 (file)
@@ -191,7 +191,20 @@ class Stream:
                             http_error_wait = http_error_wait_start
                             network_error_wait = network_error_wait_step
                             self.listener.on_connect()
-                            self._read_loop(resp)
+
+                            for line in resp.iter_lines(
+                                chunk_size=self.chunk_size
+                            ):
+                                if not self.running:
+                                    break
+                                if not line:
+                                    self.listener.on_keep_alive()
+                                elif self.listener.on_data(line) is False:
+                                    self.running = False
+                                    break
+
+                            if resp.raw.closed:
+                                self.on_closed(resp)
                 except (requests.ConnectionError, requests.Timeout,
                         ssl.SSLError, urllib3.exceptions.ReadTimeoutError,
                         urllib3.exceptions.ProtocolError) as exc:
@@ -217,19 +230,6 @@ class Stream:
             self.session.close()
             self.running = False
 
-    def _read_loop(self, resp):
-        for line in resp.iter_lines(chunk_size=self.chunk_size):
-            if not self.running:
-                break
-            if not line:
-                self.listener.on_keep_alive()
-            elif self.listener.on_data(line) is False:
-                self.running = False
-                break
-
-        if resp.raw.closed:
-            self.on_closed(resp)
-
     def _start(self, *args, threaded=False, **kwargs):
         self.running = True
         if threaded: