Merge branch 'master' of github.com:rocky/python-uncompyle6

__pkginfo__.py

@@ -98,6 +98,6 @@ def read(*rnames):
     return open(os.path.join(srcdir, *rnames)).read()
 
 
-# Get info from files; set: long_description and VERSION
+# Get info from files; set: long_description and __version__
 long_description = read("README.rst") + "\n"
 exec(read("uncompyle6/version.py"))

setup.py

@@ -29,7 +29,7 @@ from __pkginfo__ import (
     modname,
     py_modules,
     short_desc,
-    VERSION,
+    __version__,
     web,
     zip_safe,
 )
@@ -52,6 +52,6 @@ setup(
     test_suite="nose.collector",
     url=web,
     tests_require=["nose>=1.0"],
-    version=VERSION,
+    version=__version__,
     zip_safe=zip_safe,
 )

uncompyle6/__init__.py

@@ -30,10 +30,7 @@ import sys
 
 __docformat__ = "restructuredtext"
 
-from uncompyle6.version import VERSION
+from uncompyle6.version import __version__
-
-# This ensures VERSION will appear in pydoc
-__version__  = VERSION
 
 PYTHON3 = sys.version_info >= (3, 0)
 

uncompyle6/bin/pydisassemble.py

@@ -1,13 +1,13 @@
 #!/usr/bin/env python
 # Mode: -*- python -*-
 #
-# Copyright (c) 2015-2016, 2018 by Rocky Bernstein <rb@dustyfeet.com>
+# Copyright (c) 2015-2016, 2018, 2020 by Rocky Bernstein <rb@dustyfeet.com>
 #
 from __future__ import print_function
 import sys, os, getopt
 
 from uncompyle6.disas import disassemble_file
-from uncompyle6.version import VERSION
+from uncompyle6.version import __version__
 
 program, ext = os.path.splitext(os.path.basename(__file__))
 
@@ -58,7 +58,7 @@ Type -h for for full help.""" % program
             print(__doc__)
             sys.exit(1)
         elif opt in ('-V', '--version'):
-            print("%s %s" % (program, VERSION))
+            print("%s %s" % (program, __version__))
             sys.exit(0)
         else:
             print(opt)

uncompyle6/bin/uncompile.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # Mode: -*- python -*-
 #
-# Copyright (c) 2015-2017, 2019 by Rocky Bernstein
+# Copyright (c) 2015-2017, 2019-2020 by Rocky Bernstein
 # Copyright (c) 2000-2002 by hartmut Goebel <h.goebel@crazy-compilers.com>
 #
 from __future__ import print_function
@@ -63,7 +63,7 @@ program = 'uncompyle6'
 
 from uncompyle6 import verify
 from uncompyle6.main import main, status_msg
-from uncompyle6.version import VERSION
+from uncompyle6.version import __version__
 
 def usage():
     print(__doc__)
@@ -105,7 +105,7 @@ def main_bin():
             print(__doc__)
             sys.exit(0)
         elif opt in ('-V', '--version'):
-            print("%s %s" % (program, VERSION))
+            print("%s %s" % (program, __version__))
             sys.exit(0)
         elif opt == '--verify':
             options['do_verify'] = 'strong'

uncompyle6/main.py

@@ -20,7 +20,7 @@ from xdis import iscode, sysinfo2float
 from uncompyle6.disas import check_object_path
 from uncompyle6.semantics import pysource
 from uncompyle6.parser import ParserError
-from uncompyle6.version import VERSION
+from uncompyle6.version import __version__
 
 # from uncompyle6.linenumbers import line_number_mapping
 
@@ -91,7 +91,7 @@ def decompile(
         "# uncompyle6 version %s\n"
         "# %sPython bytecode %s%s\n# Decompiled from: %sPython %s"
         % (
-            VERSION,
+            __version__,
             co_pypy_str,
             bytecode_version,
             " (%s)" % str(magic_int) if magic_int else "",

uncompyle6/version.py

@@ -12,6 +12,5 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # This file is suitable for sourcing inside POSIX shell as
-# well as importing into Python. That's why there is no
+# well as importing into Python
-# space around "=" below.
+__version__="3.7.4"  # noqa
-VERSION="3.7.4"  # noqa