Mailman 3 May 2019 - Python-checkins

bpo-12639: msilib.Directory.start_component() fails if *keyfile* is not None (GH-13688)
by Steve Dower May 31, 2019

May 31, 2019

https://github.com/python/cpython/commit/c8d5bf6c3fa09b43f6a5ee779d493d251d… commit: c8d5bf6c3fa09b43f6a5ee779d493d251dbcc53c branch: master author: Zackery Spytz <zspytz(a)gmail.com> committer: Steve Dower <steve.dower(a)python.org> date: 2019-05-31T09:43:13-07:00 summary: bpo-12639: msilib.Directory.start_component() fails if *keyfile* is not None (GH-13688) msilib.Directory.start_component() was passing an extra argument to CAB.gen_id(). files: A Misc/NEWS.d/next/Library/2019-… [View More]

1 0

bpo-25735: math.factorial doc should mention integer return type (GH-6420)
by Cheryl Sabella May 31, 2019

May 31, 2019

https://github.com/python/cpython/commit/4612671df2742eade8ecf8003a6ce12479… commit: 4612671df2742eade8ecf8003a6ce1247973c135 branch: master author: Akshay Sharma <akshay.sharma09695(a)gmail.com> committer: Cheryl Sabella <cheryl.sabella(a)gmail.com> date: 2019-05-31T12:41:17-04:00 summary: bpo-25735: math.factorial doc should mention integer return type (GH-6420) files: A Misc/NEWS.d/next/Documentation/2018-04-08-19-09-22.bpo-25735.idVQBD.rst M Doc/library/math.rst diff --git a/… [View More]

1 0

bpo-26835: Add file sealing constants to fcntl (GH-13694)
by Christian Heimes May 31, 2019

May 31, 2019

https://github.com/python/cpython/commit/8cbb5b6625268400d6e9092b75b06d6f90… commit: 8cbb5b6625268400d6e9092b75b06d6f90398dc9 branch: master author: Christian Heimes <christian(a)python.org> committer: GitHub <noreply(a)github.com> date: 2019-05-31T18:32:33+02:00 summary: bpo-26835: Add file sealing constants to fcntl (GH-13694) Co-authored-by: nanjekyejoannah <nanjekyejoannah(a)gmail.com> files: A Misc/NEWS.d/next/Library/2019-05-31-11-33-11.bpo-26835.xGbUX0.rst M Doc/… [View More]

1 0

bpo-37094: Add example for TestCase.skipTest in unittest doc (GH-13645)
by Miss Islington (bot) May 31, 2019

May 31, 2019

https://github.com/python/cpython/commit/8135455c840b9e169a6cd527cb1ee922ca… commit: 8135455c840b9e169a6cd527cb1ee922cafb9109 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-05-31T09:31:53-07:00 summary: bpo-37094: Add example for TestCase.skipTest in unittest doc (GH-13645) Also includes other minor test skipping doc improvements. https://bugs.python.org/issue37094 (cherry picked … [View More]from commit ffed76b6fc4d7dd0244b662d6e5738eb496d9def) Co-authored-by: Makdon <makdon(a)makdon.me> files: M Doc/library/unittest.rst diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst index 13230daf85f0..bbe14299edfb 100644 --- a/Doc/library/unittest.rst +++ b/Doc/library/unittest.rst @@ -510,7 +510,8 @@ that is broken and will fail, but shouldn't be counted as a failure on a :class:`TestResult`. Skipping a test is simply a matter of using the :func:`skip` :term:`decorator` -or one of its conditional variants. +or one of its conditional variants, calling :meth:`TestCase.skipTest` within a +:meth:`~TestCase.setUp` or test method, or raising :exc:`SkipTest` directly. Basic skipping looks like this:: @@ -531,16 +532,23 @@ Basic skipping looks like this:: # windows specific testing code pass + def test_maybe_skipped(self): + if not external_resource_available(): + self.skipTest("external resource not available") + # test code that depends on the external resource + pass + This is the output of running the example above in verbose mode:: test_format (__main__.MyTestCase) ... skipped 'not supported in this library version' test_nothing (__main__.MyTestCase) ... skipped 'demonstrating skipping' + test_maybe_skipped (__main__.MyTestCase) ... skipped 'external resource not available' test_windows_support (__main__.MyTestCase) ... skipped 'requires Windows' ---------------------------------------------------------------------- - Ran 3 tests in 0.005s + Ran 4 tests in 0.005s - OK (skipped=3) + OK (skipped=4) Classes can be skipped just like methods:: @@ -568,7 +576,7 @@ the test unless the passed object has a certain attribute:: return lambda func: func return unittest.skip("{!r} doesn't have {!r}".format(obj, attr)) -The following decorators implement test skipping and expected failures: +The following decorators and exception implement test skipping and expected failures: .. decorator:: skip(reason) [View Less]

