From b8fa3005dd0dd55cb523c9bb5a1b56b2243125b6 Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Thu, 8 Mar 2018 20:37:34 +0100 Subject: [PATCH] rclkar/python3: small simplifications --- src/filters/rclkar | 6 ++---- src/filters/rclmidi.py | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/filters/rclkar b/src/filters/rclkar index 677d0a4b..d6570dd5 100755 --- a/src/filters/rclkar +++ b/src/filters/rclkar @@ -43,14 +43,12 @@ htmltemplate = ''' ''' +nlbytes = b'\n' +bsbytes = b'\\' PY3 = sys.version > '3' if PY3: - nlbytes = bytes('\n', encoding='iso-8859-1') - bsbytes = bytes('\\', encoding='iso-8859-1') nullchar = 0 else: - nlbytes = '\n' - bsbytes = '\\' nullchar = chr(0) class KarTextExtractor: diff --git a/src/filters/rclmidi.py b/src/filters/rclmidi.py index 4cdc06f6..c0ebedb7 100755 --- a/src/filters/rclmidi.py +++ b/src/filters/rclmidi.py @@ -39,8 +39,7 @@ if PY3: def next_byte_as_int(data): return next(data) def next_byte_as_char(data): - ret = bytes([next(data)]) - return ret + return bytes([next(data)]) else: def next_byte_as_int(data): return ord(data.next())