From d138a01bf1ec51bf919986a1c77efe3853c85d9b Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Mon, 17 Jul 2017 22:42:57 -0400
Subject: [PATCH] xdis's "exception match" is now "exception-match"

---
 __pkginfo__.py                   | 3 +--
 uncompyle6/scanners/scanner2.py  | 2 +-
 uncompyle6/scanners/scanner3.py  | 2 +-
 uncompyle6/scanners/scanner30.py | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/__pkginfo__.py b/__pkginfo__.py
index 53a636aa..453e3c08 100644
--- a/__pkginfo__.py
+++ b/__pkginfo__.py
@@ -40,8 +40,7 @@ entry_points       = {
     ]}
 ftp_url            = None
 install_requires   = ['spark-parser >= 1.6.1, < 1.7.0',
-                      # 'xdis >= 3.5.1, < 3.6.0', 'six']
-                      'xdis == 3.5.0', 'six']
+                      'xdis >= 3.5.1, < 3.6.0', 'six']
 license            = 'MIT'
 mailing_list       = 'python-debugger@googlegroups.com'
 modname            = 'uncompyle6'
diff --git a/uncompyle6/scanners/scanner2.py b/uncompyle6/scanners/scanner2.py
index cc20d5b8..66957a47 100644
--- a/uncompyle6/scanners/scanner2.py
+++ b/uncompyle6/scanners/scanner2.py
@@ -452,7 +452,7 @@ class Scanner2(Scanner):
                     self.not_continue.add(jmp)
                     jmp = self.get_target(jmp)
                     prev_offset = self.prev[except_match]
-                    # COMPARE_OP argument should be "exception match" or 10
+                    # COMPARE_OP argument should be "exception-match" or 10
                     if (self.code[prev_offset] == self.opc.COMPARE_OP and
                         self.code[prev_offset+1] != 10):
                         return None
diff --git a/uncompyle6/scanners/scanner3.py b/uncompyle6/scanners/scanner3.py
index eef3ffd5..cb30e8fc 100644
--- a/uncompyle6/scanners/scanner3.py
+++ b/uncompyle6/scanners/scanner3.py
@@ -921,7 +921,7 @@ class Scanner3(Scanner):
                 # except block return
                 jump_prev = prev_op[offset]
                 if self.is_pypy and code[jump_prev] == self.opc.COMPARE_OP:
-                    if self.opc.cmp_op[code[jump_prev+1]] == 'exception match':
+                    if self.opc.cmp_op[code[jump_prev+1]] == 'exception-match':
                         return
                 if self.version >= 3.5:
                     # Python 3.5 may remove as dead code a JUMP
diff --git a/uncompyle6/scanners/scanner30.py b/uncompyle6/scanners/scanner30.py
index 4f607087..51bb7c16 100644
--- a/uncompyle6/scanners/scanner30.py
+++ b/uncompyle6/scanners/scanner30.py
@@ -295,7 +295,7 @@ class Scanner30(Scanner3):
                 # except block return
                 jump_prev = prev_op[offset]
                 if self.is_pypy and code[jump_prev] == self.opc.COMPARE_OP:
-                    if self.opc.cmp_op[code[jump_prev+1]] == 'exception match':
+                    if self.opc.cmp_op[code[jump_prev+1]] == 'exception-match':
                         return
                 if self.version >= 3.5:
                     # Python 3.5 may remove as dead code a JUMP