Skip to content

Commit e52965e

Browse files
authored
Remove redundant branch in GridFS (#2064)
1 parent c9a85ad commit e52965e

File tree

2 files changed

+14
-20
lines changed

2 files changed

+14
-20
lines changed

gridfs/asynchronous/grid_file.py

+7-10
Original file line numberDiff line numberDiff line change
@@ -1301,11 +1301,8 @@ async def write(self, data: Any) -> None:
13011301
raise ValueError("cannot write to a closed file")
13021302

13031303
try:
1304-
if isinstance(data, AsyncGridOut):
1305-
read = data.read
1306-
else:
1307-
# file-like
1308-
read = data.read
1304+
# file-like
1305+
read = data.read
13091306
except AttributeError:
13101307
# string
13111308
if not isinstance(data, (str, bytes)):
@@ -1317,7 +1314,7 @@ async def write(self, data: Any) -> None:
13171314
raise TypeError(
13181315
"must specify an encoding for file in order to write str"
13191316
) from None
1320-
read = io.BytesIO(data).read # type: ignore[assignment]
1317+
read = io.BytesIO(data).read
13211318

13221319
if inspect.iscoroutinefunction(read):
13231320
await self._write_async(read)
@@ -1331,15 +1328,15 @@ async def write(self, data: Any) -> None:
13311328
except BaseException:
13321329
await self.abort()
13331330
raise
1334-
self._buffer.write(to_write) # type: ignore
1335-
if len(to_write) < space: # type: ignore
1331+
self._buffer.write(to_write)
1332+
if len(to_write) < space:
13361333
return # EOF or incomplete
13371334
await self._flush_buffer()
13381335
to_write = read(self.chunk_size)
1339-
while to_write and len(to_write) == self.chunk_size: # type: ignore
1336+
while to_write and len(to_write) == self.chunk_size:
13401337
await self._flush_data(to_write)
13411338
to_write = read(self.chunk_size)
1342-
self._buffer.write(to_write) # type: ignore
1339+
self._buffer.write(to_write)
13431340

13441341
async def _write_async(self, read: Any) -> None:
13451342
if self._buffer.tell() > 0:

gridfs/synchronous/grid_file.py

+7-10
Original file line numberDiff line numberDiff line change
@@ -1291,11 +1291,8 @@ def write(self, data: Any) -> None:
12911291
raise ValueError("cannot write to a closed file")
12921292

12931293
try:
1294-
if isinstance(data, GridOut):
1295-
read = data.read
1296-
else:
1297-
# file-like
1298-
read = data.read
1294+
# file-like
1295+
read = data.read
12991296
except AttributeError:
13001297
# string
13011298
if not isinstance(data, (str, bytes)):
@@ -1307,7 +1304,7 @@ def write(self, data: Any) -> None:
13071304
raise TypeError(
13081305
"must specify an encoding for file in order to write str"
13091306
) from None
1310-
read = io.BytesIO(data).read # type: ignore[assignment]
1307+
read = io.BytesIO(data).read
13111308

13121309
if inspect.iscoroutinefunction(read):
13131310
self._write_async(read)
@@ -1321,15 +1318,15 @@ def write(self, data: Any) -> None:
13211318
except BaseException:
13221319
self.abort()
13231320
raise
1324-
self._buffer.write(to_write) # type: ignore
1325-
if len(to_write) < space: # type: ignore
1321+
self._buffer.write(to_write)
1322+
if len(to_write) < space:
13261323
return # EOF or incomplete
13271324
self._flush_buffer()
13281325
to_write = read(self.chunk_size)
1329-
while to_write and len(to_write) == self.chunk_size: # type: ignore
1326+
while to_write and len(to_write) == self.chunk_size:
13301327
self._flush_data(to_write)
13311328
to_write = read(self.chunk_size)
1332-
self._buffer.write(to_write) # type: ignore
1329+
self._buffer.write(to_write)
13331330

13341331
def _write_async(self, read: Any) -> None:
13351332
if self._buffer.tell() > 0:

0 commit comments

Comments
 (0)