Skip to content

Commit

Permalink
Merge pull request #109 from crytic/logging-bugfix
Browse files Browse the repository at this point in the history
Fix issue with function call logging and PEP 8 Compliance
  • Loading branch information
anishnaik authored Jul 12, 2022
2 parents 2f66a9f + 58b6b72 commit 0f0ad91
Show file tree
Hide file tree
Showing 29 changed files with 1,788 additions and 818 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,8 @@ build
dist
venv/
*egg*
init.json
init.json
tests/drizzle/node_modules/
tests/drizzle/artifacts/
tests/drizzle/yarn.lock
tests/drizzle/cache/
460 changes: 337 additions & 123 deletions etheno/__main__.py

Large diffs are not rendered by default.

112 changes: 56 additions & 56 deletions etheno/ascii_escapes.py
Original file line number Diff line number Diff line change
@@ -1,67 +1,67 @@
from typing import Iterable, Union

CONTROL_CODES = {
b'0' : b'\0',
b'a' : b'\x07', # alert
b'b' : b'\x08', # backspace
b'f' : b'\x0C', # form feed
b'n' : b'\x0A', # newline (line feed)
b'r' : b'\x0D', # carriage return
b't' : b'\x09', # horizontal tab
b'v' : b'\x0B', # vertical tab
b'"' : b'\x22', # double quote
b'&' : b'', # empty string
b'\'' : b'\x27', # single quote
b'\\' : b'\x5C', # backslash
b'NUL' : b'\0', # null character
b'SOH' : b'\x01', # start of heading
b'STX' : b'\x02', # start of text
b'ETX' : b'\x03', # end of text
b'EOT' : b'\x04', # end of transmission
b'ENQ' : b'\x05', # enquiry
b'ACK' : b'\x06', # acknowledge
b'BEL' : b'\x07', # bell
b'BS' : b'\x08', # backspace
b'HT' : b'\x09', # horizontal tab
b'LF' : b'\x0A', # line feed (newline)
b'VT' : b'\x0B', # vertical tab
b'FF' : b'\x0C', # form feed
b'CR' : b'\x0D', # carriage return
b'SO' : b'\x0E', # shift out
b'SI' : b'\x0F', # shift in
b'DLE' : b'\x10', # data link escape
b'DC1' : b'\x11', # device control 1
b'DC2' : b'\x12', # device control 2
b'DC3' : b'\x13', # device control 3
b'DC4' : b'\x14', # device control 4
b'NAK' : b'\x15', # negative acknowledge
b'SYN' : b'\x16', # synchronous idle
b'ETB' : b'\x17', # end of transmission block
b'CAN' : b'\x18', # cancel
b'EM' : b'\x19', # end of medium
b'SUB' : b'\x1A', # substitute
b'ESC' : b'\x1B', # escape
b'FS' : b'\x1C', # file separator
b'GS' : b'\x1D', # group separator
b'RS' : b'\x1E', # record separator
b'US' : b'\x1F', # unit separator
b'SP' : b'\x20', # space
b'DEL' : b'\x7F', # delete
b'^@' : b'\0',
b'^[' : b'\x1B', # escape
b'^\\' : b'\x1C', # file separator
b'^]' : b'\x1D', # group separator
b'^^' : b'\x1E', # record separator
b'^_' : b'\x1F', # unit separator
b"0": b"\0",
b"a": b"\x07", # alert
b"b": b"\x08", # backspace
b"f": b"\x0C", # form feed
b"n": b"\x0A", # newline (line feed)
b"r": b"\x0D", # carriage return
b"t": b"\x09", # horizontal tab
b"v": b"\x0B", # vertical tab
b'"': b"\x22", # double quote
b"&": b"", # empty string
b"'": b"\x27", # single quote
b"\\": b"\x5C", # backslash
b"NUL": b"\0", # null character
b"SOH": b"\x01", # start of heading
b"STX": b"\x02", # start of text
b"ETX": b"\x03", # end of text
b"EOT": b"\x04", # end of transmission
b"ENQ": b"\x05", # enquiry
b"ACK": b"\x06", # acknowledge
b"BEL": b"\x07", # bell
b"BS": b"\x08", # backspace
b"HT": b"\x09", # horizontal tab
b"LF": b"\x0A", # line feed (newline)
b"VT": b"\x0B", # vertical tab
b"FF": b"\x0C", # form feed
b"CR": b"\x0D", # carriage return
b"SO": b"\x0E", # shift out
b"SI": b"\x0F", # shift in
b"DLE": b"\x10", # data link escape
b"DC1": b"\x11", # device control 1
b"DC2": b"\x12", # device control 2
b"DC3": b"\x13", # device control 3
b"DC4": b"\x14", # device control 4
b"NAK": b"\x15", # negative acknowledge
b"SYN": b"\x16", # synchronous idle
b"ETB": b"\x17", # end of transmission block
b"CAN": b"\x18", # cancel
b"EM": b"\x19", # end of medium
b"SUB": b"\x1A", # substitute
b"ESC": b"\x1B", # escape
b"FS": b"\x1C", # file separator
b"GS": b"\x1D", # group separator
b"RS": b"\x1E", # record separator
b"US": b"\x1F", # unit separator
b"SP": b"\x20", # space
b"DEL": b"\x7F", # delete
b"^@": b"\0",
b"^[": b"\x1B", # escape
b"^\\": b"\x1C", # file separator
b"^]": b"\x1D", # group separator
b"^^": b"\x1E", # record separator
b"^_": b"\x1F", # unit separator
}

for i in range(26):
CONTROL_CODES[bytes([ord('^'), ord('A') + i])] = bytes([i + 1])
CONTROL_CODES[bytes([ord("^"), ord("A") + i])] = bytes([i + 1])


def decode(text: Union[str, bytes, Iterable[int]]) -> bytes:
escaped = None
ret = b''
ret = b""
for c in text:
if isinstance(c, str):
c = ord(c)
Expand All @@ -84,8 +84,8 @@ def decode(text: Union[str, bytes, Iterable[int]]) -> bytes:
except ValueError:
pass
raise ValueError(f"Unknown escape sequence: {escaped!r}")
elif c == b'\\':
escaped = b''
elif c == b"\\":
escaped = b""
else:
ret += c
return ret
Loading

0 comments on commit 0f0ad91

Please sign in to comment.