Skip to content

encode non-printable body in hex #25

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jan 13, 2016
Merged

encode non-printable body in hex #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions hyperframe/frame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"""
import collections
import struct
import binascii

from .exceptions import UnknownFrameError, InvalidPaddingError
from .flags import Flag, Flags
Expand Down Expand Up @@ -55,9 +56,9 @@ def __init__(self, stream_id, flags=()):

def __repr__(self):
flags = ", ".join(self.flags) or "None"
body = self.serialize_body()
if len(body) > 100:
body = str(body[:100]) + "..."
body = binascii.hexlify(self.serialize_body()).decode('ascii')
if len(body) > 20:
body = body[:20] + "..."
return (
"{type}(Stream: {stream}; Flags: {flags}): {body}"
).format(type=type(self).__name__, stream=self.stream_id, flags=flags, body=body)
Expand Down
8 changes: 4 additions & 4 deletions test/test_frames.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ def test_parse_frame_header_unknown_type(self):

def test_repr(self, monkeypatch):
f = Frame(stream_id=0)
monkeypatch.setattr(Frame, "serialize_body", lambda _: "body")
assert repr(f) == "Frame(Stream: 0; Flags: None): body"
monkeypatch.setattr(Frame, "serialize_body", lambda _: b"body")
assert repr(f) == "Frame(Stream: 0; Flags: None): 626f6479"

monkeypatch.setattr(Frame, "serialize_body", lambda _: "A"*105)
assert repr(f) == "Frame(Stream: 0; Flags: None): {}...".format("A"*100)
monkeypatch.setattr(Frame, "serialize_body", lambda _: b"A"*25)
assert repr(f) == "Frame(Stream: 0; Flags: None): {}...".format("41"*10)


class TestDataFrame(object):
Expand Down