From edbab038ca1e9d078b6e99ce38d253e8ad251e8f Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Thu, 12 Apr 2018 17:59:39 -0400
Subject: [PATCH] Fix improper 3.0 class handling...

... is like 3.1 not 2.7
---
 test/bytecode_3.0/10_classdec.pyc     | Bin 0 -> 1267 bytes
 test/bytecode_3.1/10_classdec.pyc     | Bin 1056 -> 1267 bytes
 test/simple_source/def/10_classdec.py |   4 ++++
 uncompyle6/semantics/customize3.py    |   2 ++
 uncompyle6/semantics/pysource.py      |   4 ++--
 5 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 test/bytecode_3.0/10_classdec.pyc

diff --git a/test/bytecode_3.0/10_classdec.pyc b/test/bytecode_3.0/10_classdec.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..9cfb71f5ba5855d3b85b522ca20f41f34339ebf9
GIT binary patch
literal 1267
zcmb_bO>fgc5S_J?whk#&s>Bg-%mGmlM-W1-O1U(ba>19CS#N}q9amYeM5Xo={$DTs
zLA<wX+N2eTNUXf;@$7uQH-0<b9lg1^&W)_BEyy3R-De!7$WM`6#6nh5CbCR|oXS$k
zNjczkITWj88C1~buz(%hQdn#Si*5Sl11WdpY?2}HZOQ~63i|}x?czWh#Jo~+sbI_N
zsi6TE-`r=|Zh+$w@`Re{1cwCCr;tqTqK0b!9EYo#^V(|H`h~FvrJWtTex*%aI9FQp
z^8CU-f>GhSZ|y?Q{M?M`!}OwJB+8!J-e_Jl*4_8oG%3-J@t8jJBq~chlbzbo%BQLc
z?=P)i1A=WH(&+^b0C5bCa&QzW0|_ag2q$PEGaw)VU;&`}m>w|{F-3rfnDWBedbVkQ
zJMh!Gnpd6H`-~A0H4twXEBRw~T5Xz?W8}J`tBh_e2rZvd5i+OK$q*kt)<p`n_9JMt
zZrajgKy-f>YYv3RSTU4;5IhcDj8V6ysGZiER=kZ0PA`r)jeD$>V=+pzG*y1(YK?xP
z7U+KrVU7OZ?6Kj$HTu5_|7eTOFYGg<3m}hT(Y?9{{BF=a#rErWYr56uJRABEG`;5?
ch(Y?dznH|ni&VZ3zZ8kdhGVs_o@8123puUy^#A|>

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.1/10_classdec.pyc b/test/bytecode_3.1/10_classdec.pyc
index 25210a1786dad18c02f869760abe0c6f7d573a0e..2fe08c8d8cff79dba72effcc6b89ee9d8aea140f 100644
GIT binary patch
delta 193
zcmZ3$@tITJpNE&r_{#aHWCkR_24p(`adF5*d1o>A6gGwy28I-NhGr&)C>Dkk4u)V2
z&W#xs%m&GfP+cGzgq=XT_<%$W1A}WS149%eLka^>IY`b=gK6?}Ci%%`%pQtvsfi_}
wMX7Qi<xD_=i?Ng)NI`}DG*~AuX4d9G7MpyI*^Q42sD_i3hf$c3pOcdr0QGSoq5uE@

delta 75
zcmey&xqw67pNE&L&Mhk<nE?r~0oe{fT<kJY-kB|hjUiZrePe|MGqaxt%j66e?aA|5
R+;}*E3OHGL7=;=6IRWi)3*!I)

diff --git a/test/simple_source/def/10_classdec.py b/test/simple_source/def/10_classdec.py
index 76f58162..d808fb27 100644
--- a/test/simple_source/def/10_classdec.py
+++ b/test/simple_source/def/10_classdec.py
@@ -25,3 +25,7 @@ class MyClass(object):
         pass
 
 x = MyClass()
+
+# Try class without parens
+class Feature:
+    pass
diff --git a/uncompyle6/semantics/customize3.py b/uncompyle6/semantics/customize3.py
index 029c34eb..51c220e6 100644
--- a/uncompyle6/semantics/customize3.py
+++ b/uncompyle6/semantics/customize3.py
@@ -32,6 +32,8 @@ def customize_for_version3(self, version):
         'store_locals': ( '%|# inspect.currentframe().f_locals = __locals__\n', ),
         })
 
+    assert version >= 3.0
+
     if version >= 3.3:
         def n_yield_from(node):
             self.write('yield from')
diff --git a/uncompyle6/semantics/pysource.py b/uncompyle6/semantics/pysource.py
index 51aae2ed..77a604ee 100644
--- a/uncompyle6/semantics/pysource.py
+++ b/uncompyle6/semantics/pysource.py
@@ -1234,7 +1234,7 @@ class SourceWalker(GenericASTTraversal, object):
         #             -----------
         # * subclass_code - the code for the subclass body
         subclass_info = None
-        if self.version > 3.0:
+        if self.version >= 3.0:
             if node == 'classdefdeco2':
                 if self.version >= 3.6:
                     class_name = node[1][1].pattr
@@ -1349,7 +1349,7 @@ class SourceWalker(GenericASTTraversal, object):
         self.currentclass = str(class_name)
         self.write(self.indent, 'class ', self.currentclass)
 
-        if self.version > 3.0:
+        if self.version >= 3.0:
             self.print_super_classes3(subclass_info)
         else:
             self.print_super_classes(build_list)