jinx/python-uncompyle6
1
Fork 0
mirror of https://github.com/rocky/python-uncompyle6.git synced 2025-08-03 00:45:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

xdis PYTHON_VERSION removal

Browse Source
This commit is contained in:
rocky
2023-02-26 19:29:08 -05:00
parent 18b5934b2d
commit a20972dd12
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
test/test_pythonlib.py
View File

@@ -29,11 +29,18 @@ Step 2: Run the test:
from __future__ import print_function from __future__ import print_function
import getopt, os, py_compile, sys, shutil, tempfile, time import getopt
import os
import py_compile
import shutil
import sys
import tempfile
import time
from fnmatch import fnmatch from fnmatch import fnmatch
from xdis.version_info import PYTHON_VERSION_TRIPLE
from uncompyle6.main import main from uncompyle6.main import main
from xdis.version_info import PYTHON_VERSION
def get_srcdir(): def get_srcdir():
@@ -164,10 +171,10 @@ def do_tests(src_dir, obj_patterns, target_dir, opts):
if opts["do_compile"]: if opts["do_compile"]:
compiled_version = opts["compiled_version"] compiled_version = opts["compiled_version"]
if compiled_version and PYTHON_VERSION != compiled_version: if compiled_version and PYTHON_VERSION_TRIPLE != compiled_version:
print( print(
"Not compiling: desired Python version is %s but we are running %s" "Not compiling: desired Python version is %s but we are running %s"
% (compiled_version, PYTHON_VERSION), % (compiled_version, PYTHON_VERSION_TRIPLE),
file=sys.stderr, file=sys.stderr,
) )
else: else:

4
uncompyle6/util.py
View File

@@ -3,7 +3,7 @@
# More could be done here though. # More could be done here though.
from math import copysign from math import copysign
from xdis.version_info import PYTHON_VERSION from xdis.version_info import PYTHON_VERSION_TRIPLE
def is_negative_zero(n): def is_negative_zero(n):
@@ -36,7 +36,7 @@ def better_repr(v, version):
if len(v) == 1: if len(v) == 1:
return "(%s,)" % better_repr(v[0], version) return "(%s,)" % better_repr(v[0], version)
return "(%s)" % ", ".join(better_repr(i, version) for i in v) return "(%s)" % ", ".join(better_repr(i, version) for i in v)
elif PYTHON_VERSION < 3.0 and isinstance(v, long): elif PYTHON_VERSION_TRIPLE < (3, 0) and isinstance(v, long):
s = repr(v) s = repr(v)
if version >= 3.0 and s[-1] == "L": if version >= 3.0 and s[-1] == "L":
return s[:-1] return s[:-1]