Merge branch 'python-3.0-to-3.2' into python-2.4-to-2.7

test/simple_source/bug26/.gitignore

@@ -0,0 +1 @@
+/.python-version

test/stdlib/2.4-exclude.sh

@@ -38,9 +38,10 @@ SKIP_TESTS=(
     [test_winreg.py]=1 # it fails on its own
     [test_winsound.py]=1 # it fails on its own
     [test_zlib.py]=1 # it fails on its own
-    [test_decimal.py]=1  # failes on its own - no module named test_support
+    [test_decimal.py]=1  # fails on its own - no module named test_support
+>>>>>>> python-3.0-to-3.2
     [test_dis.py]=1   # We change line numbers - duh!
-    [test_generators.py]=1  # Investigate
+    [test_generators.py]=1  # fails on its own - no module named test_support
     # [test_grammar.py]=1    # fails on its own - no module tests.test_support
     [test_grp.py]=1      # Long test - might work Control flow?
     [test_socketserver.py]=1 # -- test takes too long to run: 40 seconds

test/test_pyenvlib.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # emacs-mode: -*-python-*-
 """
-test_pyenvlib -- uncompyle and verify Python libraries
+test_pyenvlib -- decompile and verify Python libraries
 
 Usage-Examples:
 
@@ -20,12 +20,19 @@ Step 2: Run the test:
 	  test_pyenvlib --mylib --verify # decompile verify 'mylib'
 """
 
-import os, time, re, shutil, sys
+from __future__ import print_function
+import os
+import re
+import shutil
+import sys
+import time
+import time
 from fnmatch import fnmatch
 
-from uncompyle6 import main
 import xdis.magics as magics
 
+from uncompyle6 import main
+
 # ----- configure this for your needs
 
 python_versions = [v for v in magics.python_versions if re.match("^[0-9.]+$", v)]
@@ -79,6 +86,12 @@ for vers in TEST_VERSIONS:
     else:
         if vers == "native":
             short_vers = os.path.basename(sys.path[-1])
+            from xdis.version_info import PYTHON_VERSION_TRIPLE, version_tuple_to_str
+
+            if PYTHON_VERSION_TRIPLE > (3, 0):
+                version = version_tuple_to_str(end=2)
+                PYC = f"*.cpython-{version}.pyc"
+>>>>>>> python-3.0-to-3.2
             test_options[vers] = (sys.path[-1], PYC, short_vers)
         else:
             short_vers = vers[:3]
@@ -127,8 +140,17 @@ def do_tests(
             pass
 
     if len(files) > max_files:
-        files = [file for file in files if not "site-packages" in file and (file.endswith(".pyo") or file.endswith(".pyc"))]
-        files = [file for file in files if not "test" in file and (file.endswith(".pyo") or file.endswith(".pyc"))]
+        files = [
+            file
+            for file in files
+            if not "site-packages" in file
+            and (file.endswith(".pyo") or file.endswith(".pyc"))
+        ]
+        files = [
+            file
+            for file in files
+            if not "test" in file and (file.endswith(".pyo") or file.endswith(".pyc"))
+        ]
         if len(files) > max_files:
             # print("Number of files %d - truncating to last 200" % len(files))
             print(
@@ -145,7 +167,8 @@ def do_tests(
 
 
 if __name__ == "__main__":
-    import getopt, sys
+    import getopt
+    import sys
 
     do_coverage = do_verify = False
     test_dirs = []