From 3e00880c1b7018ac651988bb138247baa339e0df Mon Sep 17 00:00:00 2001 From: rocky Date: Sun, 18 Feb 2024 08:21:07 -0500 Subject: [PATCH] remove double-quote preference here.... it is now done in xdis which is where it is better done --- uncompyle6/scanner.py | 10 ---------- uncompyle6/scanners/scanner3.py | 3 +-- uncompyle6/scanners/scanner37base.py | 3 +-- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/uncompyle6/scanner.py b/uncompyle6/scanner.py index 87c42bf9..d6651836 100644 --- a/uncompyle6/scanner.py +++ b/uncompyle6/scanner.py @@ -649,16 +649,6 @@ def get_scanner(version: Union[str, tuple], is_pypy=False, show_asm=None) -> Sca return scanner -def prefer_double_quote(string: str) -> str: - """ - Prefer a double quoted string over a - single quoted string when possible - """ - if string[1:-1].find('"') == -1: - return f'"{string[1:-1]}"' - return string - - if __name__ == "__main__": import inspect diff --git a/uncompyle6/scanners/scanner3.py b/uncompyle6/scanners/scanner3.py index 6f8533e9..5ac4ab55 100644 --- a/uncompyle6/scanners/scanner3.py +++ b/uncompyle6/scanners/scanner3.py @@ -46,7 +46,7 @@ from xdis import Instruction, instruction_size, iscode from xdis.bytecode import _get_const_info from xdis.opcodes.opcode_3x import parse_fn_counts_30_35 -from uncompyle6.scanner import CONST_COLLECTIONS, Scanner, prefer_double_quote +from uncompyle6.scanner import CONST_COLLECTIONS, Scanner from uncompyle6.scanners.tok import Token from uncompyle6.util import get_code_name @@ -612,7 +612,6 @@ class Scanner3(Scanner): pattr = "" elif isinstance(const, str): opname = "LOAD_STR" - pattr = prefer_double_quote(inst.argrepr) else: if isinstance(inst.arg, int) and inst.arg < len(co.co_consts): argval, _ = _get_const_info(inst.arg, co.co_consts) diff --git a/uncompyle6/scanners/scanner37base.py b/uncompyle6/scanners/scanner37base.py index 69e010ea..01ded28a 100644 --- a/uncompyle6/scanners/scanner37base.py +++ b/uncompyle6/scanners/scanner37base.py @@ -39,7 +39,7 @@ import xdis.opcodes.opcode_37 as op3 from xdis import Instruction, instruction_size, iscode from xdis.bytecode import _get_const_info -from uncompyle6.scanner import Scanner, Token, prefer_double_quote +from uncompyle6.scanner import Scanner, Token globals().update(op3.opmap) @@ -386,7 +386,6 @@ class Scanner37Base(Scanner): pattr = "" elif isinstance(const, str): opname = "LOAD_STR" - pattr = prefer_double_quote(inst.argrepr) else: if isinstance(inst.arg, int) and inst.arg < len(co.co_consts): argval, _ = _get_const_info(inst.arg, co.co_consts)