Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Skip coercing to bytes in merge_frames #3960

Merged
merged 1 commit into from
Jul 14, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions distributed/protocol/utils.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import struct
import msgpack

from ..utils import ensure_bytes, nbytes
from ..utils import nbytes

BIG_BYTES_SHARD_SIZE = 2 ** 26

Expand Down Expand Up @@ -84,7 +84,7 @@ def merge_frames(header, frames):
if len(L) == 1: # no work necessary
out.extend(L)
else:
out.append(b"".join(map(ensure_bytes, L)))
out.append(b"".join(L))
return out


Expand Down