1 0

bpo-37094: Add example for TestCase.skipTest in unittest doc (GH-13645)
by Miss Islington (bot) May 31, 2019

May 31, 2019

https://github.com/python/cpython/commit/ffed76b6fc4d7dd0244b662d6e5738eb49… commit: ffed76b6fc4d7dd0244b662d6e5738eb496d9def branch: master author: Makdon <makdon(a)makdon.me> committer: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> date: 2019-05-31T09:19:11-07:00 summary: bpo-37094: Add example for TestCase.skipTest in unittest doc (GH-13645) Also includes other minor test skipping doc improvements. https://bugs.python.org/issue37094 files: M … [View More]

1 0

bpo-37115: Support annotations in positional-only arguments (GH-13698)
by Pablo Galindo May 31, 2019

May 31, 2019

https://github.com/python/cpython/commit/a0c01bf1364f2996bb0186ddfc41d74350… commit: a0c01bf1364f2996bb0186ddfc41d74350e01c39 branch: master author: Pablo Galindo <Pablogsal(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2019-05-31T15:19:50+01:00 summary: bpo-37115: Support annotations in positional-only arguments (GH-13698) files: M Lib/test/test_grammar.py M Lib/test/test_type_comments.py M Python/compile.c diff --git a/Lib/test/test_grammar.py b/Lib/test/… [View More]test_grammar.py index 6d7d5544ed9c..2a3b71fac4a5 100644 --- a/Lib/test/test_grammar.py +++ b/Lib/test/test_grammar.py @@ -620,14 +620,22 @@ def f(x) -> list: pass self.assertEqual(f.__annotations__, {'return': list}) def f(x: int): pass self.assertEqual(f.__annotations__, {'x': int}) + def f(x: int, /): pass + self.assertEqual(f.__annotations__, {'x': int}) + def f(x: int = 34, /): pass + self.assertEqual(f.__annotations__, {'x': int}) def f(*x: str): pass self.assertEqual(f.__annotations__, {'x': str}) def f(**x: float): pass self.assertEqual(f.__annotations__, {'x': float}) def f(x, y: 1+2): pass self.assertEqual(f.__annotations__, {'y': 3}) + def f(x, y: 1+2, /): pass + self.assertEqual(f.__annotations__, {'y': 3}) def f(a, b: 1, c: 2, d): pass self.assertEqual(f.__annotations__, {'b': 1, 'c': 2}) + def f(a, b: 1, /, c: 2, d): pass + self.assertEqual(f.__annotations__, {'b': 1, 'c': 2}) def f(a, b: 1, c: 2, d, e: 3 = 4, f=5, *g: 6): pass self.assertEqual(f.__annotations__, {'b': 1, 'c': 2, 'e': 3, 'g': 6}) @@ -636,6 +644,11 @@ def f(a, b: 1, c: 2, d, e: 3 = 4, f=5, *g: 6, h: 7, i=8, j: 9 = 10, self.assertEqual(f.__annotations__, {'b': 1, 'c': 2, 'e': 3, 'g': 6, 'h': 7, 'j': 9, 'k': 11, 'return': 12}) + def f(a, b: 1, c: 2, d, e: 3 = 4, f: int = 5, /, *g: 6, h: 7, i=8, j: 9 = 10, + **k: 11) -> 12: pass + self.assertEqual(f.__annotations__, + {'b': 1, 'c': 2, 'e': 3, 'f': int, 'g': 6, 'h': 7, 'j': 9, + 'k': 11, 'return': 12}) # Check for issue #20625 -- annotations mangling class Spam: def f(self, *, __kw: 1): diff --git a/Lib/test/test_type_comments.py b/Lib/test/test_type_comments.py index 83d8717247aa..55b54e7f203e 100644 --- a/Lib/test/test_type_comments.py +++ b/Lib/test/test_type_comments.py @@ -99,12 +99,25 @@ def fa( ): pass +def fa( + a = 1, # type: A + / +): + pass + def fab( a, # type: A b, # type: B ): pass +def fab( + a, # type: A + /, + b, # type: B +): + pass + def fab( a, # type: A b # type: B @@ -149,6 +162,13 @@ def fav( ): pass +def fav( + a, # type: A + /, + *v, # type: V +): + pass + def fav( a, # type: A *v # type: V @@ -161,6 +181,13 @@ def fak( ): pass +def fak( + a, # type: A + /, + **k, # type: K +): + pass + def fak( a, # type: A **k # type: K @@ -174,6 +201,14 @@ def favk( ): pass +def favk( + a, # type: A + /, + *v, # type: V + **k, # type: K +): + pass + def favk( a, # type: A *v, # type: V @@ -290,18 +325,21 @@ def test_longargs(self): for t in tree.body: # The expected args are encoded in the function name todo = set(t.name[1:]) - self.assertEqual(len(t.args.args), + self.assertEqual(len(t.args.args) + len(t.args.posonlyargs), len(todo) - bool(t.args.vararg) - bool(t.args.kwarg)) self.assertTrue(t.name.startswith('f'), t.name) - for c in t.name[1:]: + for index, c in enumerate(t.name[1:]): todo.remove(c) if c == 'v': arg = t.args.vararg elif c == 'k': arg = t.args.kwarg else: - assert 0 <= ord(c) - ord('a') < len(t.args.args) - arg = t.args.args[ord(c) - ord('a')] + assert 0 <= ord(c) - ord('a') < len(t.args.posonlyargs + t.args.args) + if index < len(t.args.posonlyargs): + arg = t.args.posonlyargs[ord(c) - ord('a')] + else: + arg = t.args.args[ord(c) - ord('a') - len(t.args.posonlyargs)] self.assertEqual(arg.arg, c) # That's the argument name self.assertEqual(arg.type_comment, arg.arg.upper()) assert not todo diff --git a/Python/compile.c b/Python/compile.c index f1c97bdfe47f..f6ec929b3ca4 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -1991,6 +1991,8 @@ compiler_visit_annotations(struct compiler *c, arguments_ty args, if (!compiler_visit_argannotations(c, args->args, names)) goto error; + if (!compiler_visit_argannotations(c, args->posonlyargs, names)) + goto error; if (args->vararg && args->vararg->annotation && !compiler_visit_argannotation(c, args->vararg->arg, args->vararg->annotation, names)) [View Less]

