From fa9cc4c66951e94f3b03dc9f25120811a1e478ef Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Sat, 14 May 2022 19:28:23 -0400
Subject: [PATCH] Correct 2.5-7 relative import formatting

---
 test/bytecode_2.5/01_rel_import.pyc       | Bin 0 -> 254 bytes
 test/bytecode_2.6/01_rel_import.pyc       | Bin 0 -> 254 bytes
 test/bytecode_2.7/01_rel_import.pyc       | Bin 169 -> 254 bytes
 test/simple_source/stmts/01_rel_import.py |   2 ++
 uncompyle6/semantics/consts.py            |  13 +++++++++++--
 uncompyle6/semantics/customize25.py       |   6 ++++++
 uncompyle6/semantics/customize26_27.py    |   9 ++-------
 7 files changed, 21 insertions(+), 9 deletions(-)
 create mode 100644 test/bytecode_2.5/01_rel_import.pyc
 create mode 100644 test/bytecode_2.6/01_rel_import.pyc

diff --git a/test/bytecode_2.5/01_rel_import.pyc b/test/bytecode_2.5/01_rel_import.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..eff91378110247832659e5d8b683fe5aa1fe2cfe
GIT binary patch
literal 254
zcmX|(!485j42HWgj4?6cAvkanO+0uo#wYNAH!eijG=!0nbsY5MJNaflf!#1H>(~D6
z-+sR9ReE^W4g6nB`AmU(f~3!&1JDdg22660QP3PpK4}461X@5TNXKx^7PQzhLgwN8
z!P-1VZ28=asJa_78N8@(uS@2gjsl8+usscJ5q5n$n}I2n*!F`~6`IjDDo58l%(uJB
bDqYdUShpFTxFqATH*(bK<PV`BBrIV+?@1|l

literal 0
HcmV?d00001

diff --git a/test/bytecode_2.6/01_rel_import.pyc b/test/bytecode_2.6/01_rel_import.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d399eadf39f620be1c45f73b7b8585161e4a192f
GIT binary patch
literal 254
zcmX|(!485j42HWgj4?6cAvkanO+0uo#wYNAH!eijG=!0nbsY5MEBY!vf!#1H>(~D6
z-+sR9ReE^W4g6nB`AmU(f~3!&1JDdg22660QP3PpK4}461X@5TNXKx^7PQzhLgwN8
z!P-1VZ28=asJa_78N8@(uS@2gjsl8+usscJ5q5n$n}I2n*!F`~6`IjDDo58l%(uJB
bDqYdUShpFTZb`;tZ{(=e$sa;NNLa#t4K^v3

literal 0
HcmV?d00001

diff --git a/test/bytecode_2.7/01_rel_import.pyc b/test/bytecode_2.7/01_rel_import.pyc
index 46c146daab02d1d9fb5d434f56862be67c236fc9..8e516b37d9f7e119bca0fb21d232b8d1c44e3ec5 100644
GIT binary patch
literal 254
zcmYL>O$x#=5QQf{6%m9UqKmAof(sWSp1?)jbyJ!)N+BU7Nf)~E&R)PtDjG6h=1txk
z_Fk`w!%KGXJrv(Fmfs_KyaY6WAy5+_J%yenO`)c<=AaoE4mC%e!Bs3UI1q%02pK}!
z`{akXdY&=tZr1*VY@ZhqodFA~gp`g>*}5ua<5>LQ3vB&hMy(oeC)cUc2NQg`-8D|>
a27jyzoAD8rXgnI*Pg<SgBF_;y$;k&ptSHO?

delta 101
zcmeyzxRNn~`7<w<F4MfIWCkc;0@4mZTr2`4Qh<n&A%}q>myscgk%2LVi6K~n87Ps-
h2qZK>L<uX9NXkzyE%ws@=`8_bh9HKCD}7l&EC2`%4mtn;

diff --git a/test/simple_source/stmts/01_rel_import.py b/test/simple_source/stmts/01_rel_import.py
index 77293b59..1dafdc54 100644
--- a/test/simple_source/stmts/01_rel_import.py
+++ b/test/simple_source/stmts/01_rel_import.py
@@ -1,2 +1,4 @@
 # Tests relative imports
 from . import bogus
+from .. import foo
+from ..bar import baz
diff --git a/uncompyle6/semantics/consts.py b/uncompyle6/semantics/consts.py
index d094febf..e62d5ea5 100644
--- a/uncompyle6/semantics/consts.py
+++ b/uncompyle6/semantics/consts.py
@@ -476,8 +476,17 @@ TABLE_DIRECT = {
     "kv2": ("%c: %c", 1, 2),
     "import": ("%|import %c\n", 2),
     "importlist": ("%C", (0, maxint, ", ")),
-    "import_from": ("%|from %[2]{pattr} import %c\n", (3, "importlist")),
-    "import_from_star": ("%|from %[2]{pattr} import *\n",),
+
+    # Note: the below rule isn't really complete:
+    # n_import_from() smashes node[2].pattr
+    "import_from": (
+        "%|from %[2]{pattr} import %c\n",
+        (3, "importlist")
+     ),
+
+    "import_from_star": (
+        "%|from %[2]{pattr} import *\n",
+    ),
 }
 
 
diff --git a/uncompyle6/semantics/customize25.py b/uncompyle6/semantics/customize25.py
index 911997a9..886e9633 100644
--- a/uncompyle6/semantics/customize25.py
+++ b/uncompyle6/semantics/customize25.py
@@ -48,3 +48,9 @@ def customize_for_version25(self, version):
                 node[1][0][0][0].kind = 'tf_tryelsestmt'
         self.default(node)
     self.n_tryfinallystmt = tryfinallystmt
+
+    def n_import_from(node):
+        if node[0].pattr > 0:
+            node[2].pattr = ("." * node[0].pattr) + node[2].pattr
+        self.default(node)
+    self.n_import_from = n_import_from
diff --git a/uncompyle6/semantics/customize26_27.py b/uncompyle6/semantics/customize26_27.py
index 2e503c21..19196614 100644
--- a/uncompyle6/semantics/customize26_27.py
+++ b/uncompyle6/semantics/customize26_27.py
@@ -62,12 +62,7 @@ def customize_for_version26_27(self, version):
     self.n_call = n_call
 
     def n_import_from(node):
-        import_name = node[2]
-        if import_name == "IMPORT_NAME" and import_name.pattr == "":
-            fmt = "%|from . import %c\n"
-            self.template_engine(
-                (fmt, (3, "importlist")), node
-            )
-            self.prune()
+        if node[0].pattr > 0:
+            node[2].pattr = ("." * node[0].pattr) + node[2].pattr
         self.default(node)
     self.n_import_from = n_import_from