From df79fc120ed82fd9f4dbb368f6e6a758366e6826 Mon Sep 17 00:00:00 2001 From: rocky Date: Sat, 9 Nov 2024 06:07:58 -0500 Subject: [PATCH] Merge hell --- uncompyle6/semantics/helper.py | 3 --- uncompyle6/semantics/n_actions.py | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/uncompyle6/semantics/helper.py b/uncompyle6/semantics/helper.py index e945ea56..73bf7f6b 100644 --- a/uncompyle6/semantics/helper.py +++ b/uncompyle6/semantics/helper.py @@ -181,9 +181,6 @@ def is_lambda_mode(compile_mode): def print_docstring(self, indent, docstring): - if isinstance(docstring, bytes): - docstring = docstring.decode("utf8", errors="backslashreplace") - quote = '"""' if docstring.find(quote) >= 0: if docstring.find("'''") == -1: diff --git a/uncompyle6/semantics/n_actions.py b/uncompyle6/semantics/n_actions.py index 2a529800..62da6190 100644 --- a/uncompyle6/semantics/n_actions.py +++ b/uncompyle6/semantics/n_actions.py @@ -26,7 +26,7 @@ from uncompyle6.semantics.consts import ( PRECEDENCE, minint, ) -from uncompyle6.semantics.helper import find_code_node, flatten_list +from uncompyle6.semantics.helper import find_code_node, flatten_list, print_docstring from uncompyle6.util import better_repr