1 0

bpo-37112: Allow compile to work on AST with positional only arguments with defaults (GH-13697)
by Pablo Galindo May 31, 2019

May 31, 2019

https://github.com/python/cpython/commit/2f58a84104ef64f71deb71d264305bcd73… commit: 2f58a84104ef64f71deb71d264305bcd73e59c97 branch: master author: Pablo Galindo <Pablogsal(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2019-05-31T14:09:49+01:00 summary: bpo-37112: Allow compile to work on AST with positional only arguments with defaults (GH-13697) files: M Lib/test/test_ast.py M Python/ast.c diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py index … [View More]0c5bbf6752a4..e251e254afdd 100644 --- a/Lib/test/test_ast.py +++ b/Lib/test/test_ast.py @@ -137,6 +137,18 @@ def to_tuple(t): "@deco(a for a in b)\ndef f(): pass", # Simple assignment expression "(a := 1)", + # Positional-only arguments + "def f(a, /,): pass", + "def f(a, /, c, d, e): pass", + "def f(a, /, c, *, d, e): pass", + "def f(a, /, c, *, d, e, **kwargs): pass", + # Positional-only arguments with defaults + "def f(a=1, /,): pass", + "def f(a=1, /, b=2, c=4): pass", + "def f(a=1, /, b=2, *, c=4): pass", + "def f(a=1, /, b=2, *, c): pass", + "def f(a=1, /, b=2, *, c=4, **kwargs): pass", + "def f(a=1, /, b=2, *, c, **kwargs): pass", ] @@ -1691,6 +1703,16 @@ def main(): ('Module', [('ClassDef', (3, 0), 'C', [], [], [('Pass', (3, 9))], [('Name', (1, 1), 'deco1', ('Load',)), ('Call', (2, 0), ('Name', (2, 1), 'deco2', ('Load',)), [], [])])], []), ('Module', [('FunctionDef', (2, 0), 'f', ('arguments', [], [], None, [], [], None, []), [('Pass', (2, 9))], [('Call', (1, 1), ('Name', (1, 1), 'deco', ('Load',)), [('GeneratorExp', (1, 5), ('Name', (1, 6), 'a', ('Load',)), [('comprehension', ('Name', (1, 12), 'a', ('Store',)), ('Name', (1, 17), 'b', ('Load',)), [], 0)])], [])], None, None)], []), ('Module', [('Expr', (1, 0), ('NamedExpr', (1, 1), ('Name', (1, 1), 'a', ('Store',)), ('Constant', (1, 6), 1, None)))], []), +('Module', [('FunctionDef', (1, 0), 'f', ('arguments', [], [('arg', (1, 6), 'a', None, None)], None, [], [], None, []), [('Pass', (1, 14))], [], None, None)], []), +('Module', [('FunctionDef', (1, 0), 'f', ('arguments', [('arg', (1, 12), 'c', None, None), ('arg', (1, 15), 'd', None, None), ('arg', (1, 18), 'e', None, None)], [('arg', (1, 6), 'a', None, None)], None, [], [], None, []), [('Pass', (1, 22))], [], None, None)], []), +('Module', [('FunctionDef', (1, 0), 'f', ('arguments', [('arg', (1, 12), 'c', None, None)], [('arg', (1, 6), 'a', None, None)], None, [('arg', (1, 18), 'd', None, None), ('arg', (1, 21), 'e', None, None)], [None, None], None, []), [('Pass', (1, 25))], [], None, None)], []), +('Module', [('FunctionDef', (1, 0), 'f', ('arguments', [('arg', (1, 12), 'c', None, None)], [('arg', (1, 6), 'a', None, None)], None, [('arg', (1, 18), 'd', None, None), ('arg', (1, 21), 'e', None, None)], [None, None], ('arg', (1, 26), 'kwargs', None, None), []), [('Pass', (1, 35))], [], None, None)], []), +('Module', [('FunctionDef', (1, 0), 'f', ('arguments', [], [('arg', (1, 6), 'a', None, None)], None, [], [], None, [('Constant', (1, 8), 1, None)]), [('Pass', (1, 16))], [], None, None)], []), +('Module', [('FunctionDef', (1, 0), 'f', ('arguments', [('arg', (1, 14), 'b', None, None), ('arg', (1, 19), 'c', None, None)], [('arg', (1, 6), 'a', None, None)], None, [], [], None, [('Constant', (1, 8), 1, None), ('Constant', (1, 16), 2, None), ('Constant', (1, 21), 4, None)]), [('Pass', (1, 25))], [], None, None)], []), +('Module', [('FunctionDef', (1, 0), 'f', ('arguments', [('arg', (1, 14), 'b', None, None)], [('arg', (1, 6), 'a', None, None)], None, [('arg', (1, 22), 'c', None, None)], [('Constant', (1, 24), 4, None)], None, [('Constant', (1, 8), 1, None), ('Constant', (1, 16), 2, None)]), [('Pass', (1, 28))], [], None, None)], []), +('Module', [('FunctionDef', (1, 0), 'f', ('arguments', [('arg', (1, 14), 'b', None, None)], [('arg', (1, 6), 'a', None, None)], None, [('arg', (1, 22), 'c', None, None)], [None], None, [('Constant', (1, 8), 1, None), ('Constant', (1, 16), 2, None)]), [('Pass', (1, 26))], [], None, None)], []), +('Module', [('FunctionDef', (1, 0), 'f', ('arguments', [('arg', (1, 14), 'b', None, None)], [('arg', (1, 6), 'a', None, None)], None, [('arg', (1, 22), 'c', None, None)], [('Constant', (1, 24), 4, None)], ('arg', (1, 29), 'kwargs', None, None), [('Constant', (1, 8), 1, None), ('Constant', (1, 16), 2, None)]), [('Pass', (1, 38))], [], None, None)], []), +('Module', [('FunctionDef', (1, 0), 'f', ('arguments', [('arg', (1, 14), 'b', None, None)], [('arg', (1, 6), 'a', None, None)], None, [('arg', (1, 22), 'c', None, None)], [None], ('arg', (1, 27), 'kwargs', None, None), [('Constant', (1, 8), 1, None), ('Constant', (1, 16), 2, None)]), [('Pass', (1, 36))], [], None, None)], []), ] single_results = [ ('Interactive', [('Expr', (1, 0), ('BinOp', (1, 0), ('Constant', (1, 0), 1, None), ('Add',), ('Constant', (1, 2), 2, None)))]), diff --git a/Python/ast.c b/Python/ast.c index 183b08d6ba12..b77552274d24 100644 --- a/Python/ast.c +++ b/Python/ast.c @@ -123,7 +123,7 @@ validate_arguments(arguments_ty args) && !validate_expr(args->kwarg->annotation, Load)) { return 0; } - if (asdl_seq_LEN(args->defaults) > asdl_seq_LEN(args->args)) { + if (asdl_seq_LEN(args->defaults) > asdl_seq_LEN(args->posonlyargs) + asdl_seq_LEN(args->args)) { PyErr_SetString(PyExc_ValueError, "more positional defaults than args on arguments"); return 0; } [View Less]

