Get ready for release 2.11.3

need xdis 3.5.1 for now. Adjust for xdis "is-not" which we need as "is not"

ChangeLog

@@ -1,7 +1,46 @@
+2017-08-09  rocky <rb@dustyfeet.com>
+
+	* README.rst, __pkginfo__.py, uncompyle6/version.py: Get ready for
+	release 2.11.3
+
+2017-08-02  rocky <rb@dustyfeet.com>
+
+	* __pkginfo__.py: Revert commit to wrong branch
+
+2017-08-02  rocky <rb@dustyfeet.com>
+
+	* __pkginfo__.py: Remove six from Python-2.4/2.5 package
+
+2017-07-17  rocky <rb@dustyfeet.com>
+
+	* __pkginfo__.py, uncompyle6/scanners/scanner2.py,
+	uncompyle6/scanners/scanner3.py, uncompyle6/scanners/scanner30.py: 
+	xdis's "exception match" is now "exception-match"
+
+2017-07-15  rocky <rb@dustyfeet.com>
+
+	* __pkginfo__.py: xdis 3.5.1 is botched?
+
+2017-07-14  rocky <rb@dustyfeet.com>
+
+	* __pkginfo__.py: Use newer xdis
+
+2017-07-14  R. Bernstein <rocky@users.noreply.github.com>
+
+	* README.rst: Fixes issue #124
+
+2017-07-14  rocky <rb@dustyfeet.com>
+
+	* HISTORY.md: History updates
+
 2017-07-09  rocky <rb@dustyfeet.com>
 
-	* HOW-TO-REPORT-A-BUG.md, uncompyle6/version.py: Get ready for
-	release 2.11.2
+	* README.rst: RsT doc formatting
+
+2017-07-09  rocky <rb@dustyfeet.com>
+
+	* ChangeLog, HOW-TO-REPORT-A-BUG.md, NEWS, uncompyle6/version.py: 
+	Get ready for release 2.11.2
 
 2017-07-08  rocky <rb@dustyfeet.com>
 

NEWS

@@ -1,3 +1,12 @@
+uncompyle6 2.11.2 2017-08-09
+
+Very minor changes
+
+- RsT doc fixes and updates
+- use newer xdis, but not too new; 3.5.2 breaks uncompyle6
+- use xdis opcode sets
+- xdis "exception match" is now "exception-match"
+
 uncompyle6 2.11.2 2017-07-09
 
 - Start supporting Pypy 3.5 (5.7.1-beta)

README.rst

@@ -172,6 +172,9 @@ See Also
 * https://github.com/figment/unpyc3/ : fork of above, but supports Python 3.3 only. Include some fixes like supporting function annotations
 * The HISTORY_ file.
 * `How to report a bug <https://github.com/rocky/python-uncompyle6/blob/master/HOW-TO-REPORT-A-BUG.md>`_
+* https://github.com/rocky/python-xdis : Cross Python version disassembler
+* https://github.com/rocky/python-xasm : Cross Python version assembler
+
 
 .. _trepan: https://pypi.python.org/pypi/trepan
 .. _HISTORY: https://github.com/rocky/python-uncompyle6/blob/master/HISTORY.md

__pkginfo__.py

@@ -40,7 +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.1', 'six']
 license            = 'MIT'
 mailing_list       = 'python-debugger@googlegroups.com'
 modname            = 'uncompyle6'

uncompyle6/semantics/consts.py

@@ -176,7 +176,7 @@ TABLE_DIRECT = {
     'ret_cond_not':  ( '%p if not %p else %p', (2, 27), (0, 22), (-1, 27)),
     'conditional_lambda':  ( '(%c if %c else %c)', 2, 0, 3),
     'return_lambda':    ('%c', 0),
-    'compare':		( '%p %[-1]{pattr} %p', (0, 19), (1, 19) ),
+    'compare':		( '%p %[-1]{pattr.replace("-", " ")} %p', (0, 19), (1, 19) ),
     'cmp_list':		( '%p %p', (0, 29), (1, 30)),
     'cmp_list1':	( '%[3]{pattr} %p %p', (0, 19), (-2, 19)),
     'cmp_list2':	( '%[1]{pattr} %p', (0, 19)),

uncompyle6/version.py

@@ -1,3 +1,3 @@
 # This file is suitable for sourcing inside bash as
 # well as importing into Python
-VERSION='2.11.2'
+VERSION='2.11.3'