Fix 3.8 bug. Start testing Python 3.8.

rocky · Apr 16, 2020 · 26fa32a · 26fa32a
1 parent 4ae71a9
commit 26fa32a
Show file tree

Hide file tree

Showing 20 changed files with 32 additions and 3 deletions.
diff --git a/test/Makefile b/test/Makefile
@@ -20,14 +20,36 @@ check: check-short
 		  --bytecode-3.0 --bytecode-3.1 \
                   --bytecode-3.2 --bytecode-3.3 \
                   --bytecode-3.4 --bytecode-3.5 \
-	          --bytecode-3.6 --bytecode-3.7 \
+	          --bytecode-3.6 --bytecode-3.7 --bytecode-3.8 \
 	          --bytecode-2.7pypy --bytecode-3.2pypy \
                   --bytecode-3.5pypy --bytecode-3.6pypy $(COMPILE)
 check-short:
 	$(PYTHON) test_pyenvlib.py --verify --simple
 
 check-bytecode-1.5:
-	$(PYTHON) test_pyenvlib.py --bytecode-1.5
+	$(PYTHON) test_pythonlib.py --bytecode-1.5
+
+check-bytecode-1:
+	$(PYTHON) test_pythonlib.py \
+	 	  --bytecode-1.0 --bytecode-1.1 --bytecode-1.2 --bytecode-1.3 \
+                  --bytecode-1.4 --bytecode-1.5 --bytecode-1.6
+
+check-bytecode-2:
+	$(PYTHON) test_pythonlib.py \
+	          --bytecode-2.1 --bytecode-2.2 --bytecode-2.3 \
+                  --bytecode-2.4 --bytecode-2.5 \
+		  --bytecode-2.5dropbox \
+                  --bytecode-2.6 --bytecode-2.7
+
+check-bytecode-3:
+	$(PYTHON) test_pythonlib.py \
+		  --bytecode-3.0 --bytecode-3.1 \
+                  --bytecode-3.2 --bytecode-3.3 \
+                  --bytecode-3.4 --bytecode-3.5 \
+	          --bytecode-3.6 --bytecode-3.7 --bytecode-3.8
+
+check-bytecode-3.8:
+	$(PYTHON) test_pythonlib.py --bytecode-3.8
 
 #: Test of all pyenv Python library files
 check-full check-pyenv:

diff --git a/test/bytecode_3.8/00_chained-compare.pyc b/test/bytecode_3.8/00_chained-compare.pyc
diff --git a/test/bytecode_3.8/00_docstring.pyc b/test/bytecode_3.8/00_docstring.pyc
diff --git a/test/bytecode_3.8/01_assert2.pyc b/test/bytecode_3.8/01_assert2.pyc
diff --git a/test/bytecode_3.8/01_chained_compare.pyc b/test/bytecode_3.8/01_chained_compare.pyc
diff --git a/test/bytecode_3.8/01_class.pyc b/test/bytecode_3.8/01_class.pyc
diff --git a/test/bytecode_3.8/01_conditional.pyc b/test/bytecode_3.8/01_conditional.pyc
diff --git a/test/bytecode_3.8/01_extra_iter.pyc b/test/bytecode_3.8/01_extra_iter.pyc
diff --git a/test/bytecode_3.8/01_triple_compare.pyc b/test/bytecode_3.8/01_triple_compare.pyc
diff --git a/test/bytecode_3.8/02_var_annotate.pyc b/test/bytecode_3.8/02_var_annotate.pyc
diff --git a/test/bytecode_3.8/04_and_del.pyc b/test/bytecode_3.8/04_and_del.pyc
diff --git a/test/bytecode_3.8/04_def_annotate.pyc b/test/bytecode_3.8/04_def_annotate.pyc
diff --git a/test/bytecode_3.8/04_importlist.pyc b/test/bytecode_3.8/04_importlist.pyc
diff --git a/test/bytecode_3.8/05_call_function_kw2.pyc b/test/bytecode_3.8/05_call_function_kw2.pyc
diff --git a/test/bytecode_3.8/06_listcomp.pyc b/test/bytecode_3.8/06_listcomp.pyc
diff --git a/test/bytecode_3.8/10_for.pyc b/test/bytecode_3.8/10_for.pyc
diff --git a/test/bytecode_3.8/10_fstring.pyc b/test/bytecode_3.8/10_fstring.pyc
diff --git a/test/bytecode_3.8/14_mixed_expressions.pyc b/test/bytecode_3.8/14_mixed_expressions.pyc
diff --git a/xdis/codetype/code15.py b/xdis/codetype/code15.py
@@ -76,6 +76,8 @@ def decode_lineno_tab(self):
         line_number, line_number_diff = self.co_firstlineno, 0
         offset, offset_diff = 0, 0
         uncompressed_lnotab = {offset: line_number}
+        if not hasattr(self.co_lnotab, "__len__"):
+            raise TypeError("line number table should have a type with a length; is %s" % type(self.co_lnotab))
         for i in range(0, len(self.co_lnotab), 2):
             offset_diff = self.co_lnotab[i]
             line_number_diff = self.co_lnotab[i+1]

diff --git a/xdis/unmarshal.py b/xdis/unmarshal.py
@@ -135,8 +135,13 @@ def load_code_type(fp, magic_int, bytes_for_s=False, code_objects={}):
     else:
         co_argcount = 0
 
-    if version >= 3.8:
+    # FIXME:
+    # Note we do this by magic_int, not version which is *not*
+    # 3.8
+    if magic_int in (3412, 3413, 3422):
         co_posonlyargcount = unpack("<i", fp.read(4))[0]
+    if version >= 3.8:
+        co_posonlyargcount = 0
     else:
         co_posonlyargcount = None