1 0

Update data model docs to include missing attributes for code objects (GH-13696)
by Pablo Galindo May 31, 2019

May 31, 2019

https://github.com/python/cpython/commit/ed222a74a0ada1cb89ba0fd81f64e404ac… commit: ed222a74a0ada1cb89ba0fd81f64e404ac50778d branch: master author: Pablo Galindo <Pablogsal(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2019-05-31T12:13:04+01:00 summary: Update data model docs to include missing attributes for code objects (GH-13696) Include and document co_posonlyargcount and co_kwonlyargcount files: M Doc/reference/datamodel.rst diff --git a/Doc/reference/… [View More]datamodel.rst b/Doc/reference/datamodel.rst index 9fc9f3a3848a..8b4d889535fb 100644 --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -890,6 +890,8 @@ Internal types .. index:: single: co_argcount (code object attribute) + single: co_posonlyargcount (code object attribute) + single: co_kwonlyargcount (code object attribute) single: co_code (code object attribute) single: co_consts (code object attribute) single: co_filename (code object attribute) @@ -906,18 +908,21 @@ Internal types Special read-only attributes: :attr:`co_name` gives the function name; :attr:`co_argcount` is the number of positional arguments (including arguments - with default values); :attr:`co_nlocals` is the number of local variables used - by the function (including arguments); :attr:`co_varnames` is a tuple containing - the names of the local variables (starting with the argument names); - :attr:`co_cellvars` is a tuple containing the names of local variables that are - referenced by nested functions; :attr:`co_freevars` is a tuple containing the - names of free variables; :attr:`co_code` is a string representing the sequence - of bytecode instructions; :attr:`co_consts` is a tuple containing the literals - used by the bytecode; :attr:`co_names` is a tuple containing the names used by - the bytecode; :attr:`co_filename` is the filename from which the code was - compiled; :attr:`co_firstlineno` is the first line number of the function; - :attr:`co_lnotab` is a string encoding the mapping from bytecode offsets to - line numbers (for details see the source code of the interpreter); + with default values); :attr:`co_posonlyargcount` is the number of + positional-only arguments (including arguments with default values); + :attr:`co_kwonlyargcount` is the number of keyword-only arguments (including + arguments with default values); :attr:`co_nlocals` is the number of local + variables used by the function (including arguments); :attr:`co_varnames` is a + tuple containing the names of the local variables (starting with the argument + names); :attr:`co_cellvars` is a tuple containing the names of local variables + that are referenced by nested functions; :attr:`co_freevars` is a tuple + containing the names of free variables; :attr:`co_code` is a string representing + the sequence of bytecode instructions; :attr:`co_consts` is a tuple containing + the literals used by the bytecode; :attr:`co_names` is a tuple containing the + names used by the bytecode; :attr:`co_filename` is the filename from which the + code was compiled; :attr:`co_firstlineno` is the first line number of the + function; :attr:`co_lnotab` is a string encoding the mapping from bytecode + offsets to line numbers (for details see the source code of the interpreter); :attr:`co_stacksize` is the required stack size (including local variables); :attr:`co_flags` is an integer encoding a number of flags for the interpreter. [View Less]

