From 19bd82a6df922832cd2f9177c84da5549a5203ba Mon Sep 17 00:00:00 2001
From: Charles G Waldman <cgw@alum.mit.edu>
Date: Sun, 4 Oct 2026 17:28:23 -0500
Subject: [PATCH] fix for issue 528 - quoting string literals in list/dict/set

---
 test/bytecode_2.7_run/05_string_constants.pyc | Bin 0 -> 466 bytes
 test/bytecode_3.6_run/05_string_constants.pyc | Bin 0 -> 394 bytes
 .../bug27+/05_string_constants.py             |  13 +++++++++
 uncompyle6/semantics/n_actions.py             |  27 +++++++++++++-----
 4 files changed, 33 insertions(+), 7 deletions(-)
 create mode 100644 test/bytecode_2.7_run/05_string_constants.pyc
 create mode 100644 test/bytecode_3.6_run/05_string_constants.pyc
 create mode 100644 test/simple_source/bug27+/05_string_constants.py

diff --git a/test/bytecode_2.7_run/05_string_constants.pyc b/test/bytecode_2.7_run/05_string_constants.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..0bc8f9e130e2df166264bfb4bebb3495942579e4
GIT binary patch
literal 466
zcmZvYu};G<5QfibnubCPVn9NbP}#x&Wg#pGfdm_3DN~jx%DJg&lT@}VV57VOJ2M@4
z3EqI`U;v37aTgV_5GkLX|305jseQGYPj9c+DJ-4_tta%F7XkuAL;;ZibO39BE?^zd
z18e~LkToE3KvA;9LWoV4LR@Am#1+;;Y_S?fbo##@L+aszq*5C;NgO#~W?<{^K$rR;
zT^M;_9v6wEE<Sm!%A5astI!YDc<e30)lix4M3<RP@-A(S91nKWp-e}r$hMUrMSU=y
z8Q+YM@y@s>SeG!+64fV1bH*WKMxe<6ZqztWlt;VEfNA-^#W9v?99zENw&F#_vx<G&
zru@_xsjVuDbFE7qPy&B29s2CqeA3%Lh>g`WZk(2du}NXg-sH~uR6oi~oQ~x&&uF-%
P=Xjzcc0|Y75bNRxiqKgO

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.6_run/05_string_constants.pyc b/test/bytecode_3.6_run/05_string_constants.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..70d68321e50b73adc23d8cb5e6825cf29b85f2c4
GIT binary patch
literal 394
zcmY+<J4*vW5C`zxy}gGq7tdfLg2Xa~Mi8|TQBZ7xO)TV^Biw9qXYLVpPkdDB=MZc2
zHT(v)+gcqKT3d*-R=Ti1{=>||?3V90o?c%rPADO7<j-+2AK+CP0wg3rLkbKm;9!FT
zE_h=%WH1K}n1?3#(0a5(>;FXJhFmaMSSH|2nCe&d0|ig;iKEU<78ZEe^Rbuw_JRTF
zF5a%5C8_F6WjU6^yn|7RY_uLHBA%qhc&)}=N&R7XHhdd)4DW_JMDvjpP=A_wX4o~{
zBcXkjX8EvdONN!S47S01Sb9k9Ag5hNyHNyX97UR5YueZJNYjCC9V#Vcm6pY^l%<>z
zxnv$1zE*lwKJ9I8N2-#zXcU))s)j|SHl{b)+sjM1%)~y&QPn~?<Fri!+GYW5(jU;W
BV&nh-

literal 0
HcmV?d00001

diff --git a/test/simple_source/bug27+/05_string_constants.py b/test/simple_source/bug27+/05_string_constants.py
new file mode 100644
index 000000000..453a90161
--- /dev/null
+++ b/test/simple_source/bug27+/05_string_constants.py
@@ -0,0 +1,13 @@
+# See https://github.com/rocky/python-uncompyle6/issues/528
+# RUNNABLE!
+
+"""This program is self-checking!"""
+
+x = 1
+L = [239, 168, 254, 54, 235, 128, "fred"]
+D = {239: 240, 168:169, 54:55, 128:129, "fred":"wilma"}
+S = {239, 168, 254, 54, 235, 128, "fred"}
+
+assert L[6] == "fred"
+assert "fred" in S
+assert D["fred"] == "wilma"
diff --git a/uncompyle6/semantics/n_actions.py b/uncompyle6/semantics/n_actions.py
index 9234cea0f..8addb26f7 100644
--- a/uncompyle6/semantics/n_actions.py
+++ b/uncompyle6/semantics/n_actions.py
@@ -206,6 +206,22 @@ def n_classdef(self, node: SyntaxTree):
 
     n_classdefdeco2 = n_classdef
 
+    def format_const(self, elem):
+        """
+        Render one constant collection element (ADD_VALUE) to source text.
+
+        On 3.x the scanner already stores the element's source form (its
+        argrepr) in pattr, so emit that directly. On 2.x pattr holds the raw
+        value, so format it the way n_LOAD_CONST does. elem.attr is the
+        co_consts index on 2.x and must never be emitted as the value.
+        """
+        if self.version >= (3, 0):
+            return elem.pattr
+        data = elem.pattr
+        if isinstance(data, (float, complex)):
+            return better_repr(data, self.version)
+        return repr(data)
+
     def n_const_list(self, node: SyntaxTree):
         """
         prettyprint a constant dict, list, set or tuple.
@@ -242,13 +258,10 @@ def n_const_list(self, node: SyntaxTree):
                 assert elem.kind == "ADD_VALUE"
                 if elem.optype in ("local", "name"):
                     value = elem.attr
-                elif elem.optype == "const" and not isinstance(elem.attr, str):
-                    value = elem.attr
+                elif elem.optype == "const":
+                    value = self.format_const(elem)
                 else:
-                    try:
-                        value = "%r" % elem.pattr
-                    except Exception:
-                        value = elem.pattr
+                    value = elem.pattr
                 if elem.linestart is not None:
                     if elem.linestart != self.line_number:
                         next_indent = self.indent + INDENT_PER_LEVEL[:-1]
@@ -276,7 +289,7 @@ def n_const_list(self, node: SyntaxTree):
                     if elem.optype in ("local", "name"):
                         value = elem.attr
                     elif elem.optype == "const":
-                        value = elem.pattr
+                        value = self.format_const(elem)
                     else:
                         value = "%s" % repr(elem.attr)
                 else: