Merge pull request #3086 from laggardkernel/feature/cleanup-finish-read

Remove obsolete param 'streaming' in BaseIOStream._finish_read()

Author: bdarnell

demos/file_upload/file_receiver.py

@@ -9,12 +9,7 @@
 """
 
 import logging
-
-try:
-    from urllib.parse import unquote
-except ImportError:
-    # Python 2.
-    from urllib import unquote
+from urllib.parse import unquote
 
 import tornado.ioloop
 import tornado.web

demos/file_upload/file_uploader.py

@@ -13,14 +13,9 @@
 import os
 import sys
 from functools import partial
+from urllib.parse import quote
 from uuid import uuid4
 
-try:
-    from urllib.parse import quote
-except ImportError:
-    # Python 2.
-    from urllib import quote
-
 from tornado import gen, httpclient, ioloop
 from tornado.options import define, options
 

tornado/iostream.py

@@ -497,7 +497,7 @@ def read_until_close(self) -> Awaitable[bytes]:
         """
         future = self._start_read()
         if self.closed():
-            self._finish_read(self._read_buffer_size, False)
+            self._finish_read(self._read_buffer_size)
             return future
         self._read_until_close = True
         try:
@@ -595,7 +595,7 @@ def close(
                         self.error = exc_info[1]
             if self._read_until_close:
                 self._read_until_close = False
-                self._finish_read(self._read_buffer_size, False)
+                self._finish_read(self._read_buffer_size)
             elif self._read_future is not None:
                 # resolve reads that are pending and ready to complete
                 try:
@@ -812,7 +812,7 @@ def _start_read(self) -> Future:
         self._read_future = Future()
         return self._read_future
 
-    def _finish_read(self, size: int, streaming: bool) -> None:
+    def _finish_read(self, size: int) -> None:
         if self._user_read_buffer:
             self._read_buffer = self._after_user_read_buffer or bytearray()
             self._after_user_read_buffer = None
@@ -904,7 +904,7 @@ def _read_from_buffer(self, pos: int) -> None:
         """
         self._read_bytes = self._read_delimiter = self._read_regex = None
         self._read_partial = False
-        self._finish_read(pos, False)
+        self._finish_read(pos)
 
     def _find_read_pos(self) -> Optional[int]:
         """Attempts to find a position in the read buffer that satisfies