From 6d16a196117e22f9c0ba90cfaa77cb8dcf894725 Mon Sep 17 00:00:00 2001 From: Shane Harvey Date: Thu, 16 Jan 2025 13:48:07 -0800 Subject: [PATCH 1/2] Remove redundant branch in GridFS --- gridfs/asynchronous/grid_file.py | 7 ++----- gridfs/synchronous/grid_file.py | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/gridfs/asynchronous/grid_file.py b/gridfs/asynchronous/grid_file.py index a49d51d304..0b4ec5fe61 100644 --- a/gridfs/asynchronous/grid_file.py +++ b/gridfs/asynchronous/grid_file.py @@ -1299,11 +1299,8 @@ async def write(self, data: Any) -> None: raise ValueError("cannot write to a closed file") try: - if isinstance(data, AsyncGridOut): - read = data.read - else: - # file-like - read = data.read + # file-like + read = data.read except AttributeError: # string if not isinstance(data, (str, bytes)): diff --git a/gridfs/synchronous/grid_file.py b/gridfs/synchronous/grid_file.py index 655f05f57a..76dbccfb3e 100644 --- a/gridfs/synchronous/grid_file.py +++ b/gridfs/synchronous/grid_file.py @@ -1289,11 +1289,8 @@ def write(self, data: Any) -> None: raise ValueError("cannot write to a closed file") try: - if isinstance(data, GridOut): - read = data.read - else: - # file-like - read = data.read + # file-like + read = data.read except AttributeError: # string if not isinstance(data, (str, bytes)): From 9a9b30c9432efd9062d06a36dc8748a7617ceefe Mon Sep 17 00:00:00 2001 From: Shane Harvey Date: Wed, 26 Feb 2025 13:08:35 -0800 Subject: [PATCH 2/2] Remove type ignores --- gridfs/asynchronous/grid_file.py | 10 +++++----- gridfs/synchronous/grid_file.py | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gridfs/asynchronous/grid_file.py b/gridfs/asynchronous/grid_file.py index 9b0f9f3eb4..3f3179c45c 100644 --- a/gridfs/asynchronous/grid_file.py +++ b/gridfs/asynchronous/grid_file.py @@ -1314,7 +1314,7 @@ async def write(self, data: Any) -> None: raise TypeError( "must specify an encoding for file in order to write str" ) from None - read = io.BytesIO(data).read # type: ignore[assignment] + read = io.BytesIO(data).read if inspect.iscoroutinefunction(read): await self._write_async(read) @@ -1328,15 +1328,15 @@ async def write(self, data: Any) -> None: except BaseException: await self.abort() raise - self._buffer.write(to_write) # type: ignore - if len(to_write) < space: # type: ignore + self._buffer.write(to_write) + if len(to_write) < space: return # EOF or incomplete await self._flush_buffer() to_write = read(self.chunk_size) - while to_write and len(to_write) == self.chunk_size: # type: ignore + while to_write and len(to_write) == self.chunk_size: await self._flush_data(to_write) to_write = read(self.chunk_size) - self._buffer.write(to_write) # type: ignore + self._buffer.write(to_write) async def _write_async(self, read: Any) -> None: if self._buffer.tell() > 0: diff --git a/gridfs/synchronous/grid_file.py b/gridfs/synchronous/grid_file.py index 4f3a85aac0..35386857d6 100644 --- a/gridfs/synchronous/grid_file.py +++ b/gridfs/synchronous/grid_file.py @@ -1304,7 +1304,7 @@ def write(self, data: Any) -> None: raise TypeError( "must specify an encoding for file in order to write str" ) from None - read = io.BytesIO(data).read # type: ignore[assignment] + read = io.BytesIO(data).read if inspect.iscoroutinefunction(read): self._write_async(read) @@ -1318,15 +1318,15 @@ def write(self, data: Any) -> None: except BaseException: self.abort() raise - self._buffer.write(to_write) # type: ignore - if len(to_write) < space: # type: ignore + self._buffer.write(to_write) + if len(to_write) < space: return # EOF or incomplete self._flush_buffer() to_write = read(self.chunk_size) - while to_write and len(to_write) == self.chunk_size: # type: ignore + while to_write and len(to_write) == self.chunk_size: self._flush_data(to_write) to_write = read(self.chunk_size) - self._buffer.write(to_write) # type: ignore + self._buffer.write(to_write) def _write_async(self, read: Any) -> None: if self._buffer.tell() > 0: