Fix else detection bug in Python 3.6+

Author: rocky

__pkginfo__.py

@@ -57,7 +57,7 @@
     ]}
 ftp_url            = None
 install_requires   = ['spark-parser >= 1.8.7, < 1.9.0',
-                      'xdis >= 3.8.10, < 3.9.0']
+                      'xdis >= 3.9.0, < 3.10.0']
 
 license            = 'GPL3'
 mailing_list       = '[email protected]'

uncompyle6/scanners/scanner3.py

@@ -609,7 +609,9 @@ def detect_control_flow(self, offset, targets, inst_index):
         """
 
         code = self.code
-        op = self.insts[inst_index].opcode
+        inst = self.insts[inst_index]
+        op = inst.opcode
+
 
         # Detect parent structure
         parent = self.structs[0]
@@ -632,7 +634,7 @@ def detect_control_flow(self, offset, targets, inst_index):
             # Try to find the jump_back instruction of the loop.
             # It could be a return instruction.
 
-            start += instruction_size(op, self.opc)
+            start += inst.inst_size
             target = self.get_target(offset)
             end    = self.restrict_to_parent(target, parent)
             self.setup_loops[target] = offset
@@ -718,8 +720,8 @@ def detect_control_flow(self, offset, targets, inst_index):
                                      'start': after_jump_offset,
                                      'end':   end})
         elif op in self.pop_jump_tf:
-            start   = offset + instruction_size(op, self.opc)
-            target  = self.insts[inst_index].argval
+            start   = offset + inst.inst_size
+            target  = inst.argval
             rtarget = self.restrict_to_parent(target, parent)
             prev_op = self.prev_op
 
@@ -757,7 +759,7 @@ def detect_control_flow(self, offset, targets, inst_index):
             pre_rtarget = prev_op[rtarget]
 
             # Is it an "and" inside an "if" or "while" block
-            if op == self.opc.POP_JUMP_IF_FALSE and self.version < 3.6:
+            if op == self.opc.POP_JUMP_IF_FALSE:
 
                 # Search for another POP_JUMP_IF_FALSE targetting the same op,
                 # in current statement, starting from current offset, and filter