From 373916f57cc08ba2b1a7fe454deeab944bc4b737 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Sat, 9 Nov 2019 21:56:36 -0500
Subject: [PATCH] Pypy 3.5 tolerance

---
 test/bytecode_pypy3.5/00_assign.pyc   | Bin 0 -> 224 bytes
 test/bytecode_pypy3.5/00_import.pyc   | Bin 0 -> 484 bytes
 test/bytecode_pypy3.5/11_classbug.pyc | Bin 0 -> 589 bytes
 uncompyle6/parsers/parse35.py         |   8 +++++++-
 uncompyle6/parsers/parse36.py         |   8 +-------
 5 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 test/bytecode_pypy3.5/00_assign.pyc
 create mode 100644 test/bytecode_pypy3.5/00_import.pyc
 create mode 100644 test/bytecode_pypy3.5/11_classbug.pyc

diff --git a/test/bytecode_pypy3.5/00_assign.pyc b/test/bytecode_pypy3.5/00_assign.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..b6ad2b0aa26da7aae146fc0daacd213203064d18
GIT binary patch
literal 224
zcmX|&O$x#=5QSfoT13zT=m`p<UAPp{h1+i26`|B7O0jK9(kxsFUctL~3Rj+`2XI=%
zdAyH#^HXCydcHo#JAjP*FG1awY*z#c#6*UeL2|?#?->-J7!=1@Knh$rY=}nSK{pJC
zz-v8vjdZ1=e9nPD7|QqsuVoa{o~NE!JE6(WT4kDCS9@c$3DC(+X<_rSE>vQ*Gnrb3
cVUk*#U#dlYb3<CMOD$cYHiPceC-|(>7Z(yM=Kufz

literal 0
HcmV?d00001

diff --git a/test/bytecode_pypy3.5/00_import.pyc b/test/bytecode_pypy3.5/00_import.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..0198f100dc85c118445434d9a451df7351cca066
GIT binary patch
literal 484
zcmYjMO;3YB5PeHOthBWiFGlYs^nm@i8l!(e4|>|fkd|&!5DH<JL(iT(_;1&{vkRoM
zFz>yY*_lUyvHSXb_c3EYgny4i{E0sKLt#rVLkjSkJ4hKa2iyTOwT{v6O;-oJ+umT{
zy_WZpoPiG@&LLcUF_ZsvP=2=!LnI?4WAKYMGeI&%a*4zP_i(T--u!M%mhj>;-6bs6
zYVWgO@{gH+r8|W3D7EpQ%aS5&n~F1`d!!6m*tT3Q^pG-prHUX*V{uTrPr9LQQ);9c
zoQi`U5QgC{PDL2nf$LxsMB41%*jV$ezNL&*)owQrEG%kR*08dx>cWXGPjuzOoa)Am
uiL-+C$-F8faX+7jr1Me*#j!GW9<qE}rQ*^2v%H`%VpHa_Yc^q?<FP*`E@-&`

literal 0
HcmV?d00001

diff --git a/test/bytecode_pypy3.5/11_classbug.pyc b/test/bytecode_pypy3.5/11_classbug.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..6c38f89695b4a439ac4da83aeb6fcd6217130bd0
GIT binary patch
literal 589
zcmah`u};G<5Ix65Kvfn-U_fkMin=4j#zdDgRjMr4F{o17hFmgK>IQ;=4@2+^{D!mh
z&XEujL!I37+4t`Jd@kvz|IHt>cOvqz-_e721LG6GZBCRcdPx|Fo;6Js<rz(k_6h_U
zGVA0a>jDml!csKN=#A(hW#pP(v9D!kVtV6v45qyg%d&8FxC^!Og=6+|z6_c7U{aaS
z0X2R_TZqW$Govkhpr$WP3Nj}~jg5|y!c7^f3J%2sfVGR&qPEubq7?H5M=8E?%g_pa
z?l^EOq1@L-#Y1@3CN)T+<_v3IKxeSLZYm!xN24x0Zytx`rpiDNV*yg_De(WzhJSQ)
zvP6Nku`hJHT;~l=uyK%<PmL?Ocq(sH+tG@(cLj?sqpE#Scgq7Qy-|`kP^mFvlcgrq
Y8?;IYsE2Q7u|||%by~0G;aQS@0LqtxfdBvi

literal 0
HcmV?d00001

diff --git a/uncompyle6/parsers/parse35.py b/uncompyle6/parsers/parse35.py
index c6f8ccec..30db4fa7 100644
--- a/uncompyle6/parsers/parse35.py
+++ b/uncompyle6/parsers/parse35.py
@@ -144,9 +144,15 @@ class Python35Parser(Python34Parser):
         super(Python35Parser, self).customize_grammar_rules(tokens, customize)
         for i, token in enumerate(tokens):
             opname = token.kind
+            if opname == 'LOAD_ASSERT':
+                if 'PyPy' in customize:
+                    rules_str = """
+                    stmt ::= JUMP_IF_NOT_DEBUG stmts COME_FROM
+                    """
+                    self.add_unique_doc_rules(rules_str, customize)
             # FIXME: I suspect this is wrong for 3.6 and 3.5, but
             # I haven't verified what the 3.7ish fix is
-            if opname == 'BUILD_MAP_UNPACK_WITH_CALL':
+            elif opname == 'BUILD_MAP_UNPACK_WITH_CALL':
                 if self.version < 3.7:
                     self.addRule("expr ::= unmapexpr", nop_func)
                     nargs = token.attr % 256
diff --git a/uncompyle6/parsers/parse36.py b/uncompyle6/parsers/parse36.py
index d0518bbd..b644806a 100644
--- a/uncompyle6/parsers/parse36.py
+++ b/uncompyle6/parsers/parse36.py
@@ -188,13 +188,7 @@ class Python36Parser(Python35Parser):
         for i, token in enumerate(tokens):
             opname = token.kind
 
-            if opname == 'LOAD_ASSERT':
-                if 'PyPy' in customize:
-                    rules_str = """
-                    stmt ::= JUMP_IF_NOT_DEBUG stmts COME_FROM
-                    """
-                    self.add_unique_doc_rules(rules_str, customize)
-            elif opname == 'FORMAT_VALUE':
+            if opname == 'FORMAT_VALUE':
                 rules_str = """
                     expr              ::= formatted_value1
                     formatted_value1  ::= expr FORMAT_VALUE