remove double-quote preference here....

it is now done in xdis which is where it is better done
This commit is contained in:
rocky
2024-02-18 08:21:07 -05:00
parent 40c4764492
commit 3e00880c1b
3 changed files with 2 additions and 14 deletions

View File

@@ -649,16 +649,6 @@ def get_scanner(version: Union[str, tuple], is_pypy=False, show_asm=None) -> Sca
return scanner 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__": if __name__ == "__main__":
import inspect import inspect

View File

@@ -46,7 +46,7 @@ from xdis import Instruction, instruction_size, iscode
from xdis.bytecode import _get_const_info from xdis.bytecode import _get_const_info
from xdis.opcodes.opcode_3x import parse_fn_counts_30_35 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.scanners.tok import Token
from uncompyle6.util import get_code_name from uncompyle6.util import get_code_name
@@ -612,7 +612,6 @@ class Scanner3(Scanner):
pattr = "<code_object " + co_name + ">" pattr = "<code_object " + co_name + ">"
elif isinstance(const, str): elif isinstance(const, str):
opname = "LOAD_STR" opname = "LOAD_STR"
pattr = prefer_double_quote(inst.argrepr)
else: else:
if isinstance(inst.arg, int) and inst.arg < len(co.co_consts): if isinstance(inst.arg, int) and inst.arg < len(co.co_consts):
argval, _ = _get_const_info(inst.arg, co.co_consts) argval, _ = _get_const_info(inst.arg, co.co_consts)

View File

@@ -39,7 +39,7 @@ import xdis.opcodes.opcode_37 as op3
from xdis import Instruction, instruction_size, iscode from xdis import Instruction, instruction_size, iscode
from xdis.bytecode import _get_const_info 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) globals().update(op3.opmap)
@@ -386,7 +386,6 @@ class Scanner37Base(Scanner):
pattr = "<code_object " + const.co_name + ">" pattr = "<code_object " + const.co_name + ">"
elif isinstance(const, str): elif isinstance(const, str):
opname = "LOAD_STR" opname = "LOAD_STR"
pattr = prefer_double_quote(inst.argrepr)
else: else:
if isinstance(inst.arg, int) and inst.arg < len(co.co_consts): if isinstance(inst.arg, int) and inst.arg < len(co.co_consts):
argval, _ = _get_const_info(inst.arg, co.co_consts) argval, _ = _get_const_info(inst.arg, co.co_consts)