1 0

bpo-37108: Support super with methods that use positional-only arguments (GH-13695)
by Pablo Galindo May 31, 2019

May 31, 2019

https://github.com/python/cpython/commit/3a46d5c293d39995dc5218bf46a7d92b16… commit: 3a46d5c293d39995dc5218bf46a7d92b16fb2a15 branch: master author: Pablo Galindo <Pablogsal(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2019-05-31T12:07:56+01:00 summary: bpo-37108: Support super with methods that use positional-only arguments (GH-13695) files: M Lib/test/test_positional_only_arg.py M Objects/typeobject.c diff --git a/Lib/test/test_positional_only_arg.py b/Lib/test/… [View More]

1 0

bpo-36379: __ipow__ must be a ternaryfunc, not a binaryfunc (GH-13546)
by Miss Islington (bot) May 31, 2019

May 31, 2019

https://github.com/python/cpython/commit/c7f803b08ed5211701c75f98ba9ada85d4… commit: c7f803b08ed5211701c75f98ba9ada85d45ac155 branch: master author: Zackery Spytz <zspytz(a)gmail.com> committer: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> date: 2019-05-31T02:46:36-07:00 summary: bpo-36379: __ipow__ must be a ternaryfunc, not a binaryfunc (GH-13546) If a type's __ipow__ method was implemented in C, attempting to use the *modulo* parameter would cause … [View More]crashes. https://bugs.python.org/issue36379 files: A Misc/NEWS.d/next/C API/2019-05-24-07-11-08.bpo-36379.8zgoKe.rst M Lib/test/test_capi.py M Modules/_testcapimodule.c M Objects/typeobject.c diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py index 795aa78d8866..4dd78bb9a2fd 100644 --- a/Lib/test/test_capi.py +++ b/Lib/test/test_capi.py @@ -184,6 +184,13 @@ def test_c_type_with_matrix_multiplication(self): o @= m1 self.assertEqual(o, ("matmul", 42, m1)) + def test_c_type_with_ipow(self): + # When the __ipow__ method of a type was implemented in C, using the + # modulo param would cause segfaults. + o = _testcapi.ipowType() + self.assertEqual(o.__ipow__(1), (1, None)) + self.assertEqual(o.__ipow__(2, 2), (2, 2)) + def test_return_null_without_error(self): # Issue #23571: A function must not return NULL without setting an # error diff --git a/Misc/NEWS.d/next/C API/2019-05-24-07-11-08.bpo-36379.8zgoKe.rst b/Misc/NEWS.d/next/C API/2019-05-24-07-11-08.bpo-36379.8zgoKe.rst new file mode 100644 index 000000000000..6a699b2084e4 --- /dev/null +++ b/Misc/NEWS.d/next/C API/2019-05-24-07-11-08.bpo-36379.8zgoKe.rst @@ -0,0 +1,2 @@ +Fix crashes when attempting to use the *modulo* parameter when ``__ipow__`` +is implemented in C. diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c index ca6e87b79c47..b42f41cc8d8f 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -5522,6 +5522,27 @@ static PyTypeObject matmulType = { PyObject_Del, /* tp_free */ }; +typedef struct { + PyObject_HEAD +} ipowObject; + +static PyObject * +ipowType_ipow(PyObject *self, PyObject *other, PyObject *mod) +{ + return Py_BuildValue("OO", other, mod); +} + +static PyNumberMethods ipowType_as_number = { + .nb_inplace_power = ipowType_ipow +}; + +static PyTypeObject ipowType = { + PyVarObject_HEAD_INIT(NULL, 0) + .tp_name = "ipowType", + .tp_basicsize = sizeof(ipowObject), + .tp_as_number = &ipowType_as_number, + .tp_new = PyType_GenericNew +}; typedef struct { PyObject_HEAD @@ -5947,6 +5968,11 @@ PyInit__testcapi(void) return NULL; Py_INCREF(&matmulType); PyModule_AddObject(m, "matmulType", (PyObject *)&matmulType); + if (PyType_Ready(&ipowType) < 0) { + return NULL; + } + Py_INCREF(&ipowType); + PyModule_AddObject(m, "ipowType", (PyObject *)&ipowType); if (PyType_Ready(&awaitType) < 0) return NULL; diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 64c2ceab5573..b6d925c1442e 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -7016,7 +7016,7 @@ static slotdef slotdefs[] = { IBSLOT("__imod__", nb_inplace_remainder, slot_nb_inplace_remainder, wrap_binaryfunc, "%="), IBSLOT("__ipow__", nb_inplace_power, slot_nb_inplace_power, - wrap_binaryfunc, "**="), + wrap_ternaryfunc, "**="), IBSLOT("__ilshift__", nb_inplace_lshift, slot_nb_inplace_lshift, wrap_binaryfunc, "<<="), IBSLOT("__irshift__", nb_inplace_rshift, slot_nb_inplace_rshift, [View Less]

1 0