Adress Victor's feedback

Author: pablogsal

Lib/importlib/_bootstrap_external.py

@@ -265,6 +265,7 @@ def _write_atomic(path, data, mode=0o666):
 #                         this might affected the first line number #32911)
 #     Python 3.8a1  3400 (move frame block handling to compiler #17611)
 #     Python 3.8a1  3401 (add END_ASYNC_FOR #33041)
+#     Python 3.8a1  3410 (PEP570 Python Positional-Only Parameters #36540)
 #
 # MAGIC must change whenever the bytecode emitted by the compiler may no
 # longer be understood by older implementations of the eval loop (usually
@@ -273,7 +274,7 @@ def _write_atomic(path, data, mode=0o666):
 # Whenever MAGIC_NUMBER is changed, the ranges in the magic_values array
 # in PC/launcher.c must also be updated.
 
-MAGIC_NUMBER = (3401).to_bytes(2, 'little') + b'\r\n'
+MAGIC_NUMBER = (3410).to_bytes(2, 'little') + b'\r\n'
 _RAW_MAGIC_NUMBER = int.from_bytes(MAGIC_NUMBER, 'little')  # For import.c
 
 _PYCACHE = '__pycache__'

Lib/test/inspect_fodder2.py

@@ -139,17 +139,17 @@ def func137():
             never_reached2
 
 #line 141
-def positional_only_arg(a,/):
+def positional_only_arg(a, /):
     pass
 
 #line 145
-def all_markers(a,b,/,c,d,*,e,f):
+def all_markers(a, b, /, c, d, *, e, f):
     pass
 
 # line 149
-def all_markers_with_args_and_kwargs(a,b,/,c,d,*args,e,f,**kwargs):
+def all_markers_with_args_and_kwargs(a, b, /, c, d, *args, e, f, **kwargs):
     pass
 
 #line 153
-def all_markers_with_defaults(a,b=1,/,c=2,d=3,*,e=4,f=5):
+def all_markers_with_defaults(a, b=1, /, c=2, d=3, *, e=4, f=5):
     pass

Lib/test/test_importlib/test_util.py

@@ -862,7 +862,7 @@ def test_magic_number(self):
         in advance. Such exceptional releases will then require an
         adjustment to this test case.
         """
-        EXPECTED_MAGIC_NUMBER = 3400
+        EXPECTED_MAGIC_NUMBER = 3410
         actual = int.from_bytes(importlib.util.MAGIC_NUMBER[:2], 'little')
 
         msg = (

Lib/test/test_inspect.py

@@ -784,7 +784,7 @@ def assertFullArgSpecEquals(self, routine, args_e, varargs_e=None,
                              formatted)
 
     def test_getargspec(self):
-        # self.assertArgSpecEquals(mod.eggs, ['x', 'y'], formatted='(x, y)')
+        self.assertArgSpecEquals(mod.eggs, ['x', 'y'], formatted='(x, y)')
 
         self.assertRaises(ValueError, self.assertArgSpecEquals,
                           mod.spam, [])

Lib/test/test_positional_only_arg.py

@@ -1,7 +1,7 @@
 """Unit tests for the positional only argument syntax specified in PEP 570."""
 
-import unittest
 import pickle
+import unittest
 
 
 def global_pos_only_f(a, b, /):

PC/launcher.c

@@ -1139,7 +1139,7 @@ static PYC_MAGIC magic_values[] = {
     { 3320, 3351, L"3.5" },
     { 3360, 3379, L"3.6" },
     { 3390, 3399, L"3.7" },
-    { 3400, 3409, L"3.8" },
+    { 3400, 3410, L"3.8" },
     { 0 }
 };
 

Python/ceval.c

@@ -3722,23 +3722,23 @@ too_many_positional(PyCodeObject *co, Py_ssize_t given, Py_ssize_t defcount,
     PyObject *sig, *kwonly_sig;
     Py_ssize_t co_posonlyargcount = co->co_posonlyargcount;
     Py_ssize_t co_argcount = co->co_argcount;
-    Py_ssize_t co_total_positional = co_argcount + co_posonlyargcount;
+    Py_ssize_t total_positional = co_argcount + co_posonlyargcount;
 
     assert((co->co_flags & CO_VARARGS) == 0);
     /* Count missing keyword-only args. */
-    for (i = co_total_positional; i < co_total_positional + co->co_kwonlyargcount; i++) {
+    for (i = total_positional; i < total_positional + co->co_kwonlyargcount; i++) {
         if (GETLOCAL(i) != NULL) {
             kwonly_given++;
         }
     }
     if (defcount) {
-        Py_ssize_t atleast = co_total_positional - defcount;
+        Py_ssize_t atleast = total_positional - defcount;
         plural = 1;
-        sig = PyUnicode_FromFormat("from %zd to %zd", atleast, co_total_positional);
+        sig = PyUnicode_FromFormat("from %zd to %zd", atleast, total_positional);
     }
     else {
-        plural = (co_total_positional != 1);
-        sig = PyUnicode_FromFormat("%zd", co_total_positional);
+        plural = (total_positional != 1);
+        sig = PyUnicode_FromFormat("%zd", total_positional);
     }
     if (sig == NULL)
         return;