Code Context?

@@ -975,7 +978,7 @@

Navigation

- Last updated on Sep 09, 2020. + Last updated on Sep 22, 2020. Found a bug?
diff --git a/Misc/NEWS.d/next/IDLE/2020-09-22-11-13-45.bpo-35764.VoNa8y.rst b/Misc/NEWS.d/next/IDLE/2020-09-22-11-13-45.bpo-35764.VoNa8y.rst new file mode 100644 index 0000000000000..eb62d3699d5fe --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2020-09-22-11-13-45.bpo-35764.VoNa8y.rst @@ -0,0 +1 @@ +Rewrite the Calltips doc section. From webhook-mailer at python.org Tue Sep 22 14:30:56 2020 From: webhook-mailer at python.org (Miss Islington (bot)) Date: Tue, 22 Sep 2020 18:30:56 -0000 Subject: [Python-checkins] fix `EventType` bases Message-ID: https://github.com/python/cpython/commit/6d372ef19468b6f5239479b595dfb587c642b594 commit: 6d372ef19468b6f5239479b595dfb587c642b594 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com> committer: GitHub date: 2020-09-22T11:30:47-07:00 summary: fix `EventType` bases `StrEnum` does not exist in 3.8, so use original `(str, enum.Enum)` bases. files: A Misc/NEWS.d/next/Library/2020-09-22-00-23-30.bpo-41817.bnh-VG.rst M Lib/tkinter/__init__.py diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py index 9d3bf4d49298f..479eb016da7f0 100644 --- a/Lib/tkinter/__init__.py +++ b/Lib/tkinter/__init__.py @@ -146,10 +146,10 @@ def _splitdict(tk, v, cut_minus=True, conv=None): class EventType(str, enum.Enum): KeyPress = '2' - Key = KeyPress, + Key = KeyPress KeyRelease = '3' ButtonPress = '4' - Button = ButtonPress, + Button = ButtonPress ButtonRelease = '5' Motion = '6' Enter = '7' @@ -180,10 +180,10 @@ class EventType(str, enum.Enum): Colormap = '32' ClientMessage = '33' # undocumented Mapping = '34' # undocumented - VirtualEvent = '35', # undocumented - Activate = '36', - Deactivate = '37', - MouseWheel = '38', + VirtualEvent = '35' # undocumented + Activate = '36' + Deactivate = '37' + MouseWheel = '38' def __str__(self): return self.name diff --git a/Misc/NEWS.d/next/Library/2020-09-22-00-23-30.bpo-41817.bnh-VG.rst b/Misc/NEWS.d/next/Library/2020-09-22-00-23-30.bpo-41817.bnh-VG.rst new file mode 100644 index 0000000000000..6a634bb613260 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-09-22-00-23-30.bpo-41817.bnh-VG.rst @@ -0,0 +1 @@ +fix `tkinter.EventType` Enum so all members are strings, and none are tuples From webhook-mailer at python.org Tue Sep 22 14:31:26 2020 From: webhook-mailer at python.org (Miss Islington (bot)) Date: Tue, 22 Sep 2020 18:31:26 -0000 Subject: [Python-checkins] fix `EventType` bases Message-ID: https://github.com/python/cpython/commit/b38ad227051d03e731a80db3942a729485262bd4 commit: b38ad227051d03e731a80db3942a729485262bd4 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com> committer: GitHub date: 2020-09-22T11:31:22-07:00 summary: fix `EventType` bases `StrEnum` does not exist in 3.8, so use original `(str, enum.Enum)` bases. files: A Misc/NEWS.d/next/Library/2020-09-22-00-23-30.bpo-41817.bnh-VG.rst M Lib/tkinter/__init__.py diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py index 1067ab6a8b8a1..11ced6a3aff81 100644 --- a/Lib/tkinter/__init__.py +++ b/Lib/tkinter/__init__.py @@ -146,10 +146,10 @@ def _splitdict(tk, v, cut_minus=True, conv=None): class EventType(str, enum.Enum): KeyPress = '2' - Key = KeyPress, + Key = KeyPress KeyRelease = '3' ButtonPress = '4' - Button = ButtonPress, + Button = ButtonPress ButtonRelease = '5' Motion = '6' Enter = '7' @@ -180,10 +180,10 @@ class EventType(str, enum.Enum): Colormap = '32' ClientMessage = '33' # undocumented Mapping = '34' # undocumented - VirtualEvent = '35', # undocumented - Activate = '36', - Deactivate = '37', - MouseWheel = '38', + VirtualEvent = '35' # undocumented + Activate = '36' + Deactivate = '37' + MouseWheel = '38' def __str__(self): return self.name diff --git a/Misc/NEWS.d/next/Library/2020-09-22-00-23-30.bpo-41817.bnh-VG.rst b/Misc/NEWS.d/next/Library/2020-09-22-00-23-30.bpo-41817.bnh-VG.rst new file mode 100644 index 0000000000000..6a634bb613260 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-09-22-00-23-30.bpo-41817.bnh-VG.rst @@ -0,0 +1 @@ +fix `tkinter.EventType` Enum so all members are strings, and none are tuples From webhook-mailer at python.org Tue Sep 22 14:35:46 2020 From: webhook-mailer at python.org (Miss Islington (bot)) Date: Tue, 22 Sep 2020 18:35:46 -0000 Subject: [Python-checkins] bpo-35764: Rewrite the IDLE Calltips doc section (GH-22363) Message-ID: https://github.com/python/cpython/commit/f27a1577d32f88c959e1ef6d0b12f25b2a54cdca commit: f27a1577d32f88c959e1ef6d0b12f25b2a54cdca branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com> committer: GitHub date: 2020-09-22T14:35:38-04:00 summary: bpo-35764: Rewrite the IDLE Calltips doc section (GH-22363) files: A Misc/NEWS.d/next/IDLE/2020-09-22-11-13-45.bpo-35764.VoNa8y.rst M Doc/library/idle.rst M Lib/idlelib/NEWS.txt M Lib/idlelib/help.html diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst index 43096b014fed3..a59a5d3a46570 100644 --- a/Doc/library/idle.rst +++ b/Doc/library/idle.rst @@ -527,30 +527,33 @@ by typing '_' after '.', either before or after the box is opened. Calltips ^^^^^^^^ -A calltip is shown when one types :kbd:`(` after the name of an *accessible* -function. A name expression may include dots and subscripts. A calltip -remains until it is clicked, the cursor is moved out of the argument area, -or :kbd:`)` is typed. When the cursor is in the argument part of a definition, -the menu or shortcut display a calltip. - -A calltip consists of the function signature and the first line of the -docstring. For builtins without an accessible signature, the calltip -consists of all lines up the fifth line or the first blank line. These -details may change. - -The set of *accessible* functions depends on what modules have been imported -into the user process, including those imported by Idle itself, -and what definitions have been run, all since the last restart. +A calltip is shown automatically when one types :kbd:`(` after the name +of an *accessible* function. A function name expression may include +dots and subscripts. A calltip remains until it is clicked, the cursor +is moved out of the argument area, or :kbd:`)` is typed. Whenever the +cursor is in the argument part of a definition, select Edit and "Show +Call Tip" on the menu or enter its shortcut to display a calltip. + +The calltip consists of the function's signature and docstring up to +the latter's first blank line or the fifth non-blank line. (Some builtin +functions lack an accessible signature.) A '/' or '*' in the signature +indicates that the preceding or following arguments are passed by +position or name (keyword) only. Details are subject to change. + +In Shell, the accessible functions depends on what modules have been +imported into the user process, including those imported by Idle itself, +and which definitions have been run, all since the last restart. For example, restart the Shell and enter ``itertools.count(``. A calltip -appears because Idle imports itertools into the user process for its own use. -(This could change.) Enter ``turtle.write(`` and nothing appears. Idle does -not import turtle. The menu or shortcut do nothing either. Enter -``import turtle`` and then ``turtle.write(`` will work. - -In an editor, import statements have no effect until one runs the file. One -might want to run a file after writing the import statements at the top, -or immediately run an existing file before editing. +appears because Idle imports itertools into the user process for its own +use. (This could change.) Enter ``turtle.write(`` and nothing appears. +Idle does not itself import turtle. The menu entry and shortcut also do +nothing. Enter ``import turtle``. Thereafter, ``turtle.write(`` +will display a calltip. + +In an editor, import statements have no effect until one runs the file. +One might want to run a file after writing import statements, after +adding function definitions, or after opening an existing file. .. _code-context: diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt index f8ec6ab505297..7eea0a47aa6e8 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -3,6 +3,8 @@ Released on 2020-10-05? ====================================== +bpo-35764: Rewrite the Calltips doc section. + bpo-40181: In calltips, stop reminding that '/' marks the end of positional-only arguments. diff --git a/Lib/idlelib/help.html b/Lib/idlelib/help.html index b2853cffe0c26..0edd3917e1ffa 100644 --- a/Lib/idlelib/help.html +++ b/Lib/idlelib/help.html @@ -509,26 +509,29 @@

Automatic indentation

Calltips ?
-
A calltip is shown when one types `(` after the name of an accessible -function. A name expression may include dots and subscripts. A calltip -remains until it is clicked, the cursor is moved out of the argument area, -or `)` is typed. When the cursor is in the argument part of a definition, -the menu or shortcut display a calltip.
-
A calltip consists of the function signature and the first line of the -docstring. For builtins without an accessible signature, the calltip -consists of all lines up the fifth line or the first blank line. These -details may change.
-
The set of accessible functions depends on what modules have been imported -into the user process, including those imported by Idle itself, -and what definitions have been run, all since the last restart.
+
A calltip is shown automatically when one types `(` after the name +of an accessible function. A function name expression may include +dots and subscripts. A calltip remains until it is clicked, the cursor +is moved out of the argument area, or `)` is typed. Whenever the +cursor is in the argument part of a definition, select Edit and ?Show +Call Tip? on the menu or enter its shortcut to display a calltip.
+
The calltip consists of the function?s signature and docstring up to +the latter?s first blank line or the fifth non-blank line. (Some builtin +functions lack an accessible signature.) A ?/? or ?? in the signature +indicates that the preceding or following arguments are passed by +position or name (keyword) only. Details are subject to change.
+
In Shell, the accessible functions depends on what modules have been +imported into the user process, including those imported by Idle itself, +and which definitions have been run, all since the last restart.

For example, restart the Shell and enter `itertools.count(`. A calltip -appears because Idle imports itertools into the user process for its own use. -(This could change.) Enter `turtle.write(` and nothing appears. Idle does -not import turtle. The menu or shortcut do nothing either. Enter -`import turtle` and then `turtle.write(` will work.
-
In an editor, import statements have no effect until one runs the file. One -might want to run a file after writing the import statements at the top, -or immediately run an existing file before editing.
+appears because Idle imports itertools into the user process for its own +use. (This could change.) Enter `turtle.write(` and nothing appears. +Idle does not itself import turtle. The menu entry and shortcut also do +nothing. Enter `import turtle`. Thereafter, `turtle.write(` +will display a calltip.
+
In an editor, import statements have no effect until one runs the file. +One might want to run a file after writing import statements, after +adding function definitions, or after opening an existing file.

Code Context?
@@ -975,7 +978,7 @@
Navigation

- Last updated on Sep 09, 2020. + Last updated on Sep 22, 2020. Found a bug?
diff --git a/Misc/NEWS.d/next/IDLE/2020-09-22-11-13-45.bpo-35764.VoNa8y.rst b/Misc/NEWS.d/next/IDLE/2020-09-22-11-13-45.bpo-35764.VoNa8y.rst new file mode 100644 index 0000000000000..eb62d3699d5fe --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2020-09-22-11-13-45.bpo-35764.VoNa8y.rst @@ -0,0 +1 @@ +Rewrite the Calltips doc section. From webhook-mailer at python.org Tue Sep 22 14:36:07 2020 From: webhook-mailer at python.org (Miss Islington (bot)) Date: Tue, 22 Sep 2020 18:36:07 -0000 Subject: [Python-checkins] bpo-35764: Rewrite the IDLE Calltips doc section (GH-22363) Message-ID: https://github.com/python/cpython/commit/2466a7ae6bb1e4049c3d045a30a0503dda7654c5 commit: 2466a7ae6bb1e4049c3d045a30a0503dda7654c5 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com> committer: GitHub date: 2020-09-22T14:36:02-04:00 summary: bpo-35764: Rewrite the IDLE Calltips doc section (GH-22363) Co-authored-by: Terry Jan Reedy files: A Misc/NEWS.d/next/IDLE/2020-09-22-11-13-45.bpo-35764.VoNa8y.rst M Doc/library/idle.rst M Lib/idlelib/NEWS.txt M Lib/idlelib/help.html diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst index 43096b014fed3..a59a5d3a46570 100644 --- a/Doc/library/idle.rst +++ b/Doc/library/idle.rst @@ -527,30 +527,33 @@ by typing '_' after '.', either before or after the box is opened. Calltips ^^^^^^^^ -A calltip is shown when one types :kbd:`(` after the name of an accessible* -function. A name expression may include dots and subscripts. A calltip -remains until it is clicked, the cursor is moved out of the argument area, -or :kbd:`)` is typed. When the cursor is in the argument part of a definition, -the menu or shortcut display a calltip. - -A calltip consists of the function signature and the first line of the -docstring. For builtins without an accessible signature, the calltip -consists of all lines up the fifth line or the first blank line. These -details may change. - -The set of accessible functions depends on what modules have been imported -into the user process, including those imported by Idle itself, -and what definitions have been run, all since the last restart. +A calltip is shown automatically when one types :kbd:`(` after the name +of an accessible function. A function name expression may include +dots and subscripts. A calltip remains until it is clicked, the cursor +is moved out of the argument area, or :kbd:`)` is typed. Whenever the +cursor is in the argument part of a definition, select Edit and "Show +Call Tip" on the menu or enter its shortcut to display a calltip. + +The calltip consists of the function's signature and docstring up to +the latter's first blank line or the fifth non-blank line. (Some builtin +functions lack an accessible signature.) A '/' or '' in the signature +indicates that the preceding or following arguments are passed by +position or name (keyword) only. Details are subject to change. + +In Shell, the accessible functions depends on what modules have been +imported into the user process, including those imported by Idle itself, +and which definitions have been run, all since the last restart. For example, restart the Shell and enter ``itertools.count(``. A calltip -appears because Idle imports itertools into the user process for its own use. -(This could change.) Enter ``turtle.write(`` and nothing appears. Idle does -not import turtle. The menu or shortcut do nothing either. Enter -``import turtle`` and then ``turtle.write(`` will work. - -In an editor, import statements have no effect until one runs the file. One -might want to run a file after writing the import statements at the top, -or immediately run an existing file before editing. +appears because Idle imports itertools into the user process for its own +use. (This could change.) Enter ``turtle.write(`` and nothing appears. +Idle does not itself import turtle. The menu entry and shortcut also do +nothing. Enter ``import turtle``. Thereafter, ``turtle.write(`` +will display a calltip. + +In an editor, import statements have no effect until one runs the file. +One might want to run a file after writing import statements, after +adding function definitions, or after opening an existing file. .. _code-context: diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt index 2cb1910c6c3f3..5d9602e707b07 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -3,6 +3,8 @@ Released on 2020-09-14? ====================================== +bpo-35764: Rewrite the Calltips doc section. + bpo-40181: In calltips, stop reminding that '/' marks the end of positional-only arguments. diff --git a/Lib/idlelib/help.html b/Lib/idlelib/help.html index b2853cffe0c26..0edd3917e1ffa 100644 --- a/Lib/idlelib/help.html +++ b/Lib/idlelib/help.html @@ -509,26 +509,29 @@
Automatic indentation

Calltips ?
-
A calltip is shown when one types `(` after the name of an accessible* -function. A name expression may include dots and subscripts. A calltip -remains until it is clicked, the cursor is moved out of the argument area, -or `)` is typed. When the cursor is in the argument part of a definition, -the menu or shortcut display a calltip.
-
A calltip consists of the function signature and the first line of the -docstring. For builtins without an accessible signature, the calltip -consists of all lines up the fifth line or the first blank line. These -details may change.
-
The set of accessible functions depends on what modules have been imported -into the user process, including those imported by Idle itself, -and what definitions have been run, all since the last restart.
+
A calltip is shown automatically when one types `(` after the name +of an accessible function. A function name expression may include +dots and subscripts. A calltip remains until it is clicked, the cursor +is moved out of the argument area, or `)` is typed. Whenever the +cursor is in the argument part of a definition, select Edit and ?Show +Call Tip? on the menu or enter its shortcut to display a calltip.
+
The calltip consists of the function?s signature and docstring up to +the latter?s first blank line or the fifth non-blank line. (Some builtin +functions lack an accessible signature.) A ?/? or ?? in the signature +indicates that the preceding or following arguments are passed by +position or name (keyword) only. Details are subject to change.
+
In Shell, the accessible functions depends on what modules have been +imported into the user process, including those imported by Idle itself, +and which definitions have been run, all since the last restart.

For example, restart the Shell and enter `itertools.count(`. A calltip -appears because Idle imports itertools into the user process for its own use. -(This could change.) Enter `turtle.write(` and nothing appears. Idle does -not import turtle. The menu or shortcut do nothing either. Enter -`import turtle` and then `turtle.write(` will work.
-
In an editor, import statements have no effect until one runs the file. One -might want to run a file after writing the import statements at the top, -or immediately run an existing file before editing.
+appears because Idle imports itertools into the user process for its own +use. (This could change.) Enter `turtle.write(` and nothing appears. +Idle does not itself import turtle. The menu entry and shortcut also do +nothing. Enter `import turtle`. Thereafter, `turtle.write(` +will display a calltip.
+
In an editor, import statements have no effect until one runs the file. +One might want to run a file after writing import statements, after +adding function definitions, or after opening an existing file.

Code Context?
@@ -975,7 +978,7 @@
Navigation

- Last updated on Sep 09, 2020. + Last updated on Sep 22, 2020. Found a bug?
diff --git a/Misc/NEWS.d/next/IDLE/2020-09-22-11-13-45.bpo-35764.VoNa8y.rst b/Misc/NEWS.d/next/IDLE/2020-09-22-11-13-45.bpo-35764.VoNa8y.rst new file mode 100644 index 0000000000000..eb62d3699d5fe --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2020-09-22-11-13-45.bpo-35764.VoNa8y.rst @@ -0,0 +1 @@ +Rewrite the Calltips doc section. From webhook-mailer at python.org Tue Sep 22 16:00:26 2020 From: webhook-mailer at python.org (Ethan Furman) Date: Tue, 22 Sep 2020 20:00:26 -0000 Subject: [Python-checkins] bpo-41816: `StrEnum.str` is `str.str` (GH-22362) Message-ID: https://github.com/python/cpython/commit/d986d1657e1e7b50807d0633cb31d96a2d866d42 commit: d986d1657e1e7b50807d0633cb31d96a2d866d42 branch: master author: Ethan Furman committer: GitHub date: 2020-09-22T13:00:07-07:00 summary: bpo-41816: `StrEnum.str` is `str.str` (GH-22362) use `str.str` for `StrEnum` so that `str(StrEnum.member)` is the same as directly accessing the string value of the `StrEnum` member files: M Doc/library/enum.rst M Lib/enum.py M Lib/test/test_enum.py diff --git a/Doc/library/enum.rst b/Doc/library/enum.rst index 3e9b1f9db3550..118002bef19f8 100644 --- a/Doc/library/enum.rst +++ b/Doc/library/enum.rst @@ -622,6 +622,11 @@ an incorrect member:: Before :class:`StrEnum`, ``Directions.NORTH`` would have been the :class:`tuple` ``('north',)``. +.. note:: + + Unlike other Enum's, ``str(StrEnum.member)`` will return the value of the + member instead of the usual ``"EnumClass.member"``. + .. versionadded:: 3.10 @@ -1243,3 +1248,13 @@ all named flags and all named combinations of flags that are in the value:: >>> Color(7) # not named combination +``StrEnum`` and :meth:`str.str` +""""""""""""""""""""""""""""""""""" + +An important difference between :class:`StrEnum` and other Enums is the +:meth:`str` method; because :class:`StrEnum` members are strings, some +parts of Python will read the string data directly, while others will call +:meth:`str()`. To make those two operations have the same result, +:meth:`StrEnum.str` will be the same as :meth:`str.str` so that +``str(StrEnum.member) == StrEnum.member`` is true. + diff --git a/Lib/enum.py b/Lib/enum.py index 589b17fd69777..40ff25b9cdad3 100644 --- a/Lib/enum.py +++ b/Lib/enum.py @@ -718,6 +718,8 @@ def new(cls, values): member._value_ = value return member + str = str.str + def _reduce_ex_by_name(self, proto): return self.name diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py index 8e84d929429eb..3431040f98a72 100644 --- a/Lib/test/test_enum.py +++ b/Lib/test/test_enum.py @@ -2036,6 +2036,37 @@ class GoodStrEnum(StrEnum): two = '2' three = b'3', 'ascii' four = b'4', 'latin1', 'strict' + self.assertEqual(GoodStrEnum.one, '1') + self.assertEqual(str(GoodStrEnum.one), '1') + self.assertEqual(GoodStrEnum.one, str(GoodStrEnum.one)) + self.assertEqual(GoodStrEnum.one, '{}'.format(GoodStrEnum.one)) + # + class DumbMixin: + def str(self): + return "don't do this" + class DumbStrEnum(DumbMixin, StrEnum): + five = '5' + six = '6' + seven = '7' + self.assertEqual(DumbStrEnum.seven, '7') + self.assertEqual(str(DumbStrEnum.seven), "don't do this") + # + class EnumMixin(Enum): + def hello(self): + print('hello from %s' % (self, )) + class HelloEnum(EnumMixin, StrEnum): + eight = '8' + self.assertEqual(HelloEnum.eight, '8') + self.assertEqual(HelloEnum.eight, str(HelloEnum.eight)) + # + class GoodbyeMixin: + def goodbye(self): + print('%s wishes you a fond farewell') + class GoodbyeEnum(GoodbyeMixin, EnumMixin, StrEnum): + nine = '9' + self.assertEqual(GoodbyeEnum.nine, '9') + self.assertEqual(GoodbyeEnum.nine, str(GoodbyeEnum.nine)) + # with self.assertRaisesRegex(TypeError, '1 is not a string'): class FirstFailedStrEnum(StrEnum): one = 1 From webhook-mailer at python.org Tue Sep 22 23:01:32 2020 From: webhook-mailer at python.org (Raymond Hettinger) Date: Wed, 23 Sep 2020 03:01:32 -0000 Subject: [Python-checkins] bpo-41513: Improve order of adding fractional values. Improve variable names. (GH-22368) Message-ID: https://github.com/python/cpython/commit/438e9fc66f664eff0526a16a6d900349bfd1f9d2 commit: 438e9fc66f664eff0526a16a6d900349bfd1f9d2 branch: master author: Raymond Hettinger committer: GitHub date: 2020-09-22T20:01:12-07:00 summary: bpo-41513: Improve order of adding fractional values. Improve variable names. (GH-22368) files: M Modules/mathmodule.c diff --git a/Modules/mathmodule.c b/Modules/mathmodule.c index 935759ec671ca..5cd31b7dd4acf 100644 --- a/Modules/mathmodule.c +++ b/Modules/mathmodule.c @@ -2502,8 +2502,8 @@ exactly equal) was verified for 1 billion random inputs with n=5. [7] static inline double vector_norm(Py_ssize_t n, double vec, double max, int found_nan) { - const double T27 = 134217729.0; / ldexp(1.0, 27)+1.0) / - double x, csum = 1.0, oldcsum, scale, frac=0.0, frac_mid=0.0, frac_lo=0.0; + const double T27 = 134217729.0; / ldexp(1.0, 27) + 1.0) / + double x, scale, oldcsum, csum = 1.0, frac1 = 0.0, frac2 = 0.0, frac3 = 0.0; double t, hi, lo, h; int max_e; Py_ssize_t i; @@ -2539,18 +2539,18 @@ vector_norm(Py_ssize_t n, double vec, double max, int found_nan) assert(fabs(csum) >= fabs(x)); oldcsum = csum; csum += x; - frac += (oldcsum - csum) + x; + frac1 += (oldcsum - csum) + x; x = 2.0 * hi * lo; assert(fabs(csum) >= fabs(x)); oldcsum = csum; csum += x; - frac_mid += (oldcsum - csum) + x; + frac2 += (oldcsum - csum) + x; assert(csum + lo * lo == csum); - frac_lo += lo * lo; + frac3 += lo * lo; } - h = sqrt(csum - 1.0 + (frac_lo + frac_mid + frac)); + h = sqrt(csum - 1.0 + (frac1 + frac2 + frac3)); x = h; t = x * T27; @@ -2562,21 +2562,21 @@ vector_norm(Py_ssize_t n, double vec, double max, int found_nan) assert(fabs(csum) >= fabs(x)); oldcsum = csum; csum += x; - frac += (oldcsum - csum) + x; + frac1 += (oldcsum - csum) + x; x = -2.0 hi * lo; assert(fabs(csum) >= fabs(x)); oldcsum = csum; csum += x; - frac_mid += (oldcsum - csum) + x; + frac2 += (oldcsum - csum) + x; x = -lo * lo; assert(fabs(csum) >= fabs(x)); oldcsum = csum; csum += x; - frac_lo += (oldcsum - csum) + x; + frac3 += (oldcsum - csum) + x; - x = csum - 1.0 + (frac_lo + frac_mid + frac); + x = csum - 1.0 + (frac1 + frac2 + frac3); return (h + x / (2.0 * h)) / scale; } /* When max_e < -1023, ldexp(1.0, -max_e) overflows. @@ -2591,9 +2591,9 @@ vector_norm(Py_ssize_t n, double vec, double max, int found_nan) assert(fabs(csum) >= fabs(x)); oldcsum = csum; csum += x; - frac += (oldcsum - csum) + x; + frac1 += (oldcsum - csum) + x; } - return max sqrt(csum - 1.0 + frac); + return max * sqrt(csum - 1.0 + frac1); } #define NUM_STACK_ELEMS 16 From webhook-mailer at python.org Tue Sep 22 23:57:57 2020 From: webhook-mailer at python.org (Miss Islington (bot)) Date: Wed, 23 Sep 2020 03:57:57 -0000 Subject: [Python-checkins] bpo-37062: Enum: add extended AutoNumber example (GH-22349) (GH-22369) Message-ID: https://github.com/python/cpython/commit/5acc1b5f0b62eef3258e4bc31eba3b9c659108c9 commit: 5acc1b5f0b62eef3258e4bc31eba3b9c659108c9 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com> committer: GitHub date: 2020-09-22T20:57:48-07:00 summary: bpo-37062: Enum: add extended AutoNumber example (GH-22349) (GH-22369) (cherry picked from commit 62e40d8450b9c78346ec3617de7fe3f0ad381510) Co-authored-by: Ethan Furman files: M Doc/library/enum.rst M Misc/ACKS diff --git a/Doc/library/enum.rst b/Doc/library/enum.rst index 8753416a27416..bd10016b937b4 100644 --- a/Doc/library/enum.rst +++ b/Doc/library/enum.rst @@ -888,6 +888,32 @@ Using an auto-numbering :meth:`new` would look like:: >>> Color.GREEN.value 2 +To make a more general purpose ``AutoNumber``, add ``args`` to the signature:: + + >>> class AutoNumber(NoValue): + ... def new(cls, args): # this is the only change from above + ... value = len(cls.members) + 1 + ... obj = object.new(cls) + ... obj._value_ = value + ... return obj + ... + +Then when you inherit from ``AutoNumber`` you can write your own ``init`` +to handle any extra arguments:: + + >>> class Swatch(AutoNumber): + ... def init(self, pantone='unknown'): + ... self.pantone = pantone + ... AUBURN = '3497' + ... SEA_GREEN = '1246' + ... BLEACHED_CORAL = () # New color, no Pantone code yet! + ... + >>> Swatch.SEA_GREEN + + >>> Swatch.SEA_GREEN.pantone + '1246' + >>> Swatch.BLEACHED_CORAL.pantone + 'unknown' .. note:: diff --git a/Misc/ACKS b/Misc/ACKS index eee6b9accaa50..8d355da8fde05 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1678,6 +1678,7 @@ F?vry Thibault Lowe Thiderman Nicolas M. Thi?ry James Thomas +Reuben Thomas Robin Thomas Brian Thorne Christopher Thorne From webhook-mailer at python.org Tue Sep 22 23:58:39 2020 From: webhook-mailer at python.org (Miss Islington (bot)) Date: Wed, 23 Sep 2020 03:58:39 -0000 Subject: [Python-checkins] bpo-37062: Enum: add extended AutoNumber example (GH-22349) (GH-22370) Message-ID: https://github.com/python/cpython/commit/64362c2e435eddc5e84cea313d92bc0b96d227f7 commit: 64362c2e435eddc5e84cea313d92bc0b96d227f7 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com> committer: GitHub date: 2020-09-22T20:58:32-07:00 summary: bpo-37062: Enum: add extended AutoNumber example (GH-22349) (GH-22370) (cherry picked from commit 62e40d8450b9c78346ec3617de7fe3f0ad381510) Co-authored-by: Ethan Furman files: M Doc/library/enum.rst M Misc/ACKS diff --git a/Doc/library/enum.rst b/Doc/library/enum.rst index 5f0762edc2590..a3c51655576ba 100644 --- a/Doc/library/enum.rst +++ b/Doc/library/enum.rst @@ -887,6 +887,32 @@ Using an auto-numbering :meth:`new` would look like:: >>> Color.GREEN.value 2 +To make a more general purpose ``AutoNumber``, add ``args`` to the signature:: + + >>> class AutoNumber(NoValue): + ... def new(cls, args): # this is the only change from above + ... value = len(cls.members) + 1 + ... obj = object.new(cls) + ... obj._value_ = value + ... return obj + ... + +Then when you inherit from ``AutoNumber`` you can write your own ``init`` +to handle any extra arguments:: + + >>> class Swatch(AutoNumber): + ... def init(self, pantone='unknown'): + ... self.pantone = pantone + ... AUBURN = '3497' + ... SEA_GREEN = '1246' + ... BLEACHED_CORAL = () # New color, no Pantone code yet! + ... + >>> Swatch.SEA_GREEN + + >>> Swatch.SEA_GREEN.pantone + '1246' + >>> Swatch.BLEACHED_CORAL.pantone + 'unknown' .. note:: diff --git a/Misc/ACKS b/Misc/ACKS index 5e0953ae91b18..a16f15a74ebdc 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1713,6 +1713,7 @@ F?vry Thibault Lowe Thiderman Nicolas M. Thi?ry James Thomas +Reuben Thomas Robin Thomas Brian Thorne Christopher Thorne From webhook-mailer at python.org Wed Sep 23 06:33:49 2020 From: webhook-mailer at python.org (Mohamed Koubaa) Date: Wed, 23 Sep 2020 10:33:49 -0000 Subject: [Python-checkins] bpo-1635741: Port _lsprof extension to multi-phase init (PEP 489) (GH-22220) Message-ID: https://github.com/python/cpython/commit/83de110dce94a9196dccc01d526628615714e362 commit: 83de110dce94a9196dccc01d526628615714e362 branch: master author: Mohamed Koubaa committer: GitHub date: 2020-09-23T12:33:21+02:00 summary: bpo-1635741: Port _lsprof extension to multi-phase init (PEP 489) (GH-22220) files: A Misc/NEWS.d/next/Core and Builtins/2020-09-12-18-34-34.bpo-1635741.lh335O.rst M Modules/_lsprof.c M Modules/clinic/_lsprof.c.h diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-09-12-18-34-34.bpo-1635741.lh335O.rst b/Misc/NEWS.d/next/Core and Builtins/2020-09-12-18-34-34.bpo-1635741.lh335O.rst new file mode 100644 index 0000000000000..ba61819df9e08 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2020-09-12-18-34-34.bpo-1635741.lh335O.rst @@ -0,0 +1,2 @@ +Port the :mod:`_lsprof` extension module to multi-phase initialization +(:pep:`489`). diff --git a/Modules/_lsprof.c b/Modules/_lsprof.c index a4ba7d5230033..78d464d1481d7 100644 --- a/Modules/_lsprof.c +++ b/Modules/_lsprof.c @@ -55,12 +55,22 @@ module _lsprof class _lsprof.Profiler "ProfilerObject " "&ProfilerType" [clinic start generated code]/ /[clinic end generated code: output=da39a3ee5e6b4b0d input=e349ac952152f336]/ -static PyTypeObject PyProfiler_Type; #include "clinic/_lsprof.c.h" -#define PyProfiler_Check(op) PyObject_TypeCheck(op, &PyProfiler_Type) -#define PyProfiler_CheckExact(op) Py_IS_TYPE(op, &PyProfiler_Type) +typedef struct { + PyTypeObject profiler_type; + PyTypeObject stats_entry_type; + PyTypeObject stats_subentry_type; +} _lsprof_state; + +static inline _lsprof_state +_lsprof_get_state(PyObject module) +{ + void state = PyModule_GetState(module); + assert(state != NULL); + return (_lsprof_state )state; +} / External Timers / @@ -478,28 +488,24 @@ static PyStructSequence_Field profiler_subentry_fields[] = { }; static PyStructSequence_Desc profiler_entry_desc = { - "_lsprof.profiler_entry", / name / - NULL, / doc / - profiler_entry_fields, - 6 + .name = "_lsprof.profiler_entry", + .doc = "", + .fields = profiler_entry_fields, + .n_in_sequence = 6 }; static PyStructSequence_Desc profiler_subentry_desc = { - "_lsprof.profiler_subentry", / name / - NULL, / doc / - profiler_subentry_fields, - 5 + .name = "_lsprof.profiler_subentry", + .doc = "", + .fields = profiler_subentry_fields, + .n_in_sequence = 5 }; -static int initialized; -static PyTypeObject StatsEntryType; -static PyTypeObject StatsSubEntryType; - - typedef struct { PyObject list; PyObject sublist; double factor; + _lsprof_state state; } statscollector_t; static int statsForSubEntry(rotating_node_t node, void arg) @@ -509,7 +515,7 @@ static int statsForSubEntry(rotating_node_t node, void arg) ProfilerEntry entry = (ProfilerEntry) sentry->header.key; int err; PyObject sinfo; - sinfo = PyObject_CallFunction((PyObject) &StatsSubEntryType, + sinfo = PyObject_CallFunction((PyObject) collect->state->stats_subentry_type, "((Olldd))", entry->userObj, sentry->callcount, @@ -547,7 +553,7 @@ static int statsForEntry(rotating_node_t node, void arg) collect->sublist = Py_None; } - info = PyObject_CallFunction((PyObject) &StatsEntryType, + info = PyObject_CallFunction((PyObject) collect->state->stats_entry_type, "((OllddO))", entry->userObj, entry->callcount, @@ -566,6 +572,8 @@ static int statsForEntry(rotating_node_t node, void arg) /[clinic input] _lsprof.Profiler.getstats + cls: defining_class + list of profiler_entry objects. getstats() -> list of profiler_entry objects @@ -592,10 +600,11 @@ profiler_subentry objects: [clinic start generated code]/ static PyObject -_lsprof_Profiler_getstats_impl(ProfilerObject self) -/[clinic end generated code: output=9461b451e9ef0f24 input=ade04fa384ce450a]/ +_lsprof_Profiler_getstats_impl(ProfilerObject self, PyTypeObject cls) +/[clinic end generated code: output=1806ef720019ee03 input=445e193ef4522902]/ { statscollector_t collect; + collect.state = PyType_GetModuleState(cls); if (pending_exception(self)) { return NULL; } @@ -735,7 +744,9 @@ profiler_dealloc(ProfilerObject op) flush_unmatched(op); clearEntries(op); Py_XDECREF(op->externalTimer); - Py_TYPE(op)->tp_free(op); + PyTypeObject tp = Py_TYPE(op); + tp->tp_free(op); + Py_DECREF(tp); } static int @@ -782,91 +793,107 @@ Profiler(timer=None, timeunit=None, subcalls=True, builtins=True)\n\ is, in seconds).\n\ "); -static PyTypeObject PyProfiler_Type = { - PyVarObject_HEAD_INIT(NULL, 0) - "_lsprof.Profiler", / tp_name / - sizeof(ProfilerObject), / tp_basicsize / - 0, / tp_itemsize / - (destructor)profiler_dealloc, / tp_dealloc / - 0, / tp_vectorcall_offset / - 0, / tp_getattr / - 0, / tp_setattr / - 0, / tp_as_async / - 0, / tp_repr / - 0, / tp_as_number / - 0, / tp_as_sequence / - 0, / tp_as_mapping / - 0, / tp_hash / - 0, / tp_call / - 0, / tp_str / - 0, / tp_getattro / - 0, / tp_setattro / - 0, / tp_as_buffer / - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, / tp_flags / - profiler_doc, / tp_doc / - 0, / tp_traverse / - 0, / tp_clear / - 0, / tp_richcompare / - 0, / tp_weaklistoffset / - 0, / tp_iter / - 0, / tp_iternext / - profiler_methods, / tp_methods / - 0, / tp_members / - 0, / tp_getset / - 0, / tp_base / - 0, / tp_dict / - 0, / tp_descr_get / - 0, / tp_descr_set / - 0, / tp_dictoffset / - (initproc)profiler_init, / tp_init / - PyType_GenericAlloc, / tp_alloc / - PyType_GenericNew, / tp_new / - PyObject_Del, / tp_free / +static PyType_Slot _lsprof_profiler_type_spec_slots[] = { + {Py_tp_doc, (void )profiler_doc}, + {Py_tp_methods, profiler_methods}, + {Py_tp_dealloc, profiler_dealloc}, + {Py_tp_init, profiler_init}, + {Py_tp_alloc, PyType_GenericAlloc}, + {Py_tp_new, PyType_GenericNew}, + {Py_tp_free, PyObject_Del}, + {0, 0} +}; + +static PyType_Spec _lsprof_profiler_type_spec = { + .name = "_lsprof.Profiler", + .basicsize = sizeof(ProfilerObject), + .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, + .slots = _lsprof_profiler_type_spec_slots, }; static PyMethodDef moduleMethods[] = { {NULL, NULL} }; +static int +_lsprof_traverse(PyObject module, visitproc visit, void arg) +{ + _lsprof_state state = _lsprof_get_state(module); + Py_VISIT(state->profiler_type); + Py_VISIT(state->stats_entry_type); + Py_VISIT(state->stats_subentry_type); + return 0; +} + +static int +_lsprof_clear(PyObject module) +{ + _lsprof_state state = _lsprof_get_state(module); + Py_CLEAR(state->profiler_type); + Py_CLEAR(state->stats_entry_type); + Py_CLEAR(state->stats_subentry_type); + return 0; +} + +static void +_lsprof_free(void module) +{ + _lsprof_clear((PyObject )module); +} + +static int +_lsprof_exec(PyObject module) +{ + _lsprof_state state = PyModule_GetState(module); + + state->profiler_type = (PyTypeObject )PyType_FromModuleAndSpec( + module, &_lsprof_profiler_type_spec, NULL); + if (state->profiler_type == NULL) { + return -1; + } + + if (PyModule_AddType(module, state->profiler_type) < 0) { + return -1; + } + + state->stats_entry_type = PyStructSequence_NewType(&profiler_entry_desc); + if (state->stats_entry_type == NULL) { + return -1; + } + if (PyModule_AddType(module, state->stats_entry_type) < 0) { + return -1; + } + + state->stats_subentry_type = PyStructSequence_NewType(&profiler_subentry_desc); + if (state->stats_subentry_type == NULL) { + return -1; + } + if (PyModule_AddType(module, state->stats_subentry_type) < 0) { + return -1; + } + + return 0; +} + +static PyModuleDef_Slot _lsprofslots[] = { + {Py_mod_exec, _lsprof_exec}, + {0, NULL} +}; static struct PyModuleDef _lsprofmodule = { PyModuleDef_HEAD_INIT, - "_lsprof", - "Fast profiler", - -1, - moduleMethods, - NULL, - NULL, - NULL, - NULL + .m_name = "_lsprof", + .m_doc = "Fast profiler", + .m_size = sizeof(_lsprof_state), + .m_methods = moduleMethods, + .m_slots = _lsprofslots, + .m_traverse = _lsprof_traverse, + .m_clear = _lsprof_clear, + .m_free = _lsprof_free }; PyMODINIT_FUNC PyInit__lsprof(void) { - PyObject module, d; - module = PyModule_Create(&_lsprofmodule); - if (module == NULL) - return NULL; - d = PyModule_GetDict(module); - if (PyType_Ready(&PyProfiler_Type) < 0) - return NULL; - PyDict_SetItemString(d, "Profiler", (PyObject )&PyProfiler_Type); - - if (!initialized) { - if (PyStructSequence_InitType2(&StatsEntryType, - &profiler_entry_desc) < 0) - return NULL; - if (PyStructSequence_InitType2(&StatsSubEntryType, - &profiler_subentry_desc) < 0) - return NULL; - } - Py_INCREF((PyObject) &StatsEntryType); - Py_INCREF((PyObject) &StatsSubEntryType); - PyModule_AddObject(module, "profiler_entry", - (PyObject) &StatsEntryType); - PyModule_AddObject(module, "profiler_subentry", - (PyObject) &StatsSubEntryType); - initialized = 1; - return module; + return PyModuleDef_Init(&_lsprofmodule); } diff --git a/Modules/clinic/_lsprof.c.h b/Modules/clinic/_lsprof.c.h index 50762e3ff3596..5d9c209eab856 100644 --- a/Modules/clinic/_lsprof.c.h +++ b/Modules/clinic/_lsprof.c.h @@ -31,14 +31,25 @@ PyDoc_STRVAR(_lsprof_Profiler_getstatsdoc, " inlinetime inline time (not in further subcalls)"); #define _LSPROF_PROFILER_GETSTATS_METHODDEF \ - {"getstats", (PyCFunction)_lsprof_Profiler_getstats, METH_NOARGS, _lsprof_Profiler_getstatsdoc}, + {"getstats", (PyCFunction)(void()(void))_lsprof_Profiler_getstats, METH_METHOD|METH_FASTCALL|METH_KEYWORDS, _lsprof_Profiler_getstatsdoc}, static PyObject * -_lsprof_Profiler_getstats_impl(ProfilerObject self); +_lsprof_Profiler_getstats_impl(ProfilerObject self, PyTypeObject cls); static PyObject -_lsprof_Profiler_getstats(ProfilerObject self, PyObject Py_UNUSED(ignored)) +_lsprof_Profiler_getstats(ProfilerObject self, PyTypeObject cls, PyObject const args, Py_ssize_t nargs, PyObject kwnames) { - return _lsprof_Profiler_getstats_impl(self); + PyObject return_value = NULL; + static const char * const _keywords[] = { NULL}; + static _PyArg_Parser _parser = {":getstats", _keywords, 0}; + + if (!_PyArg_ParseStackAndKeywords(args, nargs, kwnames, &_parser + )) { + goto exit; + } + return_value = _lsprof_Profiler_getstats_impl(self, cls); + +exit: + return return_value; } -/[clinic end generated code: output=24c525812713e00f input=a9049054013a1b77]/ +/[clinic end generated code: output=b4727cfebecdd22d input=a9049054013a1b77]/ From webhook-mailer at python.org Wed Sep 23 06:38:20 2020 From: webhook-mailer at python.org (Mohamed Koubaa) Date: Wed, 23 Sep 2020 10:38:20 -0000 Subject: [Python-checkins] bpo-1635741, unicodedata: add ucd_type parameter to UCD_Check() macro (GH-22328) Message-ID: https://github.com/python/cpython/commit/ddc0dd001a4224274ba6f83568b45a1dd88c6fc6 commit: ddc0dd001a4224274ba6f83568b45a1dd88c6fc6 branch: master author: Mohamed Koubaa committer: GitHub date: 2020-09-23T12:38:16+02:00 summary: bpo-1635741, unicodedata: add ucd_type parameter to UCD_Check() macro (GH-22328) Co-authored-by: Victor Stinner files: M Modules/unicodedata.c diff --git a/Modules/unicodedata.c b/Modules/unicodedata.c index 8a1198a2b712d..8e11cfc4dafa9 100644 --- a/Modules/unicodedata.c +++ b/Modules/unicodedata.c @@ -92,7 +92,10 @@ static PyMemberDef DB_members[] = { /* forward declaration / static PyTypeObject UCD_Type; -#define UCD_Check(o) Py_IS_TYPE(o, &UCD_Type) + +// Check if self is an instance of UCD_Type. +// Return 0 if self is NULL (when the PyCapsule C API is used). +#define UCD_Check(self, ucd_type) (self != NULL && Py_IS_TYPE(self, ucd_type)) static PyObject new_previous_version(const charname, const change_record (getrecord)(Py_UCS4), @@ -135,7 +138,7 @@ unicodedata_UCD_decimal_impl(PyObject self, int chr, long rc; Py_UCS4 c = (Py_UCS4)chr; - if (self && UCD_Check(self)) { + if (UCD_Check(self, &UCD_Type)) { const change_record old = get_old_record(self, c); if (old->category_changed == 0) { / unassigned / @@ -223,7 +226,7 @@ unicodedata_UCD_numeric_impl(PyObject self, int chr, double rc; Py_UCS4 c = (Py_UCS4)chr; - if (self && UCD_Check(self)) { + if (UCD_Check(self, &UCD_Type)) { const change_record old = get_old_record(self, c); if (old->category_changed == 0) { / unassigned / @@ -268,7 +271,7 @@ unicodedata_UCD_category_impl(PyObject self, int chr) int index; Py_UCS4 c = (Py_UCS4)chr; index = (int) _getrecord_ex(c)->category; - if (self && UCD_Check(self)) { + if (UCD_Check(self, &UCD_Type)) { const change_record old = get_old_record(self, c); if (old->category_changed != 0xFF) index = old->category_changed; @@ -295,7 +298,7 @@ unicodedata_UCD_bidirectional_impl(PyObject self, int chr) int index; Py_UCS4 c = (Py_UCS4)chr; index = (int) _getrecord_ex(c)->bidirectional; - if (self && UCD_Check(self)) { + if (UCD_Check(self, &UCD_Type)) { const change_record old = get_old_record(self, c); if (old->category_changed == 0) index = 0; / unassigned / @@ -324,7 +327,7 @@ unicodedata_UCD_combining_impl(PyObject self, int chr) int index; Py_UCS4 c = (Py_UCS4)chr; index = (int) _getrecord_ex(c)->combining; - if (self && UCD_Check(self)) { + if (UCD_Check(self, &UCD_Type)) { const change_record old = get_old_record(self, c); if (old->category_changed == 0) index = 0; / unassigned / @@ -352,7 +355,7 @@ unicodedata_UCD_mirrored_impl(PyObject self, int chr) int index; Py_UCS4 c = (Py_UCS4)chr; index = (int) _getrecord_ex(c)->mirrored; - if (self && UCD_Check(self)) { + if (UCD_Check(self, &UCD_Type)) { const change_record old = get_old_record(self, c); if (old->category_changed == 0) index = 0; / unassigned / @@ -379,7 +382,7 @@ unicodedata_UCD_east_asian_width_impl(PyObject self, int chr) int index; Py_UCS4 c = (Py_UCS4)chr; index = (int) _getrecord_ex(c)->east_asian_width; - if (self && UCD_Check(self)) { + if (UCD_Check(self, &UCD_Type)) { const change_record old = get_old_record(self, c); if (old->category_changed == 0) index = 0; / unassigned / @@ -413,7 +416,7 @@ unicodedata_UCD_decomposition_impl(PyObject self, int chr) code = (int)c; - if (self && UCD_Check(self)) { + if (UCD_Check(self, &UCD_Type)) { const change_record old = get_old_record(self, c); if (old->category_changed == 0) return PyUnicode_FromString(""); / unassigned / @@ -460,7 +463,7 @@ get_decomp_record(PyObject self, Py_UCS4 code, int index, int prefix, int co { if (code >= 0x110000) { index = 0; - } else if (self && UCD_Check(self) && + } else if (UCD_Check(self, &UCD_Type) && get_old_record(self, code)->category_changed==0) { /* unassigned in old version / index = 0; @@ -558,7 +561,7 @@ nfd_nfkd(PyObject self, PyObject input, int k) continue; } /* normalization changes / - if (self && UCD_Check(self)) { + if (UCD_Check(self, &UCD_Type)) { Py_UCS4 value = ((PreviousDBVersion)self)->normalization(code); if (value != 0) { stack[stackptr++] = value; @@ -799,7 +802,7 @@ is_normalized_quickcheck(PyObject self, PyObject input, { /* An older version of the database is requested, quickchecks must be disabled. / - if (self && UCD_Check(self)) + if (UCD_Check(self, &UCD_Type)) return NO; Py_ssize_t i, len; @@ -1066,7 +1069,7 @@ _getucname(PyObject self, Py_UCS4 code, char* buffer, int buflen, if (!with_alias_and_seq && (IS_ALIAS(code) || IS_NAMED_SEQ(code))) return 0; - if (self && UCD_Check(self)) { + if (UCD_Check(self, &UCD_Type)) { /* in 3.2.0 there are no aliases and named sequences / const change_record old; if (IS_ALIAS(code) || IS_NAMED_SEQ(code)) From webhook-mailer at python.org Wed Sep 23 08:05:02 2020 From: webhook-mailer at python.org (Victor Stinner) Date: Wed, 23 Sep 2020 12:05:02 -0000 Subject: [Python-checkins] bpo-41834: Remove _Py_CheckRecursionLimit variable (GH-22359) Message-ID: https://github.com/python/cpython/commit/19c3ac92bf73f1902cff846988552fd7bb8a8621 commit: 19c3ac92bf73f1902cff846988552fd7bb8a8621 branch: master author: Victor Stinner committer: GitHub date: 2020-09-23T14:04:57+02:00 summary: bpo-41834: Remove _Py_CheckRecursionLimit variable (GH-22359) Remove the global _Py_CheckRecursionLimit variable: it has been replaced by ceval.recursion_limit of the PyInterpreterState structure. There is no need to keep the variable for the stable ABI, since Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() were not usable in Python 3.8 and older: these macros accessed PyThreadState members, whereas the PyThreadState structure is opaque in the limited C API. files: A Misc/NEWS.d/next/C API/2020-09-22-14-47-12.bpo-41834.nrOrDU.rst M Doc/whatsnew/3.10.rst M Include/internal/pycore_ceval.h M PC/python3dll.c M Python/ceval.c M Tools/c-analyzer/TODO M Tools/c-analyzer/known.tsv diff --git a/Doc/whatsnew/3.10.rst b/Doc/whatsnew/3.10.rst index f88281a934ca1..606fad2fdcf05 100644 --- a/Doc/whatsnew/3.10.rst +++ b/Doc/whatsnew/3.10.rst @@ -314,3 +314,7 @@ Removed * Removed ``PyUnicode_AsUnicodeCopy()``. Please use :c:func:`PyUnicode_AsUCS4Copy` or :c:func:`PyUnicode_AsWideCharString` (Contributed by Inada Naoki in :issue:`41103`.) + +* Removed ``_Py_CheckRecursionLimit`` variable: it has been replaced by + ``ceval.recursion_limit`` of the :c:type:`PyInterpreterState` structure. + (Contributed by Victor Stinner in :issue:`41834`.) diff --git a/Include/internal/pycore_ceval.h b/Include/internal/pycore_ceval.h index aafb533b57d5f..bbb667ea32d27 100644 --- a/Include/internal/pycore_ceval.h +++ b/Include/internal/pycore_ceval.h @@ -63,8 +63,6 @@ extern void _PyEval_ReleaseLock(PyThreadState tstate); / --- _Py_EnterRecursiveCall() ----------------------------------------- / -PyAPI_DATA(int) _Py_CheckRecursionLimit; - #ifdef USE_STACKCHECK / With USE_STACKCHECK macro defined, trigger stack checks in _Py_CheckRecursiveCall() on every 64th call to Py_EnterRecursiveCall. / diff --git a/Misc/NEWS.d/next/C API/2020-09-22-14-47-12.bpo-41834.nrOrDU.rst b/Misc/NEWS.d/next/C API/2020-09-22-14-47-12.bpo-41834.nrOrDU.rst new file mode 100644 index 0000000000000..07043dce5a627 --- /dev/null +++ b/Misc/NEWS.d/next/C API/2020-09-22-14-47-12.bpo-41834.nrOrDU.rst @@ -0,0 +1,3 @@ +Remove the ``_Py_CheckRecursionLimit`` variable: it has been replaced by +``ceval.recursion_limit`` of the :c:type:`PyInterpreterState` +structure. Patch by Victor Stinner. diff --git a/PC/python3dll.c b/PC/python3dll.c index f72f2c8af19d2..ff69ea7ca5efa 100644 --- a/PC/python3dll.c +++ b/PC/python3dll.c @@ -663,7 +663,6 @@ EXPORT_FUNC(PyWeakref_NewProxy) EXPORT_FUNC(PyWeakref_NewRef) EXPORT_FUNC(PyWrapper_New) -EXPORT_DATA(_Py_CheckRecursionLimit) EXPORT_DATA(_Py_EllipsisObject) EXPORT_DATA(_Py_FalseStruct) EXPORT_DATA(_Py_NoneStruct) diff --git a/Python/ceval.c b/Python/ceval.c index 3de372f45a251..4bb4b820b8e17 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -741,15 +741,12 @@ Py_MakePendingCalls(void) / The interpreter's recursion limit / #ifndef Py_DEFAULT_RECURSION_LIMIT -#define Py_DEFAULT_RECURSION_LIMIT 1000 +# define Py_DEFAULT_RECURSION_LIMIT 1000 #endif -int _Py_CheckRecursionLimit = Py_DEFAULT_RECURSION_LIMIT; - void _PyEval_InitRuntimeState(struct _ceval_runtime_state ceval) { - _Py_CheckRecursionLimit = Py_DEFAULT_RECURSION_LIMIT; #ifndef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS _gil_initialize(&ceval->gil); #endif @@ -797,14 +794,11 @@ Py_SetRecursionLimit(int new_limit) { PyThreadState tstate = _PyThreadState_GET(); tstate->interp->ceval.recursion_limit = new_limit; - if (_Py_IsMainInterpreter(tstate)) { - _Py_CheckRecursionLimit = new_limit; - } } / The function _Py_EnterRecursiveCall() only calls _Py_CheckRecursiveCall() - if the recursion_depth reaches _Py_CheckRecursionLimit. - If USE_STACKCHECK, the macro decrements _Py_CheckRecursionLimit + if the recursion_depth reaches recursion_limit. + If USE_STACKCHECK, the macro decrements recursion_limit to guarantee that _Py_CheckRecursiveCall() is regularly called. Without USE_STACKCHECK, there is no need for this. / int @@ -819,10 +813,6 @@ _Py_CheckRecursiveCall(PyThreadState tstate, const char where) _PyErr_SetString(tstate, PyExc_MemoryError, "Stack overflow"); return -1; } - if (_Py_IsMainInterpreter(tstate)) { - / Needed for ABI backwards-compatibility (see bpo-31857) / - _Py_CheckRecursionLimit = recursion_limit; - } #endif if (tstate->recursion_critical) / Somebody asked that we don't check for recursion. / diff --git a/Tools/c-analyzer/TODO b/Tools/c-analyzer/TODO index 1134055f9a8fd..f5c1a92f85695 100644 --- a/Tools/c-analyzer/TODO +++ b/Tools/c-analyzer/TODO @@ -66,7 +66,6 @@ Objects/tupleobject.c:_Py_tuple_zero_allocs Py_ssize_t _Py_ Objects/typeobject.c:next_version_tag static unsigned int next_version_tag Python/Python-ast.c:init_types():initialized static int initialized Python/bootstrap_hash.c:urandom_cache static struct { int fd; dev_t st_dev; ino_t st_ino; } urandom_cache -Python/ceval.c:_Py_CheckRecursionLimit int _Py_CheckRecursionLimit Python/ceval.c:lltrace static int lltrace Python/ceval.c:make_pending_calls():busy static int busy Python/dynload_shlib.c:handles static struct { dev_t dev; ino_t ino; void handle; } handles[128] diff --git a/Tools/c-analyzer/known.tsv b/Tools/c-analyzer/known.tsv index f92b45e5b4d85..f8c12a3944d9b 100644 --- a/Tools/c-analyzer/known.tsv +++ b/Tools/c-analyzer/known.tsv @@ -805,7 +805,6 @@ Objects/iterobject.c - PyCallIter_Type variable PyTypeObject PyCallIter_Type Objects/capsule.c - PyCapsule_Type variable PyTypeObject PyCapsule_Type Objects/cellobject.c - PyCell_Type variable PyTypeObject PyCell_Type Objects/methodobject.c - PyCFunction_Type variable PyTypeObject PyCFunction_Type -Python/ceval.c - _Py_CheckRecursionLimit variable int _Py_CheckRecursionLimit Objects/descrobject.c - PyClassMethodDescr_Type variable PyTypeObject PyClassMethodDescr_Type Objects/funcobject.c - PyClassMethod_Type variable PyTypeObject PyClassMethod_Type Objects/codeobject.c - PyCode_Type variable PyTypeObject PyCode_Type From webhook-mailer at python.org Wed Sep 23 08:05:37 2020 From: webhook-mailer at python.org (Victor Stinner) Date: Wed, 23 Sep 2020 12:05:37 -0000 Subject: [Python-checkins] bpo-40521: Fix PyUnicode_InternInPlace() (GH-22376) Message-ID: https://github.com/python/cpython/commit/7f413a5d95e6d7ddddd6e2c9844c33594d6288f4 commit: 7f413a5d95e6d7ddddd6e2c9844c33594d6288f4 branch: master author: Victor Stinner committer: GitHub date: 2020-09-23T14:05:32+02:00 summary: bpo-40521: Fix PyUnicode_InternInPlace() (GH-22376) Fix PyUnicode_InternInPlace() when the INTERNED_STRINGS macro is not defined (when the EXPERIMENTAL_ISOLATED_SUBINTERPRETERS macro is defined). files: M Objects/unicodeobject.c diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index fd0e8e008adae..f32ab417c364c 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -15754,6 +15754,10 @@ PyUnicode_InternInPlace(PyObject **p) this. / Py_SET_REFCNT(s, Py_REFCNT(s) - 2); _PyUnicode_STATE(s).interned = SSTATE_INTERNED_MORTAL; +#else + // PyDict expects that interned strings have their hash + // (PyASCIIObject.hash) already computed. + (void)unicode_hash(s); #endif } From webhook-mailer at python.org Wed Sep 23 08:06:59 2020 From: webhook-mailer at python.org (Victor Stinner) Date: Wed, 23 Sep 2020 12:06:59 -0000 Subject: [Python-checkins] bpo-40941: Fix fold_tuple_on_constants() compiler warnings (GH-22378) Message-ID: https://github.com/python/cpython/commit/71f2ff4ccf4ff8bdb56cc30d115ca2ddc602b12f commit: 71f2ff4ccf4ff8bdb56cc30d115ca2ddc602b12f branch: master author: Victor Stinner committer: GitHub date: 2020-09-23T14:06:55+02:00 summary: bpo-40941: Fix fold_tuple_on_constants() compiler warnings (GH-22378) Add explicit casts to fix compiler warnings in fold_tuple_on_constants(). The limit of constants per code is now INT_MAX, rather than UINT_MAX. files: M Python/compile.c diff --git a/Python/compile.c b/Python/compile.c index 3ebf221cf02b7..0f9e5c276c7b7 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -6100,13 +6100,11 @@ fold_tuple_on_constants(struct instr inst, PyTuple_SET_ITEM(newconst, i, constant); } Py_ssize_t index = PyList_GET_SIZE(consts); -#if SIZEOF_SIZE_T > SIZEOF_INT - if ((size_t)index >= UINT_MAX - 1) { + if ((size_t)index >= (size_t)INT_MAX - 1) { Py_DECREF(newconst); PyErr_SetString(PyExc_OverflowError, "too many constants"); return -1; } -#endif if (PyList_Append(consts, newconst)) { Py_DECREF(newconst); return -1; @@ -6116,7 +6114,7 @@ fold_tuple_on_constants(struct instr inst, inst[i].i_opcode = NOP; } inst[n].i_opcode = LOAD_CONST; - inst[n].i_oparg = index; + inst[n].i_oparg = (int)index; return 0; } From webhook-mailer at python.org Wed Sep 23 08:07:21 2020 From: webhook-mailer at python.org (Victor Stinner) Date: Wed, 23 Sep 2020 12:07:21 -0000 Subject: [Python-checkins] bpo-40941: Fix stackdepth compiler warnings (GH-22377) Message-ID: https://github.com/python/cpython/commit/b7d8d8dbfe83040087a63662e0b908f4b5ac24b0 commit: b7d8d8dbfe83040087a63662e0b908f4b5ac24b0 branch: master author: Victor Stinner committer: GitHub date: 2020-09-23T14:07:16+02:00 summary: bpo-40941: Fix stackdepth compiler warnings (GH-22377) Explicitly cast a difference of two pointers to int: PyFrameObject.f_stackdepth is an int. files: M Python/ceval.c diff --git a/Python/ceval.c b/Python/ceval.c index 4bb4b820b8e17..6430e792b8c5d 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -1433,9 +1433,9 @@ _PyEval_EvalFrameDefault(PyThreadState tstate, PyFrameObject f, int throwflag) if (_Py_TracingPossible(ceval2) && tstate->c_tracefunc != NULL && !tstate->tracing) { int err; - / see maybe_call_line_trace + /* see maybe_call_line_trace() for expository comments / - f->f_stackdepth = stack_pointer-f->f_valuestack; + f->f_stackdepth = (int)(stack_pointer - f->f_valuestack); err = maybe_call_line_trace(tstate->c_tracefunc, tstate->c_traceobj, @@ -2265,7 +2265,7 @@ _PyEval_EvalFrameDefault(PyThreadState tstate, PyFrameObject f, int throwflag) assert(f->f_lasti >= (int)sizeof(_Py_CODEUNIT)); f->f_lasti -= sizeof(_Py_CODEUNIT); f->f_state = FRAME_SUSPENDED; - f->f_stackdepth = stack_pointer-f->f_valuestack; + f->f_stackdepth = (int)(stack_pointer - f->f_valuestack); goto exiting; } @@ -2282,7 +2282,7 @@ _PyEval_EvalFrameDefault(PyThreadState tstate, PyFrameObject f, int throwflag) retval = w; } f->f_state = FRAME_SUSPENDED; - f->f_stackdepth = stack_pointer-f->f_valuestack; + f->f_stackdepth = (int)(stack_pointer - f->f_valuestack); goto exiting; } From webhook-mailer at python.org Wed Sep 23 08:08:42 2020 From: webhook-mailer at python.org (Victor Stinner) Date: Wed, 23 Sep 2020 12:08:42 -0000 Subject: [Python-checkins] bpo-40170: Use inline _PyType_HasFeature() function (GH-22375) Message-ID: https://github.com/python/cpython/commit/97d15ae1d8411b49b1fcdc0c67c51849dccce9c9 commit: 97d15ae1d8411b49b1fcdc0c67c51849dccce9c9 branch: master author: Victor Stinner committer: GitHub date: 2020-09-23T14:08:38+02:00 summary: bpo-40170: Use inline _PyType_HasFeature() function (GH-22375) Use _PyType_HasFeature() in the _io module and in structseq implementation. Replace PyType_HasFeature() opaque function call with _PyType_HasFeature() inlined function. files: M Modules/_io/iobase.c M Objects/structseq.c diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c index a8e55c34799bd..195862df5dc06 100644 --- a/Modules/_io/iobase.c +++ b/Modules/_io/iobase.c @@ -349,8 +349,9 @@ iobase_dealloc(iobase self) if (_PyIOBase_finalize((PyObject ) self) < 0) { / When called from a heap type's dealloc, the type will be decref'ed on return (see e.g. subtype_dealloc in typeobject.c). / - if (PyType_HasFeature(Py_TYPE(self), Py_TPFLAGS_HEAPTYPE)) + if (_PyType_HasFeature(Py_TYPE(self), Py_TPFLAGS_HEAPTYPE)) { Py_INCREF(Py_TYPE(self)); + } return; } _PyObject_GC_UNTRACK(self); diff --git a/Objects/structseq.c b/Objects/structseq.c index bd20ce3fbdcb9..8ae8f28cbc580 100644 --- a/Objects/structseq.c +++ b/Objects/structseq.c @@ -94,7 +94,7 @@ structseq_dealloc(PyStructSequence obj) Py_XDECREF(obj->ob_item[i]); } PyObject_GC_Del(obj); - if (PyType_GetFlags(tp) & Py_TPFLAGS_HEAPTYPE) { + if (_PyType_HasFeature(tp, Py_TPFLAGS_HEAPTYPE)) { Py_DECREF(tp); } } From webhook-mailer at python.org Wed Sep 23 08:29:07 2020 From: webhook-mailer at python.org (sblondon) Date: Wed, 23 Sep 2020 12:29:07 -0000 Subject: [Python-checkins] bpo-37779 : Add information about the overriding behavior of ConfigParser.read (GH-15177) Message-ID: https://github.com/python/cpython/commit/48b0b1b121f26f811265f9eb06f195a3df38ef4b commit: 48b0b1b121f26f811265f9eb06f195a3df38ef4b branch: master author: sblondon committer: GitHub date: 2020-09-23T14:28:58+02:00 summary: bpo-37779 : Add information about the overriding behavior of ConfigParser.read (GH-15177) Co-Authored-By: Kyle Stanley Co-Authored-By: Paul Ganssle files: M Doc/library/configparser.rst diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst index 2e22a549ee281..646e8a317f52c 100644 --- a/Doc/library/configparser.rst +++ b/Doc/library/configparser.rst @@ -135,6 +135,30 @@ involves the ``DEFAULT`` section which provides default values for all other sections [1]_. Note also that keys in sections are case-insensitive and stored in lowercase [1]_. +It is possible to read several configurations into a single +:class:`ConfigParser`, where the most recently added configuration has the +highest priority. Any conflicting keys are taken from the more recent +configuration while the previously existing keys are retained. + +.. doctest:: + + >>> another_config = configparser.ConfigParser() + >>> another_config.read('example.ini') + ['example.ini'] + >>> another_config['topsecret.server.com']['Port'] + '50022' + >>> another_config.read_string("[topsecret.server.com]\nPort=48484") + >>> another_config['topsecret.server.com']['Port'] + '48484' + >>> another_config.read_dict({"topsecret.server.com": {"Port": 21212}}) + >>> another_config['topsecret.server.com']['Port'] + '21212' + >>> another_config['topsecret.server.com']['ForwardX11'] + 'no' + +This behaviour is equivalent to a :meth:`ConfigParser.read` call with several +files passed to the filenames parameter. + Supported Datatypes ------------------- From webhook-mailer at python.org Wed Sep 23 09:44:36 2020 From: webhook-mailer at python.org (Terry Jan Reedy) Date: Wed, 23 Sep 2020 13:44:36 -0000 Subject: [Python-checkins] bpo-41841: Prepare IDLE News for 3.10 (GH-22379) Message-ID: https://github.com/python/cpython/commit/7af072c3b60dd3aac2835122bc37454f0973351e commit: 7af072c3b60dd3aac2835122bc37454f0973351e branch: master author: Terry Jan Reedy committer: GitHub date: 2020-09-23T09:44:31-04:00 summary: bpo-41841: Prepare IDLE News for 3.10 (GH-22379) files: M Lib/idlelib/NEWS.txt diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt index 7eea0a47aa6e8..38b98644942f9 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -1,5 +1,5 @@ -What's New in IDLE 3.9.0 (since 3.8.0) -Released on 2020-10-05? +What's New in IDLE 3.10.0 (since 3.9.0) +Released on 2021-10-04? ====================================== @@ -8,6 +8,11 @@ bpo-35764: Rewrite the Calltips doc section. bpo-40181: In calltips, stop reminding that '/' marks the end of positional-only arguments. + +What's New in IDLE 3.9.0 (since 3.8.0) +Released on 2020-10-05? +====================================== + bpo-41468: Improve IDLE run crash error message (which users should never see). From webhook-mailer at python.org Wed Sep 23 10:07:27 2020 From: webhook-mailer at python.org (Terry Jan Reedy) Date: Wed, 23 Sep 2020 14:07:27 -0000 Subject: [Python-checkins] [3.9] bpo-41841: Prepare IDLE News for 3.9 (GH-22380) Message-ID: https://github.com/python/cpython/commit/d7a4e5d330df49774019e25313e0c1c4e9bf505d commit: d7a4e5d330df49774019e25313e0c1c4e9bf505d branch: 3.9 author: Terry Jan Reedy committer: GitHub date: 2020-09-23T10:07:19-04:00 summary: [3.9] bpo-41841: Prepare IDLE News for 3.9 (GH-22380) files: M Lib/idlelib/NEWS.txt diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt index 7eea0a47aa6e8..ed1619001d59e 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -1,5 +1,5 @@ -What's New in IDLE 3.9.0 (since 3.8.0) -Released on 2020-10-05? +What's New in IDLE 3.9.1 +Released on 2020-12-07? ====================================== @@ -8,6 +8,11 @@ bpo-35764: Rewrite the Calltips doc section. bpo-40181: In calltips, stop reminding that '/' marks the end of positional-only arguments. + +What's New in IDLE 3.9.0 (since 3.8.0) +Released on 2020-10-05? +====================================== + bpo-41468: Improve IDLE run crash error message (which users should never see). From webhook-mailer at python.org Wed Sep 23 10:35:06 2020 From: webhook-mailer at python.org (Terry Jan Reedy) Date: Wed, 23 Sep 2020 14:35:06 -0000 Subject: [Python-checkins] [3.8] bpo-41841: Prepare IDLE News for 3.8.7 (GH-22381) Message-ID: https://github.com/python/cpython/commit/0a2e11aecfb300615ab813f5d2d77a799f6e852c commit: 0a2e11aecfb300615ab813f5d2d77a799f6e852c branch: 3.8 author: Terry Jan Reedy committer: GitHub date: 2020-09-23T10:34:56-04:00 summary: [3.8] bpo-41841: Prepare IDLE News for 3.8.7 (GH-22381) files: M Lib/idlelib/NEWS.txt diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt index 5d9602e707b07..5d38a500fe618 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -1,5 +1,5 @@ -What's New in IDLE 3.8.6 -Released on 2020-09-14? +What's New in IDLE 3.8.7 +Released on 2020-12-?? ====================================== @@ -8,6 +8,11 @@ bpo-35764: Rewrite the Calltips doc section. bpo-40181: In calltips, stop reminding that '/' marks the end of positional-only arguments. + +What's New in IDLE 3.8.6 +Released on 2020-09-?? +====================================== + bpo-41468: Improve IDLE run crash error message (which users should never see). From webhook-mailer at python.org Wed Sep 23 11:17:36 2020 From: webhook-mailer at python.org (Terry Jan Reedy) Date: Wed, 23 Sep 2020 15:17:36 -0000 Subject: [Python-checkins] bpo-41844: Add IDLE section to What's New 3.9 (GN-22382) Message-ID: https://github.com/python/cpython/commit/22b7616f26694ac707fd53ece500febfad665426 commit: 22b7616f26694ac707fd53ece500febfad665426 branch: master author: Terry Jan Reedy committer: GitHub date: 2020-09-23T11:17:26-04:00 summary: bpo-41844: Add IDLE section to What's New 3.9 (GN-22382) files: M Doc/whatsnew/3.9.rst diff --git a/Doc/whatsnew/3.9.rst b/Doc/whatsnew/3.9.rst index e9fc496e47e24..95188b7493ad4 100644 --- a/Doc/whatsnew/3.9.rst +++ b/Doc/whatsnew/3.9.rst @@ -387,6 +387,20 @@ http HTTP status codes ``103 EARLY_HINTS``, ``418 IM_A_TEAPOT`` and ``425 TOO_EARLY`` are added to :class:`http.HTTPStatus`. (Contributed by Dong-hee Na in :issue:`39509` and Ross Rhodes in :issue:`39507`.) +IDLE and idlelib +---------------- + +Add option to toggle cursor blink off. (Contributed by Zackery Spytz +in :issue:`4603`.) + +Escape key now closes IDLE completion windows. (Contributed by Johnny +Najera in :issue:`38944`.) + +Add keywords to module name completion list. (Contributed by Terry J. +Reedy in :issue:`37765`.) + +The changes above have been backported to 3.8 maintenance releases. + imaplib ------- From webhook-mailer at python.org Wed Sep 23 11:19:13 2020 From: webhook-mailer at python.org (Terry Jan Reedy) Date: Wed, 23 Sep 2020 15:19:13 -0000 Subject: [Python-checkins] bpo-33822: Update IDLE section of What's New 3.8 (GH-22383) Message-ID: https://github.com/python/cpython/commit/9c4eac7f02ddcf32fc1cdaf7c08c37fe9718c1fb commit: 9c4eac7f02ddcf32fc1cdaf7c08c37fe9718c1fb branch: master author: Terry Jan Reedy committer: GitHub date: 2020-09-23T11:19:05-04:00 summary: bpo-33822: Update IDLE section of What's New 3.8 (GH-22383) files: M Doc/whatsnew/3.8.rst diff --git a/Doc/whatsnew/3.8.rst b/Doc/whatsnew/3.8.rst index a2fa17811b3fc..6a9fa34156946 100644 --- a/Doc/whatsnew/3.8.rst +++ b/Doc/whatsnew/3.8.rst @@ -870,8 +870,18 @@ clipboard. Converting strings from Tcl to Python and back now never fails. (Many people worked on this for eight years but the problem was finally solved by Serhiy Storchaka in :issue:`13153`.) +New in 3.8.1: + +Add option to toggle cursor blink off. (Contributed by Zackery Spytz +in :issue:`4603`.) + +Escape key now closes IDLE completion windows. (Contributed by Johnny +Najera in :issue:`38944`.) + The changes above have been backported to 3.7 maintenance releases. +Add keywords to module name completion list. (Contributed by Terry J. +Reedy in :issue:`37765`.) inspect ------- From webhook-mailer at python.org Wed Sep 23 11:28:17 2020 From: webhook-mailer at python.org (Miss Islington (bot)) Date: Wed, 23 Sep 2020 15:28:17 -0000 Subject: [Python-checkins] bpo-33822: Update IDLE section of What's New 3.8 (GH-22383) Message-ID: https://github.com/python/cpython/commit/e678ca960b44ec3ddf2ac01fdb333018646ed8dd commit: e678ca960b44ec3ddf2ac01fdb333018646ed8dd branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com> committer: GitHub date: 2020-09-23T08:28:08-07:00 summary: bpo-33822: Update IDLE section of What's New 3.8 (GH-22383) (cherry picked from commit 9c4eac7f02ddcf32fc1cdaf7c08c37fe9718c1fb) Co-authored-by: Terry Jan Reedy files: M Doc/whatsnew/3.8.rst diff --git a/Doc/whatsnew/3.8.rst b/Doc/whatsnew/3.8.rst index 7a86e51116f41..ce386c0556cc2 100644 --- a/Doc/whatsnew/3.8.rst +++ b/Doc/whatsnew/3.8.rst @@ -872,8 +872,18 @@ clipboard. Converting strings from Tcl to Python and back now never fails. (Many people worked on this for eight years but the problem was finally solved by Serhiy Storchaka in :issue:`13153`.) +New in 3.8.1: + +Add option to toggle cursor blink off. (Contributed by Zackery Spytz +in :issue:`4603`.) + +Escape key now closes IDLE completion windows. (Contributed by Johnny +Najera in :issue:`38944`.) + The changes above have been backported to 3.7 maintenance releases. +Add keywords to module name completion list. (Contributed by Terry J. +Reedy in :issue:`37765`.) inspect ------- From webhook-mailer at python.org Wed Sep 23 11:38:00 2020 From: webhook-mailer at python.org (Miss Islington (bot)) Date: Wed, 23 Sep 2020 15:38:00 -0000 Subject: [Python-checkins] bpo-33822: Update IDLE section of What's New 3.8 (GH-22383) Message-ID: https://github.com/python/cpython/commit/e33fe6c3d793688d46edf7c2e31a88fc2e719d65 commit: e33fe6c3d793688d46edf7c2e31a88fc2e719d65 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com> committer: GitHub date: 2020-09-23T08:37:52-07:00 summary: bpo-33822: Update IDLE section of What's New 3.8 (GH-22383) (cherry picked from commit 9c4eac7f02ddcf32fc1cdaf7c08c37fe9718c1fb) Co-authored-by: Terry Jan Reedy files: M Doc/whatsnew/3.8.rst diff --git a/Doc/whatsnew/3.8.rst b/Doc/whatsnew/3.8.rst index a2fa17811b3fc..6a9fa34156946 100644 --- a/Doc/whatsnew/3.8.rst +++ b/Doc/whatsnew/3.8.rst @@ -870,8 +870,18 @@ clipboard. Converting strings from Tcl to Python and back now never fails. (Many people worked on this for eight years but the problem was finally solved by Serhiy Storchaka in :issue:`13153`.) +New in 3.8.1: + +Add option to toggle cursor blink off. (Contributed by Zackery Spytz +in :issue:`4603`.) + +Escape key now closes IDLE completion windows. (Contributed by Johnny +Najera in :issue:`38944`.) + The changes above have been backported to 3.7 maintenance releases. +Add keywords to module name completion list. (Contributed by Terry J. +Reedy in :issue:`37765`.) inspect ------- From webhook-mailer at python.org Wed Sep 23 11:51:59 2020 From: webhook-mailer at python.org (Miss Islington (bot)) Date: Wed, 23 Sep 2020 15:51:59 -0000 Subject: [Python-checkins] bpo-41844: Add IDLE section to What's New 3.9 (GN-22382) Message-ID: https://github.com/python/cpython/commit/57e7d5c19e934f450f5a3539eff48162a78af994 commit: 57e7d5c19e934f450f5a3539eff48162a78af994 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com> committer: GitHub date: 2020-09-23T11:51:50-04:00 summary: bpo-41844: Add IDLE section to What's New 3.9 (GN-22382) (cherry picked from commit 22b7616f26694ac707fd53ece500febfad665426) Co-authored-by: Terry Jan Reedy files: M Doc/whatsnew/3.9.rst diff --git a/Doc/whatsnew/3.9.rst b/Doc/whatsnew/3.9.rst index e9fc496e47e24..95188b7493ad4 100644 --- a/Doc/whatsnew/3.9.rst +++ b/Doc/whatsnew/3.9.rst @@ -387,6 +387,20 @@ http HTTP status codes ``103 EARLY_HINTS``, ``418 IM_A_TEAPOT`` and ``425 TOO_EARLY`` are added to :class:`http.HTTPStatus`. (Contributed by Dong-hee Na in :issue:`39509` and Ross Rhodes in :issue:`39507`.) +IDLE and idlelib +---------------- + +Add option to toggle cursor blink off. (Contributed by Zackery Spytz +in :issue:`4603`.) + +Escape key now closes IDLE completion windows. (Contributed by Johnny +Najera in :issue:`38944`.) + +Add keywords to module name completion list. (Contributed by Terry J. +Reedy in :issue:`37765`.) + +The changes above have been backported to 3.8 maintenance releases. + imaplib ------- From webhook-mailer at python.org Wed Sep 23 14:43:54 2020 From: webhook-mailer at python.org (Zackery Spytz) Date: Wed, 23 Sep 2020 18:43:54 -0000 Subject: [Python-checkins] bpo-30155: Add macros to get tzinfo from datetime instances (GH-21633) Message-ID: https://github.com/python/cpython/commit/2e4dd336e5b50fd30947fdecb605ddcd71f7f6f5 commit: 2e4dd336e5b50fd30947fdecb605ddcd71f7f6f5 branch: master author: Zackery Spytz committer: GitHub date: 2020-09-23T14:43:45-04:00 summary: bpo-30155: Add macros to get tzinfo from datetime instances (GH-21633) Add PyDateTime_DATE_GET_TZINFO() and PyDateTime_TIME_GET_TZINFO() macros. files: A Misc/NEWS.d/next/C API/2020-07-26-19-39-45.bpo-30155.rHZRJ_.rst M Doc/c-api/datetime.rst M Doc/whatsnew/3.10.rst M Include/datetime.h M Lib/test/datetimetester.py M Modules/_datetimemodule.c M Modules/_testcapimodule.c M Modules/_zoneinfo.c diff --git a/Doc/c-api/datetime.rst b/Doc/c-api/datetime.rst index bd4f1ff446bcf..415ce4cac67f1 100644 --- a/Doc/c-api/datetime.rst +++ b/Doc/c-api/datetime.rst @@ -185,6 +185,11 @@ must not be ``NULL``, and the type is not checked: Return the microsecond, as an int from 0 through 999999. +.. c:function:: PyObject* PyDateTime_DATE_GET_TZINFO(PyDateTime_DateTime o) + + Return the tzinfo (which may be ``None``). + + .. versionadded:: 3.10 Macros to extract fields from time objects. The argument must be an instance of :c:data:`PyDateTime_Time`, including subclasses. The argument must not be ``NULL``, @@ -209,6 +214,12 @@ and the type is not checked: Return the microsecond, as an int from 0 through 999999. +.. c:function:: PyObject PyDateTime_TIME_GET_TZINFO(PyDateTime_Time o) + + Return the tzinfo (which may be ``None``). + + .. versionadded:: 3.10 + Macros to extract fields from time delta objects. The argument must be an instance of :c:data:`PyDateTime_Delta`, including subclasses. The argument must diff --git a/Doc/whatsnew/3.10.rst b/Doc/whatsnew/3.10.rst index 606fad2fdcf05..1228f2695496c 100644 --- a/Doc/whatsnew/3.10.rst +++ b/Doc/whatsnew/3.10.rst @@ -231,6 +231,12 @@ New Features Python executable. (Contributed by Victor Stinner in :issue:`23427`.) + The :c:func:`PyDateTime_DATE_GET_TZINFO` and + :c:func:`PyDateTime_TIME_GET_TZINFO` macros have been added for accessing + the ``tzinfo`` attributes of :class:`datetime.datetime` and + :class:`datetime.time` objects. + (Contributed by Zackery Spytz in :issue:`30155`.) + Porting to Python 3.10 ---------------------- diff --git a/Include/datetime.h b/Include/datetime.h index 5d9f2558f924d..bb565201a164d 100644 --- a/Include/datetime.h +++ b/Include/datetime.h @@ -115,6 +115,10 @@ typedef struct /* Apply for date and datetime instances. / + +// o is a pointer to a time or a datetime object. +#define _PyDateTime_HAS_TZINFO(o) (((_PyDateTime_BaseTZInfo )(o))->hastzinfo) + #define PyDateTime_GET_YEAR(o) ((((PyDateTime_Date)o)->data[0] << 8) | \ ((PyDateTime_Date)o)->data[1]) #define PyDateTime_GET_MONTH(o) (((PyDateTime_Date)o)->data[2]) @@ -128,6 +132,8 @@ typedef struct (((PyDateTime_DateTime)o)->data[8] << 8) | \ ((PyDateTime_DateTime)o)->data[9]) #define PyDateTime_DATE_GET_FOLD(o) (((PyDateTime_DateTime)o)->fold) +#define PyDateTime_DATE_GET_TZINFO(o) (_PyDateTime_HAS_TZINFO(o) ? \ + ((PyDateTime_DateTime )(o))->tzinfo : Py_None) / Apply for time instances. / #define PyDateTime_TIME_GET_HOUR(o) (((PyDateTime_Time)o)->data[0]) @@ -138,6 +144,8 @@ typedef struct (((PyDateTime_Time)o)->data[4] << 8) | \ ((PyDateTime_Time)o)->data[5]) #define PyDateTime_TIME_GET_FOLD(o) (((PyDateTime_Time)o)->fold) +#define PyDateTime_TIME_GET_TZINFO(o) (_PyDateTime_HAS_TZINFO(o) ? \ + ((PyDateTime_Time )(o))->tzinfo : Py_None) /* Apply for time delta instances / #define PyDateTime_DELTA_GET_DAYS(o) (((PyDateTime_Delta)o)->days) diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py index 520a51df87999..8b61c26f9e5c2 100644 --- a/Lib/test/datetimetester.py +++ b/Lib/test/datetimetester.py @@ -5991,30 +5991,36 @@ class DateTimeSubclass(datetime): for klass in [datetime, DateTimeSubclass]: for args in [(1993, 8, 26, 22, 12, 55, 99999), - (1993, 8, 26, 22, 12, 55, 99999)]: + (1993, 8, 26, 22, 12, 55, 99999, + timezone.utc)]: d = klass(args) with self.subTest(cls=klass, date=args): - hour, minute, second, microsecond = _testcapi.PyDateTime_DATE_GET(d) + hour, minute, second, microsecond, tzinfo = \ + _testcapi.PyDateTime_DATE_GET(d) self.assertEqual(hour, d.hour) self.assertEqual(minute, d.minute) self.assertEqual(second, d.second) self.assertEqual(microsecond, d.microsecond) + self.assertIs(tzinfo, d.tzinfo) def test_PyDateTime_TIME_GET(self): class TimeSubclass(time): pass for klass in [time, TimeSubclass]: - for args in [(12, 30, 20, 10), (12, 30, 20, 10)]: + for args in [(12, 30, 20, 10), + (12, 30, 20, 10, timezone.utc)]: d = klass(args) with self.subTest(cls=klass, date=args): - hour, minute, second, microsecond = _testcapi.PyDateTime_TIME_GET(d) + hour, minute, second, microsecond, tzinfo = \ + _testcapi.PyDateTime_TIME_GET(d) self.assertEqual(hour, d.hour) self.assertEqual(minute, d.minute) self.assertEqual(second, d.second) self.assertEqual(microsecond, d.microsecond) + self.assertIs(tzinfo, d.tzinfo) def test_timezones_offset_zero(self): utc0, utc1, non_utc = _testcapi.get_timezones_offset_zero() diff --git a/Misc/NEWS.d/next/C API/2020-07-26-19-39-45.bpo-30155.rHZRJ_.rst b/Misc/NEWS.d/next/C API/2020-07-26-19-39-45.bpo-30155.rHZRJ_.rst new file mode 100644 index 0000000000000..a276759da7933 --- /dev/null +++ b/Misc/NEWS.d/next/C API/2020-07-26-19-39-45.bpo-30155.rHZRJ_.rst @@ -0,0 +1,3 @@ +Add :c:func:`PyDateTime_DATE_GET_TZINFO` and +:c:func:`PyDateTime_TIME_GET_TZINFO` macros for accessing the ``tzinfo`` +attributes of :class:`datetime.datetime` and :class:`datetime.time` objects. diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c index 74a54e74ae0fe..0631272429f4f 100644 --- a/Modules/_datetimemodule.c +++ b/Modules/_datetimemodule.c @@ -115,14 +115,9 @@ class datetime.IsoCalendarDate "PyDateTime_IsoCalendarDate " "&PyDateTime_IsoCa #define SET_TD_SECONDS(o, v) ((o)->seconds = (v)) #define SET_TD_MICROSECONDS(o, v) ((o)->microseconds = (v)) -/ p is a pointer to a time or a datetime object; HASTZINFO(p) returns - * p->hastzinfo. - / -#define HASTZINFO(p) (((_PyDateTime_BaseTZInfo )(p))->hastzinfo) -#define GET_TIME_TZINFO(p) (HASTZINFO(p) ? \ - ((PyDateTime_Time )(p))->tzinfo : Py_None) -#define GET_DT_TZINFO(p) (HASTZINFO(p) ? \ - ((PyDateTime_DateTime )(p))->tzinfo : Py_None) +#define HASTZINFO _PyDateTime_HAS_TZINFO +#define GET_TIME_TZINFO PyDateTime_TIME_GET_TZINFO +#define GET_DT_TZINFO PyDateTime_DATE_GET_TZINFO /* M is a char or int claiming to be a valid month. The macro is equivalent * to the two-sided Python test * 1 <= M <= 12 diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c index 7536d29535038..0e098779696b7 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -2677,8 +2677,9 @@ test_PyDateTime_DATE_GET(PyObject self, PyObject obj) minute = PyDateTime_DATE_GET_MINUTE(obj); second = PyDateTime_DATE_GET_SECOND(obj); microsecond = PyDateTime_DATE_GET_MICROSECOND(obj); + PyObject tzinfo = PyDateTime_DATE_GET_TZINFO(obj); - return Py_BuildValue("(llll)", hour, minute, second, microsecond); + return Py_BuildValue("(llllO)", hour, minute, second, microsecond, tzinfo); } static PyObject @@ -2690,8 +2691,9 @@ test_PyDateTime_TIME_GET(PyObject self, PyObject obj) minute = PyDateTime_TIME_GET_MINUTE(obj); second = PyDateTime_TIME_GET_SECOND(obj); microsecond = PyDateTime_TIME_GET_MICROSECOND(obj); + PyObject tzinfo = PyDateTime_TIME_GET_TZINFO(obj); - return Py_BuildValue("(llll)", hour, minute, second, microsecond); + return Py_BuildValue("(llllO)", hour, minute, second, microsecond, tzinfo); } static PyObject diff --git a/Modules/_zoneinfo.c b/Modules/_zoneinfo.c index 2cee65fac6dd0..bee59b8d2ae0c 100644 --- a/Modules/_zoneinfo.c +++ b/Modules/_zoneinfo.c @@ -484,9 +484,7 @@ zoneinfo_tzname(PyObject self, PyObject dt) return tti->tzname; } -#define HASTZINFO(p) (((_PyDateTime_BaseTZInfo )(p))->hastzinfo) -#define GET_DT_TZINFO(p) \ - (HASTZINFO(p) ? ((PyDateTime_DateTime )(p))->tzinfo : Py_None) +#define GET_DT_TZINFO PyDateTime_DATE_GET_TZINFO static PyObject * zoneinfo_fromutc(PyObject obj_self, PyObject dt) From webhook-mailer at python.org Wed Sep 23 17:21:30 2020 From: webhook-mailer at python.org (Victor Stinner) Date: Wed, 23 Sep 2020 21:21:30 -0000 Subject: [Python-checkins] bpo-41833: threading.Thread now uses the target name (GH-22357) Message-ID: https://github.com/python/cpython/commit/98c16c991d6e70a48f4280a7cd464d807bdd9f2b commit: 98c16c991d6e70a48f4280a7cd464d807bdd9f2b branch: master author: Victor Stinner committer: GitHub date: 2020-09-23T23:21:19+02:00 summary: bpo-41833: threading.Thread now uses the target name (GH-22357) files: A Misc/NEWS.d/next/Library/2020-09-22-13-51-14.bpo-41833.6HVDjT.rst M Doc/library/threading.rst M Lib/test/test_threading.py M Lib/threading.py diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst index 7fcf93d74610e..7eb12fe116bd2 100644 --- a/Doc/library/threading.rst +++ b/Doc/library/threading.rst @@ -264,8 +264,10 @@ since it is impossible to detect the termination of alien threads. target is the callable object to be invoked by the :meth:`run` method. Defaults to ``None``, meaning nothing is called. - name is the thread name. By default, a unique name is constructed of the - form "Thread-N" where N is a small decimal number. + name is the thread name. By default, a unique name is constructed + of the form "Thread-N" where N is a small decimal number, + or "Thread-N (target)" where "target" is ``target.name`` if the + target argument is specified. args is the argument tuple for the target invocation. Defaults to ``()``. @@ -280,6 +282,9 @@ since it is impossible to detect the termination of alien threads. base class constructor (``Thread.init()``) before doing anything else to the thread. + .. versionchanged:: 3.10 + Use the target name if name argument is omitted. + .. versionchanged:: 3.3 Added the daemon argument. diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py index d02d3b346f9cc..2f0f3ae0946a5 100644 --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -20,6 +20,7 @@ import signal import textwrap +from unittest import mock from test import lock_tests from test import support @@ -86,6 +87,33 @@ def tearDown(self): class ThreadTests(BaseTestCase): + @cpython_only + def test_name(self): + def func(): pass + + thread = threading.Thread(name="myname1") + self.assertEqual(thread.name, "myname1") + + # Convert int name to str + thread = threading.Thread(name=123) + self.assertEqual(thread.name, "123") + + # target name is ignored if name is specified + thread = threading.Thread(target=func, name="myname2") + self.assertEqual(thread.name, "myname2") + + with mock.patch.object(threading, '_counter', return_value=2): + thread = threading.Thread(name="") + self.assertEqual(thread.name, "Thread-2") + + with mock.patch.object(threading, '_counter', return_value=3): + thread = threading.Thread() + self.assertEqual(thread.name, "Thread-3") + + with mock.patch.object(threading, '_counter', return_value=5): + thread = threading.Thread(target=func) + self.assertEqual(thread.name, "Thread-5 (func)") + # Create a bunch of threads, let each do some work, wait until all are # done. def test_various_ops(self): @@ -531,7 +559,7 @@ def test_main_thread_after_fork_from_nonmain_thread(self): import os, threading, sys from test import support - def f(): + def func(): pid = os.fork() if pid == 0: main = threading.main_thread() @@ -544,14 +572,14 @@ def f(): else: support.wait_process(pid, exitcode=0) - th = threading.Thread(target=f) + th = threading.Thread(target=func) th.start() th.join() """ _, out, err = assert_python_ok("-c", code) data = out.decode().replace('\r', '') self.assertEqual(err, b"") - self.assertEqual(data, "Thread-1\nTrue\nTrue\n") + self.assertEqual(data, "Thread-1 (func)\nTrue\nTrue\n") def test_main_thread_during_shutdown(self): # bpo-31516: current_thread() should still point to the main thread diff --git a/Lib/threading.py b/Lib/threading.py index ab29db77a747a..06c77f70fe74f 100644 --- a/Lib/threading.py +++ b/Lib/threading.py @@ -745,10 +745,9 @@ class BrokenBarrierError(RuntimeError): # Helper to generate new thread names -_counter = _count().next -_counter() # Consume 0 so first non-main thread has id 1. -def _newname(template="Thread-%d"): - return template % _counter() +_counter = _count(1).next +def _newname(name_template): + return name_template % _counter() # Active thread administration _active_limbo_lock = _allocate_lock() @@ -800,8 +799,19 @@ class is implemented. assert group is None, "group argument must be None for now" if kwargs is None: kwargs = {} + if name: + name = str(name) + else: + name = _newname("Thread-%d") + if target is not None: + try: + target_name = target.name + name += f" ({target_name})" + except AttributeError: + pass + self._target = target - self._name = str(name or _newname()) + self._name = name self._args = args self._kwargs = kwargs if daemon is not None: diff --git a/Misc/NEWS.d/next/Library/2020-09-22-13-51-14.bpo-41833.6HVDjT.rst b/Misc/NEWS.d/next/Library/2020-09-22-13-51-14.bpo-41833.6HVDjT.rst new file mode 100644 index 0000000000000..abb3a077d91b8 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-09-22-13-51-14.bpo-41833.6HVDjT.rst @@ -0,0 +1,2 @@ +The :class:`threading.Thread` constructor now uses the target name if the +target argument is specified but the name argument is omitted. From webhook-mailer at python.org Wed Sep 23 17:25:46 2020 From: webhook-mailer at python.org (Victor Stinner) Date: Wed, 23 Sep 2020 21:25:46 -0000 Subject: [Python-checkins] bpo-41654: Fix compiler warning in MemoryError_dealloc() (GH-22387) Message-ID: https://github.com/python/cpython/commit/bbeb223e9a5e9f9374df384efa386b4068a65c0e commit: bbeb223e9a5e9f9374df384efa386b4068a65c0e branch: master author: Victor Stinner committer: GitHub date: 2020-09-23T23:25:40+02:00 summary: bpo-41654: Fix compiler warning in MemoryError_dealloc() (GH-22387) Fix warning: Objects\exceptions.c(2324,56): warning C4098: 'MemoryError_dealloc': 'void' function returning a value files: M Objects/exceptions.c diff --git a/Objects/exceptions.c b/Objects/exceptions.c index b08cbdd6aed35..b14da20db0c4e 100644 --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -2321,7 +2321,8 @@ MemoryError_dealloc(PyBaseExceptionObject self) / If this is a subclass of MemoryError, we don't need to * do anything in the free-list/ if (!Py_IS_TYPE(self, (PyTypeObject ) PyExc_MemoryError)) { - return Py_TYPE(self)->tp_free((PyObject )self); + Py_TYPE(self)->tp_free((PyObject )self); + return; } _PyObject_GC_UNTRACK(self); From webhook-mailer at python.org Wed Sep 23 17:25:58 2020 From: webhook-mailer at python.org (Victor Stinner) Date: Wed, 23 Sep 2020 21:25:58 -0000 Subject: [Python-checkins] bpo-41428: Fix compiler warnings in unionobject.c (GH-22388) Message-ID: https://github.com/python/cpython/commit/d67de0a30d76c6a28056bae22fd7d13f2e111b77 commit: d67de0a30d76c6a28056bae22fd7d13f2e111b77 branch: master author: Victor Stinner committer: GitHub date: 2020-09-23T23:25:54+02:00 summary: bpo-41428: Fix compiler warnings in unionobject.c (GH-22388) Use Py_ssize_t type rather than int, to store lengths in unionobject.c. Fix warnings: Objects\unionobject.c(189,71): warning C4244: '+=': conversion from 'Py_ssize_t' to 'int', possible loss of data Objects\unionobject.c(182,1): warning C4244: 'initializing': conversion from 'Py_ssize_t' to 'int', possible loss of data Objects\unionobject.c(205,1): warning C4244: 'initializing': conversion from 'Py_ssize_t' to 'int', possible loss of data Objects\unionobject.c(437,1): warning C4244: 'initializing': conversion from 'Py_ssize_t' to 'int', possible loss of data files: M Objects/unionobject.c diff --git a/Objects/unionobject.c b/Objects/unionobject.c index 0ef7abb4c55c2..e055a55e91715 100644 --- a/Objects/unionobject.c +++ b/Objects/unionobject.c @@ -179,8 +179,8 @@ union_richcompare(PyObject a, PyObject b, int op) static PyObject* flatten_args(PyObject* args) { - int arg_length = PyTuple_GET_SIZE(args); - int total_args = 0; + Py_ssize_t arg_length = PyTuple_GET_SIZE(args); + Py_ssize_t total_args = 0; // Get number of total args once it's flattened. for (Py_ssize_t i = 0; i < arg_length; i++) { PyObject arg = PyTuple_GET_ITEM(args, i); @@ -434,7 +434,7 @@ _Py_Union(PyObject args) unionobject* result = NULL; // Check arguments are unionable. - int nargs = PyTuple_GET_SIZE(args); + Py_ssize_t nargs = PyTuple_GET_SIZE(args); for (Py_ssize_t iarg = 0; iarg < nargs; iarg++) { PyObject arg = PyTuple_GET_ITEM(args, iarg); if (arg == NULL) { From webhook-mailer at python.org Thu Sep 24 06:40:05 2020 From: webhook-mailer at python.org (=?utf-8?q?=C5=81ukasz?= Langa) Date: Thu, 24 Sep 2020 10:40:05 -0000 Subject: [Python-checkins] Python 3.8.6 Message-ID: https://github.com/python/cpython/commit/db455296be5f792b8c12b7cd7f3962b52e4f44ee commit: db455296be5f792b8c12b7cd7f3962b52e4f44ee branch: 3.8 author: ?ukasz Langa committer: ?ukasz Langa date: 2020-09-23T14:36:32+02:00 summary: Python 3.8.6 files: A Misc/NEWS.d/3.8.6.rst D Misc/NEWS.d/next/Core and Builtins/2020-08-12-07-35-07.bpo-41525.d9q3XL.rst D Misc/NEWS.d/next/Documentation/2020-09-10-07-48-02.bpo-37149.VD0rCv.rst D Misc/NEWS.d/next/Documentation/2020-09-12-17-37-13.bpo-35293._cOwPD.rst D Misc/NEWS.d/next/IDLE/2020-09-22-00-45-40.bpo-40181.hhQi3z.rst D Misc/NEWS.d/next/IDLE/2020-09-22-11-13-45.bpo-35764.VoNa8y.rst D Misc/NEWS.d/next/Library/2019-07-02-12-43-57.bpo-37479.O53a5S.rst D Misc/NEWS.d/next/Library/2020-02-24-10-58-34.bpo-39728.kOOaHn.rst D Misc/NEWS.d/next/Library/2020-09-04-20-45-38.bpo-41720.PW9MzZ.rst D Misc/NEWS.d/next/Library/2020-09-11-12-38-55.bpo-39651.JMp9l2.rst D Misc/NEWS.d/next/Library/2020-09-14-19-27-46.bpo-41789.pI_uZQ.rst D Misc/NEWS.d/next/Library/2020-09-15-14-56-13.bpo-39587.69xzuh.rst D Misc/NEWS.d/next/Library/2020-09-15-22-43-30.bpo-41517.sLBH7g.rst D Misc/NEWS.d/next/Library/2020-09-19-23-14-54.bpo-41815.RNpuX3.rst D Misc/NEWS.d/next/Library/2020-09-22-00-23-30.bpo-41817.bnh-VG.rst D Misc/NEWS.d/next/Tests/2020-09-11-19-12-31.bpo-41731.Ivxh4U.rst D Misc/NEWS.d/next/Windows/2020-09-11-17-59-33.bpo-41744.e_ugDQ.rst M Include/patchlevel.h M Lib/pydoc_data/topics.py M README.rst diff --git a/Include/patchlevel.h b/Include/patchlevel.h index 6a89ef436b0aa..5123b2601b252 100644 --- a/Include/patchlevel.h +++ b/Include/patchlevel.h @@ -19,11 +19,11 @@ #define PY_MAJOR_VERSION 3 #define PY_MINOR_VERSION 8 #define PY_MICRO_VERSION 6 -#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_GAMMA -#define PY_RELEASE_SERIAL 1 +#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL +#define PY_RELEASE_SERIAL 0 / Version as a string / -#define PY_VERSION "3.8.6rc1+" +#define PY_VERSION "3.8.6" /--end constants--/ / Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2. diff --git a/Lib/pydoc_data/topics.py b/Lib/pydoc_data/topics.py index ab53a563a43bd..d760056197ac1 100644 --- a/Lib/pydoc_data/topics.py +++ b/Lib/pydoc_data/topics.py @@ -1,5 +1,5 @@ # -- coding: utf-8 -- -# Autogenerated by Sphinx on Mon Sep 7 17:49:24 2020 +# Autogenerated by Sphinx on Wed Sep 23 14:35:51 2020 topics = {'assert': 'The "assert" statement\n' '******************\n' '\n' @@ -6923,6 +6923,14 @@ 'the data\n' ' model.\n' '\n' + ' Note: Due to a bug in the dispatching mechanism for ' + '"=", a\n' + ' class that defines "ipow()" but returns ' + '"NotImplemented"\n' + ' would fail to fall back to "x.pow(y)" and ' + '"y.rpow(x)".\n' + ' This bug is fixed in Python 3.10.\n' + '\n' 'object.neg(self)\n' 'object.pos(self)\n' 'object.abs(self)\n' @@ -9603,6 +9611,14 @@ 'the data\n' ' model.\n' '\n' + ' Note: Due to a bug in the dispatching mechanism for ' + '"=", a\n' + ' class that defines "ipow()" but returns ' + '"NotImplemented"\n' + ' would fail to fall back to "x.pow(y)" and ' + '"y.rpow(x)".\n' + ' This bug is fixed in Python 3.10.\n' + '\n' 'object.neg(self)\n' 'object.pos(self)\n' 'object.abs(self)\n' diff --git a/Misc/NEWS.d/3.8.6.rst b/Misc/NEWS.d/3.8.6.rst new file mode 100644 index 0000000000000..641ca33631342 --- /dev/null +++ b/Misc/NEWS.d/3.8.6.rst @@ -0,0 +1,153 @@ +.. bpo: 41525 +.. date: 2020-08-12-07-35-07 +.. nonce: d9q3XL +.. release date: 2020-09-23 +.. section: Core and Builtins + +The output of ``python --help`` contains now only ASCII characters. + +.. + +.. bpo: 41817 +.. date: 2020-09-22-00-23-30 +.. nonce: bnh-VG +.. section: Library + +fix `tkinter.EventType` Enum so all members are strings, and none are tuples + +.. + +.. bpo: 41815 +.. date: 2020-09-19-23-14-54 +.. nonce: RNpuX3 +.. section: Library + +Fix SQLite3 segfault when backing up closed database. Patch contributed by +Peter David McCormick. + +.. + +.. bpo: 41517 +.. date: 2020-09-15-22-43-30 +.. nonce: sLBH7g +.. section: Library + +fix bug allowing Enums to be extended via multiple inheritance + +.. + +.. bpo: 39587 +.. date: 2020-09-15-14-56-13 +.. nonce: 69xzuh +.. section: Library + +use the correct mix-in data type when constructing Enums + +.. + +.. bpo: 41789 +.. date: 2020-09-14-19-27-46 +.. nonce: pI_uZQ +.. section: Library + +Honor `object` overrides in `Enum` class creation (specifically, `str`, +`repr`, `format`, and `__reduce_ex__`). + +.. + +.. bpo: 39651 +.. date: 2020-09-11-12-38-55 +.. nonce: JMp9l2 +.. section: Library + +Fix a race condition in the ``call_soon_threadsafe()`` method of +``asyncio.ProactorEventLoop``: do nothing if the self-pipe socket has been +closed. + +.. + +.. bpo: 41720 +.. date: 2020-09-04-20-45-38 +.. nonce: PW9MzZ +.. section: Library + +Fixed :meth:`turtle.Vec2D.rmul` for arguments which are not int or +float. + +.. + +.. bpo: 39728 +.. date: 2020-02-24-10-58-34 +.. nonce: kOOaHn +.. section: Library + +fix default `_missing_` so a duplicate `ValueError` is not set as the +`context` of the original `ValueError` + +.. + +.. bpo: 37479 +.. date: 2019-07-02-12-43-57 +.. nonce: O53a5S +.. section: Library + +When `Enum.str` is overridden in a derived class, the override will be +used by `Enum.format` regardless of whether mixin classes are present. + +.. + +.. bpo: 35293 +.. date: 2020-09-12-17-37-13 +.. nonce: _cOwPD +.. section: Documentation + +Fix RemovedInSphinx40Warning when building the documentation. Patch by +Dong-hee Na. + +.. + +.. bpo: 37149 +.. date: 2020-09-10-07-48-02 +.. nonce: VD0rCv +.. section: Documentation + +Change Shipman tkinter doc link from archive.org to TkDocs. (The doc has +been removed from the NMT server.) The new link responds much faster and +includes a short explanatory note. + +.. + +.. bpo: 41731 +.. date: 2020-09-11-19-12-31 +.. nonce: Ivxh4U +.. section: Tests + +Make test_cmd_line_script pass with option '-vv'. + +.. + +.. bpo: 41744 +.. date: 2020-09-11-17-59-33 +.. nonce: e_ugDQ +.. section: Windows + +Fixes automatic import of props file when using the Nuget package. + +.. + +.. bpo: 35764 +.. date: 2020-09-22-11-13-45 +.. nonce: VoNa8y +.. section: IDLE + +Rewrite the Calltips doc section. + +.. + +.. bpo: 40181 +.. date: 2020-09-22-00-45-40 +.. nonce: hhQi3z +.. section: IDLE + +In calltips, stop reminding that '/' marks the end of positional-only +arguments. diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-08-12-07-35-07.bpo-41525.d9q3XL.rst b/Misc/NEWS.d/next/Core and Builtins/2020-08-12-07-35-07.bpo-41525.d9q3XL.rst deleted file mode 100644 index acc00f8b992c9..0000000000000 --- a/Misc/NEWS.d/next/Core and Builtins/2020-08-12-07-35-07.bpo-41525.d9q3XL.rst +++ /dev/null @@ -1 +0,0 @@ -The output of ``python --help`` contains now only ASCII characters. diff --git a/Misc/NEWS.d/next/Documentation/2020-09-10-07-48-02.bpo-37149.VD0rCv.rst b/Misc/NEWS.d/next/Documentation/2020-09-10-07-48-02.bpo-37149.VD0rCv.rst deleted file mode 100644 index aeca652b4ed97..0000000000000 --- a/Misc/NEWS.d/next/Documentation/2020-09-10-07-48-02.bpo-37149.VD0rCv.rst +++ /dev/null @@ -1 +0,0 @@ -Change Shipman tkinter doc link from archive.org to TkDocs. (The doc has been removed from the NMT server.) The new link responds much faster and includes a short explanatory note. diff --git a/Misc/NEWS.d/next/Documentation/2020-09-12-17-37-13.bpo-35293._cOwPD.rst b/Misc/NEWS.d/next/Documentation/2020-09-12-17-37-13.bpo-35293._cOwPD.rst deleted file mode 100644 index 089d44e35d2ba..0000000000000 --- a/Misc/NEWS.d/next/Documentation/2020-09-12-17-37-13.bpo-35293._cOwPD.rst +++ /dev/null @@ -1 +0,0 @@ -Fix RemovedInSphinx40Warning when building the documentation. Patch by Dong-hee Na. diff --git a/Misc/NEWS.d/next/IDLE/2020-09-22-00-45-40.bpo-40181.hhQi3z.rst b/Misc/NEWS.d/next/IDLE/2020-09-22-00-45-40.bpo-40181.hhQi3z.rst deleted file mode 100644 index b6866e19c4d41..0000000000000 --- a/Misc/NEWS.d/next/IDLE/2020-09-22-00-45-40.bpo-40181.hhQi3z.rst +++ /dev/null @@ -1,2 +0,0 @@ -In calltips, stop reminding that '/' marks the end of positional-only -arguments. diff --git a/Misc/NEWS.d/next/IDLE/2020-09-22-11-13-45.bpo-35764.VoNa8y.rst b/Misc/NEWS.d/next/IDLE/2020-09-22-11-13-45.bpo-35764.VoNa8y.rst deleted file mode 100644 index eb62d3699d5fe..0000000000000 --- a/Misc/NEWS.d/next/IDLE/2020-09-22-11-13-45.bpo-35764.VoNa8y.rst +++ /dev/null @@ -1 +0,0 @@ -Rewrite the Calltips doc section. diff --git a/Misc/NEWS.d/next/Library/2019-07-02-12-43-57.bpo-37479.O53a5S.rst b/Misc/NEWS.d/next/Library/2019-07-02-12-43-57.bpo-37479.O53a5S.rst deleted file mode 100644 index cf23155c33958..0000000000000 --- a/Misc/NEWS.d/next/Library/2019-07-02-12-43-57.bpo-37479.O53a5S.rst +++ /dev/null @@ -1,2 +0,0 @@ -When `Enum.str` is overridden in a derived class, the override will be -used by `Enum.format` regardless of whether mixin classes are present. \ No newline at end of file diff --git a/Misc/NEWS.d/next/Library/2020-02-24-10-58-34.bpo-39728.kOOaHn.rst b/Misc/NEWS.d/next/Library/2020-02-24-10-58-34.bpo-39728.kOOaHn.rst deleted file mode 100644 index beb2016a85ba6..0000000000000 --- a/Misc/NEWS.d/next/Library/2020-02-24-10-58-34.bpo-39728.kOOaHn.rst +++ /dev/null @@ -1 +0,0 @@ -fix default `_missing_` so a duplicate `ValueError` is not set as the `context` of the original `ValueError` diff --git a/Misc/NEWS.d/next/Library/2020-09-04-20-45-38.bpo-41720.PW9MzZ.rst b/Misc/NEWS.d/next/Library/2020-09-04-20-45-38.bpo-41720.PW9MzZ.rst deleted file mode 100644 index 5d2a5094ddeaa..0000000000000 --- a/Misc/NEWS.d/next/Library/2020-09-04-20-45-38.bpo-41720.PW9MzZ.rst +++ /dev/null @@ -1,2 +0,0 @@ -Fixed :meth:`turtle.Vec2D.rmul` for arguments which are not int or -float. diff --git a/Misc/NEWS.d/next/Library/2020-09-11-12-38-55.bpo-39651.JMp9l2.rst b/Misc/NEWS.d/next/Library/2020-09-11-12-38-55.bpo-39651.JMp9l2.rst deleted file mode 100644 index 78dcff1370029..0000000000000 --- a/Misc/NEWS.d/next/Library/2020-09-11-12-38-55.bpo-39651.JMp9l2.rst +++ /dev/null @@ -1,3 +0,0 @@ -Fix a race condition in the ``call_soon_threadsafe()`` method of -``asyncio.ProactorEventLoop``: do nothing if the self-pipe socket has been -closed. diff --git a/Misc/NEWS.d/next/Library/2020-09-14-19-27-46.bpo-41789.pI_uZQ.rst b/Misc/NEWS.d/next/Library/2020-09-14-19-27-46.bpo-41789.pI_uZQ.rst deleted file mode 100644 index 5ce7a3ca67b72..0000000000000 --- a/Misc/NEWS.d/next/Library/2020-09-14-19-27-46.bpo-41789.pI_uZQ.rst +++ /dev/null @@ -1,2 +0,0 @@ -Honor `object` overrides in `Enum` class creation (specifically, `str`, -`repr`, `format`, and `__reduce_ex__`). diff --git a/Misc/NEWS.d/next/Library/2020-09-15-14-56-13.bpo-39587.69xzuh.rst b/Misc/NEWS.d/next/Library/2020-09-15-14-56-13.bpo-39587.69xzuh.rst deleted file mode 100644 index e2f2b64867bed..0000000000000 --- a/Misc/NEWS.d/next/Library/2020-09-15-14-56-13.bpo-39587.69xzuh.rst +++ /dev/null @@ -1 +0,0 @@ -use the correct mix-in data type when constructing Enums diff --git a/Misc/NEWS.d/next/Library/2020-09-15-22-43-30.bpo-41517.sLBH7g.rst b/Misc/NEWS.d/next/Library/2020-09-15-22-43-30.bpo-41517.sLBH7g.rst deleted file mode 100644 index e7654711062ce..0000000000000 --- a/Misc/NEWS.d/next/Library/2020-09-15-22-43-30.bpo-41517.sLBH7g.rst +++ /dev/null @@ -1 +0,0 @@ -fix bug allowing Enums to be extended via multiple inheritance diff --git a/Misc/NEWS.d/next/Library/2020-09-19-23-14-54.bpo-41815.RNpuX3.rst b/Misc/NEWS.d/next/Library/2020-09-19-23-14-54.bpo-41815.RNpuX3.rst deleted file mode 100644 index 3560db9bc5d35..0000000000000 --- a/Misc/NEWS.d/next/Library/2020-09-19-23-14-54.bpo-41815.RNpuX3.rst +++ /dev/null @@ -1,2 +0,0 @@ -Fix SQLite3 segfault when backing up closed database. Patch contributed by -Peter David McCormick. diff --git a/Misc/NEWS.d/next/Library/2020-09-22-00-23-30.bpo-41817.bnh-VG.rst b/Misc/NEWS.d/next/Library/2020-09-22-00-23-30.bpo-41817.bnh-VG.rst deleted file mode 100644 index 6a634bb613260..0000000000000 --- a/Misc/NEWS.d/next/Library/2020-09-22-00-23-30.bpo-41817.bnh-VG.rst +++ /dev/null @@ -1 +0,0 @@ -fix `tkinter.EventType` Enum so all members are strings, and none are tuples diff --git a/Misc/NEWS.d/next/Tests/2020-09-11-19-12-31.bpo-41731.Ivxh4U.rst b/Misc/NEWS.d/next/Tests/2020-09-11-19-12-31.bpo-41731.Ivxh4U.rst deleted file mode 100644 index e368a60f77b1e..0000000000000 --- a/Misc/NEWS.d/next/Tests/2020-09-11-19-12-31.bpo-41731.Ivxh4U.rst +++ /dev/null @@ -1 +0,0 @@ -Make test_cmd_line_script pass with option '-vv'. diff --git a/Misc/NEWS.d/next/Windows/2020-09-11-17-59-33.bpo-41744.e_ugDQ.rst b/Misc/NEWS.d/next/Windows/2020-09-11-17-59-33.bpo-41744.e_ugDQ.rst deleted file mode 100644 index 6106d6604c7dd..0000000000000 --- a/Misc/NEWS.d/next/Windows/2020-09-11-17-59-33.bpo-41744.e_ugDQ.rst +++ /dev/null @@ -1 +0,0 @@ -Fixes automatic import of props file when using the Nuget package. \ No newline at end of file diff --git a/README.rst b/README.rst index f2b1e36aef1f6..97a7191ca6af9 100644 --- a/README.rst +++ b/README.rst @@ -1,5 +1,5 @@ -This is Python version 3.8.6rc1 -=============================== +This is Python version 3.8.6 +============================ .. image:: https://travis-ci.org/python/cpython.svg?branch=3.8 :alt: CPython build status on Travis CI From webhook-mailer at python.org Thu Sep 24 10:34:44 2020 From: webhook-mailer at python.org (=?utf-8?q?=C5=81ukasz?= Langa) Date: Thu, 24 Sep 2020 14:34:44 -0000 Subject: [Python-checkins] [3.9] bpo-41602: raise SIGINT exit code on KeyboardInterrupt from pymain_run_module (GH-21956) (#22397) Message-ID: https://github.com/python/cpython/commit/ca8d46dd422e5aa10f444796d93faec5a8cbc1e0 commit: ca8d46dd422e5aa10f444796d93faec5a8cbc1e0 branch: 3.9 author: ?ukasz Langa committer: GitHub date: 2020-09-24T16:34:21+02:00 summary: [3.9] bpo-41602: raise SIGINT exit code on KeyboardInterrupt from pymain_run_module (GH-21956) (#22397) Closes bpo issue 41602. (cherry picked from commit a68a2ad19c891faa891904b3da537911cc77df21) Co-authored-by: Thomas Grainger files: A Misc/NEWS.d/next/Tests/2020-08-25-19-25-36.bpo-41602.Z64s0I.rst M Lib/test/test_runpy.py M Modules/main.c diff --git a/Lib/test/test_runpy.py b/Lib/test/test_runpy.py index 84834d39b1c21..4aaf75b1bceb6 100644 --- a/Lib/test/test_runpy.py +++ b/Lib/test/test_runpy.py @@ -1,14 +1,17 @@ # Test the runpy module -import unittest -import os +import contextlib +import importlib.machinery, importlib.util import os.path -import sys +import pathlib +import py_compile import re +import signal +import subprocess +import sys import tempfile -import importlib, importlib.machinery, importlib.util -import py_compile +import textwrap +import unittest import warnings -import pathlib from test.support import ( forget, make_legacy_pyc, unload, verbose, no_tracing, create_empty_file, temp_dir) @@ -752,5 +755,82 @@ def test_encoding(self): self.assertEqual(result['s'], "non-ASCII: h\xe9") +class TestExit(unittest.TestCase): + STATUS_CONTROL_C_EXIT = 0xC000013A + EXPECTED_CODE = ( + STATUS_CONTROL_C_EXIT + if sys.platform == "win32" + else -signal.SIGINT + ) + @staticmethod + @contextlib.contextmanager + def tmp_path(*args, **kwargs): + with temp_dir() as tmp_fn: + yield pathlib.Path(tmp_fn) + + + def run(self, *args, **kwargs): + with self.tmp_path() as tmp: + self.ham = ham = tmp / "ham.py" + ham.write_text( + textwrap.dedent( + """\ + raise KeyboardInterrupt + """ + ) + ) + super().run(*args, **kwargs) + + def assertSigInt(self, *args, **kwargs): + proc = subprocess.run(*args, **kwargs, text=True, stderr=subprocess.PIPE) + self.assertTrue(proc.stderr.endswith("\nKeyboardInterrupt\n")) + self.assertEqual(proc.returncode, self.EXPECTED_CODE) + + def test_pymain_run_file(self): + self.assertSigInt([sys.executable, self.ham]) + + def test_pymain_run_file_runpy_run_module(self): + tmp = self.ham.parent + run_module = tmp / "run_module.py" + run_module.write_text( + textwrap.dedent( + """\ + import runpy + runpy.run_module("ham") + """ + ) + ) + self.assertSigInt([sys.executable, run_module], cwd=tmp) + + def test_pymain_run_file_runpy_run_module_as_main(self): + tmp = self.ham.parent + run_module_as_main = tmp / "run_module_as_main.py" + run_module_as_main.write_text( + textwrap.dedent( + """\ + import runpy + runpy._run_module_as_main("ham") + """ + ) + ) + self.assertSigInt([sys.executable, run_module_as_main], cwd=tmp) + + def test_pymain_run_command_run_module(self): + self.assertSigInt( + [sys.executable, "-c", "import runpy; runpy.run_module('ham')"], + cwd=self.ham.parent, + ) + + def test_pymain_run_command(self): + self.assertSigInt([sys.executable, "-c", "import ham"], cwd=self.ham.parent) + + def test_pymain_run_stdin(self): + self.assertSigInt([sys.executable], input="import ham", cwd=self.ham.parent) + + def test_pymain_run_module(self): + ham = self.ham + self.assertSigInt([sys.executable, "-m", ham.stem], cwd=ham.parent) + + if name == "main": unittest.main() diff --git a/Misc/NEWS.d/next/Tests/2020-08-25-19-25-36.bpo-41602.Z64s0I.rst b/Misc/NEWS.d/next/Tests/2020-08-25-19-25-36.bpo-41602.Z64s0I.rst new file mode 100644 index 0000000000000..fa3d2f1aa374e --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2020-08-25-19-25-36.bpo-41602.Z64s0I.rst @@ -0,0 +1 @@ +Add tests for SIGINT handling in the runpy module. diff --git a/Modules/main.c b/Modules/main.c index 4a76f4461bf61..2cc891f61aadd 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -287,7 +287,11 @@ pymain_run_module(const wchar_t modname, int set_argv0) Py_DECREF(module); return pymain_exit_err_print(); } + _Py_UnhandledKeyboardInterrupt = 0; result = PyObject_Call(runmodule, runargs, NULL); + if (!result && PyErr_Occurred() == PyExc_KeyboardInterrupt) { + _Py_UnhandledKeyboardInterrupt = 1; + } Py_DECREF(runpy); Py_DECREF(runmodule); Py_DECREF(module); From webhook-mailer at python.org Thu Sep 24 12:44:23 2020 From: webhook-mailer at python.org (Thomas Grainger) Date: Thu, 24 Sep 2020 16:44:23 -0000 Subject: [Python-checkins] [3.8] bpo-41602: raise SIGINT exit code on KeyboardInterrupt from pymain_run_module (GH-21956) (#22398) Message-ID: https://github.com/python/cpython/commit/ae462297c08515f2c0dacf77b04816504142ba3e commit: ae462297c08515f2c0dacf77b04816504142ba3e branch: 3.8 author: Thomas Grainger committer: GitHub date: 2020-09-24T18:44:14+02:00 summary: [3.8] bpo-41602: raise SIGINT exit code on KeyboardInterrupt from pymain_run_module (GH-21956) (#22398) Closes bpo issue 41602. (cherry picked from commit a68a2ad19c891faa891904b3da537911cc77df21) Co-authored-by: Thomas Grainger files: A Misc/NEWS.d/next/Tests/2020-08-25-19-25-36.bpo-41602.Z64s0I.rst M Lib/test/test_runpy.py M Modules/main.c diff --git a/Lib/test/test_runpy.py b/Lib/test/test_runpy.py index 84834d39b1c21..4aaf75b1bceb6 100644 --- a/Lib/test/test_runpy.py +++ b/Lib/test/test_runpy.py @@ -1,14 +1,17 @@ # Test the runpy module -import unittest -import os +import contextlib +import importlib.machinery, importlib.util import os.path -import sys +import pathlib +import py_compile import re +import signal +import subprocess +import sys import tempfile -import importlib, importlib.machinery, importlib.util -import py_compile +import textwrap +import unittest import warnings -import pathlib from test.support import ( forget, make_legacy_pyc, unload, verbose, no_tracing, create_empty_file, temp_dir) @@ -752,5 +755,82 @@ def test_encoding(self): self.assertEqual(result['s'], "non-ASCII: h\xe9") +class TestExit(unittest.TestCase): + STATUS_CONTROL_C_EXIT = 0xC000013A + EXPECTED_CODE = ( + STATUS_CONTROL_C_EXIT + if sys.platform == "win32" + else -signal.SIGINT + ) + @staticmethod + @contextlib.contextmanager + def tmp_path(args, **kwargs): + with temp_dir() as tmp_fn: + yield pathlib.Path(tmp_fn) + + + def run(self, *args, **kwargs): + with self.tmp_path() as tmp: + self.ham = ham = tmp / "ham.py" + ham.write_text( + textwrap.dedent( + """\ + raise KeyboardInterrupt + """ + ) + ) + super().run(*args, **kwargs) + + def assertSigInt(self, *args, **kwargs): + proc = subprocess.run(*args, **kwargs, text=True, stderr=subprocess.PIPE) + self.assertTrue(proc.stderr.endswith("\nKeyboardInterrupt\n")) + self.assertEqual(proc.returncode, self.EXPECTED_CODE) + + def test_pymain_run_file(self): + self.assertSigInt([sys.executable, self.ham]) + + def test_pymain_run_file_runpy_run_module(self): + tmp = self.ham.parent + run_module = tmp / "run_module.py" + run_module.write_text( + textwrap.dedent( + """\ + import runpy + runpy.run_module("ham") + """ + ) + ) + self.assertSigInt([sys.executable, run_module], cwd=tmp) + + def test_pymain_run_file_runpy_run_module_as_main(self): + tmp = self.ham.parent + run_module_as_main = tmp / "run_module_as_main.py" + run_module_as_main.write_text( + textwrap.dedent( + """\ + import runpy + runpy._run_module_as_main("ham") + """ + ) + ) + self.assertSigInt([sys.executable, run_module_as_main], cwd=tmp) + + def test_pymain_run_command_run_module(self): + self.assertSigInt( + [sys.executable, "-c", "import runpy; runpy.run_module('ham')"], + cwd=self.ham.parent, + ) + + def test_pymain_run_command(self): + self.assertSigInt([sys.executable, "-c", "import ham"], cwd=self.ham.parent) + + def test_pymain_run_stdin(self): + self.assertSigInt([sys.executable], input="import ham", cwd=self.ham.parent) + + def test_pymain_run_module(self): + ham = self.ham + self.assertSigInt([sys.executable, "-m", ham.stem], cwd=ham.parent) + + if name == "main": unittest.main() diff --git a/Misc/NEWS.d/next/Tests/2020-08-25-19-25-36.bpo-41602.Z64s0I.rst b/Misc/NEWS.d/next/Tests/2020-08-25-19-25-36.bpo-41602.Z64s0I.rst new file mode 100644 index 0000000000000..fa3d2f1aa374e --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2020-08-25-19-25-36.bpo-41602.Z64s0I.rst @@ -0,0 +1 @@ +Add tests for SIGINT handling in the runpy module. diff --git a/Modules/main.c b/Modules/main.c index 70be4cfacbf82..ea6250e28c1b8 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -299,7 +299,11 @@ pymain_run_module(const wchar_t modname, int set_argv0) Py_DECREF(module); return pymain_exit_err_print(); } + _Py_UnhandledKeyboardInterrupt = 0; result = PyObject_Call(runmodule, runargs, NULL); + if (!result && PyErr_Occurred() == PyExc_KeyboardInterrupt) { + _Py_UnhandledKeyboardInterrupt = 1; + } Py_DECREF(runpy); Py_DECREF(runmodule); Py_DECREF(module); From webhook-mailer at python.org Thu Sep 24 15:30:32 2020 From: webhook-mailer at python.org (Terry Jan Reedy) Date: Thu, 24 Sep 2020 19:30:32 -0000 Subject: [Python-checkins] bpo-41775: Make 'IDLE Shell' the shell title (#22399) Message-ID: https://github.com/python/cpython/commit/05cc881cbcf5d73a312568c78c7149eae3195072 commit: 05cc881cbcf5d73a312568c78c7149eae3195072 branch: master author: Terry Jan Reedy committer: GitHub date: 2020-09-24T15:30:09-04:00 summary: bpo-41775: Make 'IDLE Shell' the shell title (#22399) 'Python Shell' may have contributed to some beginners confusing 'IDLE' with ' Python'. files: A Misc/NEWS.d/next/IDLE/2020-09-24-14-31-16.bpo-41775.sB8Vre.rst M Lib/idlelib/NEWS.txt M Lib/idlelib/pyshell.py diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt index 38b98644942f9..754034200a1f6 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -3,6 +3,8 @@ Released on 2021-10-04? ====================================== +bpo-41775: Make 'IDLE Shell' the shell title. + bpo-35764: Rewrite the Calltips doc section. bpo-40181: In calltips, stop reminding that '/' marks the end of diff --git a/Lib/idlelib/pyshell.py b/Lib/idlelib/pyshell.py index 66ae0f7435dab..b69916dbe876c 100755 --- a/Lib/idlelib/pyshell.py +++ b/Lib/idlelib/pyshell.py @@ -833,7 +833,7 @@ def display_executing_dialog(self): class PyShell(OutputWindow): - shell_title = "Python " + python_version() + " Shell" + shell_title = "IDLE Shell " + python_version() # Override classes ColorDelegator = ModifiedColorDelegator diff --git a/Misc/NEWS.d/next/IDLE/2020-09-24-14-31-16.bpo-41775.sB8Vre.rst b/Misc/NEWS.d/next/IDLE/2020-09-24-14-31-16.bpo-41775.sB8Vre.rst new file mode 100644 index 0000000000000..59605fa40235f --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2020-09-24-14-31-16.bpo-41775.sB8Vre.rst @@ -0,0 +1 @@ +Use 'IDLE Shell' as shell title From webhook-mailer at python.org Thu Sep 24 16:07:57 2020 From: webhook-mailer at python.org (Miss Islington (bot)) Date: Thu, 24 Sep 2020 20:07:57 -0000 Subject: [Python-checkins] bpo-41775: Make 'IDLE Shell' the shell title (GH-22399) Message-ID: https://github.com/python/cpython/commit/4080f12ccccb17cee36732758912dc4346ec9361 commit: 4080f12ccccb17cee36732758912dc4346ec9361 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com> committer: GitHub date: 2020-09-24T13:07:49-07:00 summary: bpo-41775: Make 'IDLE Shell' the shell title (GH-22399) 'Python Shell' may have contributed to some beginners confusing 'IDLE' with ' Python'. (cherry picked from commit 05cc881cbcf5d73a312568c78c7149eae3195072) Co-authored-by: Terry Jan Reedy files: A Misc/NEWS.d/next/IDLE/2020-09-24-14-31-16.bpo-41775.sB8Vre.rst M Lib/idlelib/NEWS.txt M Lib/idlelib/pyshell.py diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt index ed1619001d59e..5ea33226cc0c3 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -3,6 +3,8 @@ Released on 2020-12-07? ====================================== +bpo-41775: Make 'IDLE Shell' the shell title. + bpo-35764: Rewrite the Calltips doc section. bpo-40181: In calltips, stop reminding that '/' marks the end of diff --git a/Lib/idlelib/pyshell.py b/Lib/idlelib/pyshell.py index 66ae0f7435dab..b69916dbe876c 100755 --- a/Lib/idlelib/pyshell.py +++ b/Lib/idlelib/pyshell.py @@ -833,7 +833,7 @@ def display_executing_dialog(self): class PyShell(OutputWindow): - shell_title = "Python " + python_version() + " Shell" + shell_title = "IDLE Shell " + python_version() # Override classes ColorDelegator = ModifiedColorDelegator diff --git a/Misc/NEWS.d/next/IDLE/2020-09-24-14-31-16.bpo-41775.sB8Vre.rst b/Misc/NEWS.d/next/IDLE/2020-09-24-14-31-16.bpo-41775.sB8Vre.rst new file mode 100644 index 0000000000000..59605fa40235f --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2020-09-24-14-31-16.bpo-41775.sB8Vre.rst @@ -0,0 +1 @@ +Use 'IDLE Shell' as shell title From webhook-mailer at python.org Thu Sep 24 16:08:10 2020 From: webhook-mailer at python.org (Miss Islington (bot)) Date: Thu, 24 Sep 2020 20:08:10 -0000 Subject: [Python-checkins] bpo-41775: Make 'IDLE Shell' the shell title (GH-22399) Message-ID: https://github.com/python/cpython/commit/18e59f587b86297d4fc99765be10d92a717d4775 commit: 18e59f587b86297d4fc99765be10d92a717d4775 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com> committer: GitHub date: 2020-09-24T13:08:06-07:00 summary: bpo-41775: Make 'IDLE Shell' the shell title (GH-22399) 'Python Shell' may have contributed to some beginners confusing 'IDLE' with ' Python'. (cherry picked from commit 05cc881cbcf5d73a312568c78c7149eae3195072) Co-authored-by: Terry Jan Reedy files: A Misc/NEWS.d/next/IDLE/2020-09-24-14-31-16.bpo-41775.sB8Vre.rst M Lib/idlelib/NEWS.txt M Lib/idlelib/pyshell.py diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt index 5d38a500fe618..e538329d978b3 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -3,6 +3,8 @@ Released on 2020-12-?? ====================================== +bpo-41775: Make 'IDLE Shell' the shell title. + bpo-35764: Rewrite the Calltips doc section. bpo-40181: In calltips, stop reminding that '/' marks the end of diff --git a/Lib/idlelib/pyshell.py b/Lib/idlelib/pyshell.py index 66ae0f7435dab..b69916dbe876c 100755 --- a/Lib/idlelib/pyshell.py +++ b/Lib/idlelib/pyshell.py @@ -833,7 +833,7 @@ def display_executing_dialog(self): class PyShell(OutputWindow): - shell_title = "Python " + python_version() + " Shell" + shell_title = "IDLE Shell " + python_version() # Override classes ColorDelegator = ModifiedColorDelegator diff --git a/Misc/NEWS.d/next/IDLE/2020-09-24-14-31-16.bpo-41775.sB8Vre.rst b/Misc/NEWS.d/next/IDLE/2020-09-24-14-31-16.bpo-41775.sB8Vre.rst new file mode 100644 index 0000000000000..59605fa40235f --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2020-09-24-14-31-16.bpo-41775.sB8Vre.rst @@ -0,0 +1 @@ +Use 'IDLE Shell' as shell title From webhook-mailer at python.org Fri Sep 25 09:04:29 2020 From: webhook-mailer at python.org (Mark Shannon) Date: Fri, 25 Sep 2020 13:04:29 -0000 Subject: [Python-checkins] bpo-39934: Account for control blocks in 'except' in compiler. (GH-22395) Message-ID: https://github.com/python/cpython/commit/02d126aa09d96d03dcf9c5b51c858ce5ef386601 commit: 02d126aa09d96d03dcf9c5b51c858ce5ef386601 branch: master author: Mark Shannon committer: GitHub date: 2020-09-25T14:04:19+01:00 summary: bpo-39934: Account for control blocks in 'except' in compiler. (GH-22395) Account for control blocks in 'except' in compiler. Fixes #39934. files: A Misc/NEWS.d/next/Core and Builtins/2020-09-24-12-15-45.bpo-39934.YVHTCF.rst M Lib/test/test_syntax.py M Python/compile.c diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py index 4657fd1c0d8a7..09c6eb3375409 100644 --- a/Lib/test/test_syntax.py +++ b/Lib/test/test_syntax.py @@ -950,6 +950,15 @@ def test_empty_line_after_linecont(self): except SyntaxError: self.fail("Empty line after a line continuation character is valid.") + @support.cpython_only + def test_nested_named_except_blocks(self): + code = "" + for i in range(12): + code += f"{' 'i}try:\n" + code += f"{' '(i+1)}raise Exception\n" + code += f"{' 'i}except Exception as e:\n" + code += f"{' '412}pass" + self._check_error(code, "too many statically nested blocks") def test_main(): support.run_unittest(SyntaxTestCase) diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-09-24-12-15-45.bpo-39934.YVHTCF.rst b/Misc/NEWS.d/next/Core and Builtins/2020-09-24-12-15-45.bpo-39934.YVHTCF.rst new file mode 100644 index 0000000000000..92cd1ba234d21 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2020-09-24-12-15-45.bpo-39934.YVHTCF.rst @@ -0,0 +1,3 @@ +Correctly count control blocks in 'except' in compiler. Ensures that a +syntax error, rather a fatal error, occurs for deeply nested, named +exception handlers. diff --git a/Python/compile.c b/Python/compile.c index 0f9e5c276c7b7..f2563d7f7a411 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -108,8 +108,8 @@ It's called a frame block to distinguish it from a basic block in the compiler IR. / -enum fblocktype { WHILE_LOOP, FOR_LOOP, EXCEPT, FINALLY_TRY, FINALLY_END, - WITH, ASYNC_WITH, HANDLER_CLEANUP, POP_VALUE }; +enum fblocktype { WHILE_LOOP, FOR_LOOP, TRY_EXCEPT, FINALLY_TRY, FINALLY_END, + WITH, ASYNC_WITH, HANDLER_CLEANUP, POP_VALUE, EXCEPTION_HANDLER }; struct fblockinfo { enum fblocktype fb_type; @@ -1623,9 +1623,7 @@ compiler_push_fblock(struct compiler c, enum fblocktype t, basicblock b, { struct fblockinfo f; if (c->u->u_nfblocks >= CO_MAXBLOCKS) { - PyErr_SetString(PyExc_SyntaxError, - "too many statically nested blocks"); - return 0; + return compiler_error(c, "too many statically nested blocks"); } f = &c->u->u_fblock[c->u->u_nfblocks++]; f->fb_type = t; @@ -1665,6 +1663,7 @@ compiler_unwind_fblock(struct compiler c, struct fblockinfo info, { switch (info->fb_type) { case WHILE_LOOP: + case EXCEPTION_HANDLER: return 1; case FOR_LOOP: @@ -1675,7 +1674,7 @@ compiler_unwind_fblock(struct compiler c, struct fblockinfo info, ADDOP(c, POP_TOP); return 1; - case EXCEPT: + case TRY_EXCEPT: ADDOP(c, POP_BLOCK); return 1; @@ -3060,14 +3059,17 @@ compiler_try_except(struct compiler c, stmt_ty s) return 0; ADDOP_JUMP(c, SETUP_FINALLY, except); compiler_use_next_block(c, body); - if (!compiler_push_fblock(c, EXCEPT, body, NULL, NULL)) + if (!compiler_push_fblock(c, TRY_EXCEPT, body, NULL, NULL)) return 0; VISIT_SEQ(c, stmt, s->v.Try.body); ADDOP(c, POP_BLOCK); - compiler_pop_fblock(c, EXCEPT, body); + compiler_pop_fblock(c, TRY_EXCEPT, body); ADDOP_JUMP(c, JUMP_FORWARD, orelse); n = asdl_seq_LEN(s->v.Try.handlers); compiler_use_next_block(c, except); + / Runtime will push a block here, so we need to account for that / + if (!compiler_push_fblock(c, EXCEPTION_HANDLER, NULL, NULL, NULL)) + return 0; for (i = 0; i < n; i++) { excepthandler_ty handler = (excepthandler_ty)asdl_seq_GET( s->v.Try.handlers, i); @@ -3152,6 +3154,7 @@ compiler_try_except(struct compiler c, stmt_ty s) } compiler_use_next_block(c, except); } + compiler_pop_fblock(c, EXCEPTION_HANDLER, NULL); ADDOP(c, RERAISE); compiler_use_next_block(c, orelse); VISIT_SEQ(c, stmt, s->v.Try.orelse); From webhook-mailer at python.org Fri Sep 25 14:08:55 2020 From: webhook-mailer at python.org (Eric Larson) Date: Fri, 25 Sep 2020 18:08:55 -0000 Subject: [Python-checkins] Fix logging error message (GH-22410) Message-ID: https://github.com/python/cpython/commit/9fdb76c34c44ac27531229b72aa2aa424d10e846 commit: 9fdb76c34c44ac27531229b72aa2aa424d10e846 branch: master author: Eric Larson committer: GitHub date: 2020-09-25T11:08:50-07:00 summary: Fix logging error message (GH-22410) Same changes as #22276 squashed to a single commit. Just hoping to get Travis to cooperate by opening a new PR... Automerge-Triggered-By: @vsajip files: M Lib/logging/init.py M Lib/test/test_logging.py diff --git a/Lib/logging/init.py b/Lib/logging/init.py index 94361ca75f4f3..d8a88db378436 100644 --- a/Lib/logging/init.py +++ b/Lib/logging/init.py @@ -194,7 +194,8 @@ def _checkLevel(level): raise ValueError("Unknown level: %r" % level) rv = _nameToLevel[level] else: - raise TypeError("Level not an integer or a valid string: %r" % level) + raise TypeError("Level not an integer or a valid string: %r" + % (level,)) return rv #--------------------------------------------------------------------------- diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py index d23fbfb4fe281..4cd8c7e25daa9 100644 --- a/Lib/test/test_logging.py +++ b/Lib/test/test_logging.py @@ -3720,7 +3720,15 @@ def tzname(self, dt): utc = UTC() -class FormatterTest(unittest.TestCase): +class AssertErrorMessage: + + def assert_error_message(self, exception, message, args, **kwargs): + try: + self.assertRaises((), *args, **kwargs) + except exception as e: + self.assertEqual(message, str(e)) + +class FormatterTest(unittest.TestCase, AssertErrorMessage): def setUp(self): self.common = { 'name': 'formatter.test', @@ -3744,12 +3752,6 @@ def get_record(self, name=None): result.update(self.variants[name]) return logging.makeLogRecord(result) - def assert_error_message(self, exception, message, *args, **kwargs): - try: - self.assertRaises(exception, *args, **kwargs) - except exception as e: - self.assertEqual(message, e.message) - def test_percent(self): # Test %-formatting r = self.get_record() @@ -3868,7 +3870,7 @@ def test_format_validate(self): # Testing failure for '-' in field name self.assert_error_message( ValueError, - "invalid field name/expression: 'name-thing'", + "invalid format: invalid field name/expression: 'name-thing'", logging.Formatter, "{name-thing}", style="{" ) # Testing failure for style mismatch @@ -3891,7 +3893,7 @@ def test_format_validate(self): # Testing failure for invalid spec self.assert_error_message( ValueError, - "bad specifier: '.2ff'", + "invalid format: bad specifier: '.2ff'", logging.Formatter, '{process:.2ff}', style='{' ) self.assertRaises(ValueError, logging.Formatter, '{process:.2Z}', style='{') @@ -3901,12 +3903,12 @@ def test_format_validate(self): # Testing failure for mismatch braces self.assert_error_message( ValueError, - "invalid format: unmatched '{' in format spec", + "invalid format: expected '}' before end of string", logging.Formatter, '{process', style='{' ) self.assert_error_message( ValueError, - "invalid format: unmatched '{' in format spec", + "invalid format: Single '}' encountered in format string", logging.Formatter, 'process}', style='{' ) self.assertRaises(ValueError, logging.Formatter, '{{foo!r:4.2}', style='{') @@ -4867,7 +4869,7 @@ def process(self, msg, kwargs): self.assertIs(self.logger.manager, orig_manager) -class LoggerTest(BaseTest): +class LoggerTest(BaseTest, AssertErrorMessage): def setUp(self): super(LoggerTest, self).setUp() @@ -4879,7 +4881,12 @@ def setUp(self): self.addCleanup(logging.shutdown) def test_set_invalid_level(self): - self.assertRaises(TypeError, self.logger.setLevel, object()) + self.assert_error_message( + TypeError, 'Level not an integer or a valid string: None', + self.logger.setLevel, None) + self.assert_error_message( + TypeError, 'Level not an integer or a valid string: (0, 0)', + self.logger.setLevel, (0, 0)) def test_exception(self): msg = 'testing exception: %r' From webhook-mailer at python.org Sat Sep 26 06:49:12 2020 From: webhook-mailer at python.org (Victor Stinner) Date: Sat, 26 Sep 2020 10:49:12 -0000 Subject: [Python-checkins] bpo-41428: Fix compiler warning in unionobject.c (GH-22416) Message-ID: https://github.com/python/cpython/commit/d73cf7ca85fb60b739e671597aabe72cc36d397a commit: d73cf7ca85fb60b739e671597aabe72cc36d397a branch: master author: Victor Stinner committer: GitHub date: 2020-09-26T12:48:41+02:00 summary: bpo-41428: Fix compiler warning in unionobject.c (GH-22416) Use Py_ssize_t type rather than int, to store lengths in unionobject.c. Fix the warning: Objects\unionobject.c(205,1): warning C4244: 'initializing': conversion from 'Py_ssize_t' to 'int', possible loss of data files: M Objects/unionobject.c diff --git a/Objects/unionobject.c b/Objects/unionobject.c index e055a55e91715..8cfb2a664753f 100644 --- a/Objects/unionobject.c +++ b/Objects/unionobject.c @@ -202,8 +202,8 @@ flatten_args(PyObject* args) PyTypeObject* arg_type = Py_TYPE(arg); if (arg_type == &_Py_UnionType) { PyObject* nested_args = ((unionobject)arg)->args; - int nested_arg_length = PyTuple_GET_SIZE(nested_args); - for (int j = 0; j < nested_arg_length; j++) { + Py_ssize_t nested_arg_length = PyTuple_GET_SIZE(nested_args); + for (Py_ssize_t j = 0; j < nested_arg_length; j++) { PyObject nested_arg = PyTuple_GET_ITEM(nested_args, j); Py_INCREF(nested_arg); PyTuple_SET_ITEM(flattened_args, pos, nested_arg); @@ -231,7 +231,7 @@ dedup_and_flatten_args(PyObject* args) return NULL; } // Add unique elements to an array. - int added_items = 0; + Py_ssize_t added_items = 0; for (Py_ssize_t i = 0; i < arg_length; i++) { int is_duplicate = 0; PyObject* i_element = PyTuple_GET_ITEM(args, i); From webhook-mailer at python.org Sat Sep 26 06:56:34 2020 From: webhook-mailer at python.org (Dong-hee Na) Date: Sat, 26 Sep 2020 10:56:34 -0000 Subject: [Python-checkins] bpo-1635741: Port _bisect module to multi-phase init (GH-22415) Message-ID: https://github.com/python/cpython/commit/2afd1751dd9a35d4ec03b708e3e5cddd72c43f7e commit: 2afd1751dd9a35d4ec03b708e3e5cddd72c43f7e branch: master author: Dong-hee Na committer: GitHub date: 2020-09-26T19:56:26+09:00 summary: bpo-1635741: Port _bisect module to multi-phase init (GH-22415) files: A Misc/NEWS.d/next/Core and Builtins/2020-09-26-14-43-30.bpo-1635741.aJS9B3.rst M Modules/_bisectmodule.c diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-09-26-14-43-30.bpo-1635741.aJS9B3.rst b/Misc/NEWS.d/next/Core and Builtins/2020-09-26-14-43-30.bpo-1635741.aJS9B3.rst new file mode 100644 index 0000000000000..252dab35a1368 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2020-09-26-14-43-30.bpo-1635741.aJS9B3.rst @@ -0,0 +1 @@ +Port the :mod:`_bisect` module to the multi-phase initialization API (:pep:`489`). diff --git a/Modules/_bisectmodule.c b/Modules/_bisectmodule.c index 82d800d9a8790..277e9755f2721 100644 --- a/Modules/_bisectmodule.c +++ b/Modules/_bisectmodule.c @@ -237,18 +237,14 @@ common approach.\n"); static struct PyModuleDef _bisectmodule = { PyModuleDef_HEAD_INIT, - "_bisect", - module_doc, - -1, - bisect_methods, - NULL, - NULL, - NULL, - NULL + .m_name = "_bisect", + .m_doc = module_doc, + .m_methods = bisect_methods, + .m_size = 0 }; PyMODINIT_FUNC PyInit__bisect(void) { - return PyModule_Create(&_bisectmodule); + return PyModuleDef_Init(&_bisectmodule); } From webhook-mailer at python.org Sat Sep 26 20:47:34 2020 From: webhook-mailer at python.org (Andre Delfino) Date: Sun, 27 Sep 2020 00:47:34 -0000 Subject: [Python-checkins] Revert "Fix all Python Cookbook links (#22205)" (GH-22424) Message-ID: https://github.com/python/cpython/commit/e8a2076e149703ea043db5a9dfaaf8d9b7f37c3e commit: e8a2076e149703ea043db5a9dfaaf8d9b7f37c3e branch: master author: Andre Delfino committer: GitHub date: 2020-09-27T01:47:25+01:00 summary: Revert "Fix all Python Cookbook links (#22205)" (GH-22424) This commit reverts commit ac0333e1e117b7f61ed7ef1dbcdb6e515ada603b as the original links are working again and they provide extended features such as comments and alternative versions. files: M Doc/faq/programming.rst M Doc/howto/urllib2.rst M Doc/library/bisect.rst M Doc/library/collections.abc.rst M Doc/library/collections.rst M Doc/library/difflib.rst M Doc/library/math.rst M Doc/library/random.rst M Doc/library/shelve.rst M Doc/library/stdtypes.rst M Doc/library/sys.rst M Doc/tutorial/whatnow.rst M Doc/whatsnew/3.2.rst M Lib/collections/init.py M Lib/heapq.py M Lib/test/test_math.py M Tools/peg_generator/pegen/sccutils.py diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst index fd0adc378bfa6..4f4ea8b18176c 100644 --- a/Doc/faq/programming.rst +++ b/Doc/faq/programming.rst @@ -1141,7 +1141,7 @@ How do you remove duplicates from a list? See the Python Cookbook for a long discussion of many ways to do this: - https://github.com/ActiveState/code/tree/master/recipes/Python/52560_Remove_duplicates/recipe-52560.py + https://code.activestate.com/recipes/52560/ If you don't mind reordering the list, sort it and then scan from the end of the list, deleting duplicates as you go:: diff --git a/Doc/howto/urllib2.rst b/Doc/howto/urllib2.rst index 38623371fbabf..046a88af62f0b 100644 --- a/Doc/howto/urllib2.rst +++ b/Doc/howto/urllib2.rst @@ -601,5 +601,5 @@ This document was reviewed and revised by John Lee. scripts with a localhost server, I have to prevent urllib from using the proxy. .. [#] urllib opener for SSL proxy (CONNECT method): `ASPN Cookbook Recipe - `_. + `_. diff --git a/Doc/library/bisect.rst b/Doc/library/bisect.rst index 6666d55abe2e5..6bf7814b257f4 100644 --- a/Doc/library/bisect.rst +++ b/Doc/library/bisect.rst @@ -60,7 +60,7 @@ The following functions are provided: .. seealso:: `SortedCollection recipe - `_ that uses + `_ that uses bisect to build a full-featured collection class with straight-forward search methods and support for a key-function. The keys are precomputed to save unnecessary calls to the key function during searches. diff --git a/Doc/library/collections.abc.rst b/Doc/library/collections.abc.rst index a6038098675da..db0e25bb0772e 100644 --- a/Doc/library/collections.abc.rst +++ b/Doc/library/collections.abc.rst @@ -308,7 +308,7 @@ Notes on using :class:`Set` and :class:`MutableSet` as a mixin: .. seealso:: - * `OrderedSet recipe `_ for an + * `OrderedSet recipe `_ for an example built on :class:`MutableSet`. * For more about ABCs, see the :mod:`abc` module and :pep:`3119`. diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst index a7d01b3f397a7..f538da5e1c9fa 100644 --- a/Doc/library/collections.rst +++ b/Doc/library/collections.rst @@ -135,12 +135,12 @@ The class can be used to simulate nested scopes and is useful in templating. :attr:`~collections.ChainMap.parents` property. * The `Nested Contexts recipe - `_ has options to control + `_ has options to control whether writes and other mutations apply only to the first mapping or to any mapping in the chain. * A `greatly simplified read-only version of Chainmap - `_. + `_. :class:`ChainMap` Examples and Recipes diff --git a/Doc/library/difflib.rst b/Doc/library/difflib.rst index 009b7976dff15..aa08988c8b36f 100644 --- a/Doc/library/difflib.rst +++ b/Doc/library/difflib.rst @@ -633,7 +633,7 @@ If you want to know how to change the first sequence into the second, use work. * `Simple version control recipe - `_ for a small application + `_ for a small application built with :class:`SequenceMatcher`. diff --git a/Doc/library/math.rst b/Doc/library/math.rst index f152c45a87aa3..bbf64643ff59f 100644 --- a/Doc/library/math.rst +++ b/Doc/library/math.rst @@ -123,7 +123,7 @@ Number-theoretic and representation functions For further discussion and two alternative approaches, see the `ASPN cookbook recipes for accurate floating point summation - `_\. + `_\. .. function:: gcd(integers) diff --git a/Doc/library/random.rst b/Doc/library/random.rst index 4e97b1dbad85c..0cdf0a6ac4a47 100644 --- a/Doc/library/random.rst +++ b/Doc/library/random.rst @@ -57,7 +57,7 @@ from sources provided by the operating system. `Complementary-Multiply-with-Carry recipe - `_ for a compatible alternative + `_ for a compatible alternative random number generator with a long period and comparatively simple update operations. diff --git a/Doc/library/shelve.rst b/Doc/library/shelve.rst index a94255bbf698e..f08c58179a2f9 100644 --- a/Doc/library/shelve.rst +++ b/Doc/library/shelve.rst @@ -75,7 +75,7 @@ Two additional methods are supported: .. seealso:: - `Persistent dictionary recipe `_ + `Persistent dictionary recipe `_ with widely supported storage formats and having the speed of native dictionaries. diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst index 2eee22c79af76..0ffe7b7526fa7 100644 --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -1404,7 +1404,7 @@ objects that compare equal might have different :attr:`~range.start`, .. seealso:: - The `linspace recipe `_ + * The `linspace recipe `_ shows how to implement a lazy version of range suitable for floating point applications. diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst index aa417ede40228..d201d7061f980 100644 --- a/Doc/library/sys.rst +++ b/Doc/library/sys.rst @@ -679,7 +679,7 @@ always available. additional garbage collector overhead if the object is managed by the garbage collector. - See `recursive sizeof recipe `_ + See `recursive sizeof recipe `_ for an example of using :func:`getsizeof` recursively to find the size of containers and all their contents. diff --git a/Doc/tutorial/whatnow.rst b/Doc/tutorial/whatnow.rst index 38ce9f0a900c2..3208201312b87 100644 --- a/Doc/tutorial/whatnow.rst +++ b/Doc/tutorial/whatnow.rst @@ -43,7 +43,7 @@ More Python resources: for download. Once you begin releasing code, you can register it here so that others can find it. -* https://github.com/ActiveState/code/tree/master/recipes/Python: The Python Cookbook is a +* https://code.activestate.com/recipes/langs/python/: The Python Cookbook is a sizable collection of code examples, larger modules, and useful scripts. Particularly notable contributions are collected in a book also titled Python Cookbook (O'Reilly & Associates, ISBN 0-596-00797-3.) diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst index 37bae34ce74ad..06bee9966c0be 100644 --- a/Doc/whatsnew/3.2.rst +++ b/Doc/whatsnew/3.2.rst @@ -781,8 +781,8 @@ functools (Contributed by Raymond Hettinger and incorporating design ideas from Jim Baker, Miki Tebeka, and Nick Coghlan; see `recipe 498245 - `_\, `recipe 577479 - `_\, :issue:`10586`, and + `_\, `recipe 577479 + `_\, :issue:`10586`, and :issue:`10593`.) * The :func:`functools.wraps` decorator now adds a :attr:`wrapped` attribute diff --git a/Lib/collections/init.py b/Lib/collections/init.py index f4da9d0cefd6b..5d75501645fc4 100644 --- a/Lib/collections/init.py +++ b/Lib/collections/init.py @@ -574,7 +574,7 @@ class Counter(dict): # http://en.wikipedia.org/wiki/Multiset # http://www.gnu.org/software/smalltalk/manual-base/html_node/Bag.html # http://www.demo2s.com/Tutorial/Cpp/0380set-multiset/Catalog0380set-multiset.htm - # https://github.com/ActiveState/code/tree/master/recipes/Python/259174_bag_collection_class/recipe-259174.py + # http://code.activestate.com/recipes/259174/ # Knuth, TAOCP Vol. II section 4.6.3 def init(self, iterable=None, /, **kwds): diff --git a/Lib/heapq.py b/Lib/heapq.py index 5895562db4142..fabefd87f8bf8 100644 --- a/Lib/heapq.py +++ b/Lib/heapq.py @@ -456,7 +456,7 @@ def merge(iterables, key=None, reverse=False): # 2) Made multiple passes over the data. # 3) Made more comparisons in common cases (small k, large n, semi-random input). # See the more detailed comparison of approach at: -# https://github.com/ActiveState/code/tree/master/recipes/Python/577573_Compare_algorithms/recipe-577573.py +# http://code.activestate.com/recipes/577573-compare-algorithms-for-heapqsmallest def nsmallest(n, iterable, key=None): """Find the n smallest elements in a dataset. diff --git a/Lib/test/test_math.py b/Lib/test/test_math.py index 2abe5b028b355..a6f6483f55d89 100644 --- a/Lib/test/test_math.py +++ b/Lib/test/test_math.py @@ -611,7 +611,7 @@ def testFsum(self): def msum(iterable): """Full precision summation. Compute sum(iterable) without any intermediate accumulation of error. Based on the 'lsum' function - at https://github.com/ActiveState/code/tree/master/recipes/Python/393090_Binary_floating_point_summatiaccurate_full/recipe-393090.py + at http://code.activestate.com/recipes/393090/ """ tmant, texp = 0, 0 diff --git a/Tools/peg_generator/pegen/sccutils.py b/Tools/peg_generator/pegen/sccutils.py index 0c295196607ec..1f0586bb2f7d6 100644 --- a/Tools/peg_generator/pegen/sccutils.py +++ b/Tools/peg_generator/pegen/sccutils.py @@ -18,7 +18,7 @@ def strongly_connected_components( exactly once; vertices not part of a SCC are returned as singleton sets. - From https://github.com/ActiveState/code/tree/master/recipes/Python/578507_Strongly_connected_components_directed/recipe-578507.py. + From http://code.activestate.com/recipes/578507/. """ identified: Set[str] = set() stack: List[str] = [] @@ -81,7 +81,7 @@ def topsort( {B, C} {A} - From https://github.com/ActiveState/code/tree/master/recipes/Python/577413_Topological_Sort/recipe-577413.py. + From http://code.activestate.com/recipes/577413/. """ # TODO: Use a faster algorithm? for k, v in data.items(): From webhook-mailer at python.org Sat Sep 26 23:43:22 2020 From: webhook-mailer at python.org (Emmanuel Arias) Date: Sun, 27 Sep 2020 03:43:22 -0000 Subject: [Python-checkins] bpo-41858: Clarify line in optparse doc (GH-22407) Message-ID: https://github.com/python/cpython/commit/00eb063b6600fdb4ba5cfb99da83cc1660ec69bf commit: 00eb063b6600fdb4ba5cfb99da83cc1660ec69bf branch: master author: Emmanuel Arias committer: GitHub date: 2020-09-26T23:43:18-04:00 summary: bpo-41858: Clarify line in optparse doc (GH-22407) The existing line is easily read as being incomplete. files: M Doc/library/optparse.rst diff --git a/Doc/library/optparse.rst b/Doc/library/optparse.rst index c1a18e0147431..b1094198f4c84 100644 --- a/Doc/library/optparse.rst +++ b/Doc/library/optparse.rst @@ -55,7 +55,7 @@ equivalent to the above example:: -q -foutfile -qfoutfile -Additionally, users can run one of :: +Additionally, users can run one of the following :: -h --help From webhook-mailer at python.org Sat Sep 26 23:52:06 2020 From: webhook-mailer at python.org (Miss Islington (bot)) Date: Sun, 27 Sep 2020 03:52:06 -0000 Subject: [Python-checkins] bpo-41858: Clarify line in optparse doc (GH-22407) Message-ID: https://github.com/python/cpython/commit/e0e614ca99c39e107b97c7be779efea08f22ace3 commit: e0e614ca99c39e107b97c7be779efea08f22ace3 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com> committer: GitHub date: 2020-09-26T20:52:01-07:00 summary: bpo-41858: Clarify line in optparse doc (GH-22407) The existing line is easily read as being incomplete. (cherry picked from commit 00eb063b6600fdb4ba5cfb99da83cc1660ec69bf) Co-authored-by: Emmanuel Arias files: M Doc/library/optparse.rst diff --git a/Doc/library/optparse.rst b/Doc/library/optparse.rst index c1a18e0147431..b1094198f4c84 100644 --- a/Doc/library/optparse.rst +++ b/Doc/library/optparse.rst @@ -55,7 +55,7 @@ equivalent to the above example:: -q -foutfile -qfoutfile -Additionally, users can run one of :: +Additionally, users can run one of the following :: -h --help From webhook-mailer at python.org Sun Sep 27 00:04:01 2020 From: webhook-mailer at python.org (Miss Islington (bot)) Date: Sun, 27 Sep 2020 04:04:01 -0000 Subject: [Python-checkins] bpo-41858: Clarify line in optparse doc (GH-22407) Message-ID: https://github.com/python/cpython/commit/8b2595f68af059afdd61b2bb3d32a2bf4f1662c8 commit: 8b2595f68af059afdd61b2bb3d32a2bf4f1662c8 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com> committer: GitHub date: 2020-09-26T21:03:56-07:00 summary: bpo-41858: Clarify line in optparse doc (GH-22407) The existing line is easily read as being incomplete. (cherry picked from commit 00eb063b6600fdb4ba5cfb99da83cc1660ec69bf) Co-authored-by: Emmanuel Arias files: M Doc/library/optparse.rst diff --git a/Doc/library/optparse.rst b/Doc/library/optparse.rst index c1a18e0147431..b1094198f4c84 100644 --- a/Doc/library/optparse.rst +++ b/Doc/library/optparse.rst @@ -55,7 +55,7 @@ equivalent to the above example:: -q -foutfile -qfoutfile -Additionally, users can run one of :: +Additionally, users can run one of the following :: -h --help From webhook-mailer at python.org Sun Sep 27 08:15:09 2020 From: webhook-mailer at python.org (Erlend Egeberg Aasland) Date: Sun, 27 Sep 2020 12:15:09 -0000 Subject: [Python-checkins] bpo-41861: Convert _sqlite3 cache and node static types to heap types (GH-22417) Message-ID: https://github.com/python/cpython/commit/a937ab45d6af4f99ff16fec73d5d75d93c569456 commit: a937ab45d6af4f99ff16fec73d5d75d93c569456 branch: master author: Erlend Egeberg Aasland committer: GitHub date: 2020-09-27T14:14:50+02:00 summary: bpo-41861: Convert _sqlite3 cache and node static types to heap types (GH-22417) files: M Modules/_sqlite/cache.c M Modules/_sqlite/cache.h M Modules/_sqlite/connection.c M Modules/_sqlite/module.c diff --git a/Modules/_sqlite/cache.c b/Modules/_sqlite/cache.c index 758fc022f7810..c417ce872d368 100644 --- a/Modules/_sqlite/cache.c +++ b/Modules/_sqlite/cache.c @@ -29,7 +29,7 @@ pysqlite_Node pysqlite_new_node(PyObject* key, PyObject* data) { pysqlite_Node* node; - node = (pysqlite_Node) (pysqlite_NodeType.tp_alloc(&pysqlite_NodeType, 0)); + node = (pysqlite_Node) (pysqlite_NodeType->tp_alloc(pysqlite_NodeType, 0)); if (!node) { return NULL; } @@ -48,10 +48,13 @@ pysqlite_Node* pysqlite_new_node(PyObject* key, PyObject* data) void pysqlite_node_dealloc(pysqlite_Node* self) { + PyTypeObject tp = Py_TYPE(self); + Py_DECREF(self->key); Py_DECREF(self->data); - Py_TYPE(self)->tp_free((PyObject)self); + tp->tp_free(self); + Py_DECREF(tp); } int pysqlite_cache_init(pysqlite_Cache* self, PyObject* args, PyObject* kwargs) @@ -88,6 +91,7 @@ int pysqlite_cache_init(pysqlite_Cache* self, PyObject* args, PyObject* kwargs) void pysqlite_cache_dealloc(pysqlite_Cache* self) { + PyTypeObject tp = Py_TYPE(self); pysqlite_Node node; pysqlite_Node* delete_node; @@ -109,7 +113,8 @@ void pysqlite_cache_dealloc(pysqlite_Cache* self) } Py_DECREF(self->mapping); - Py_TYPE(self)->tp_free((PyObject)self); + tp->tp_free(self); + Py_DECREF(tp); } PyObject pysqlite_cache_get(pysqlite_Cache* self, PyObject* key) @@ -253,6 +258,20 @@ PyObject* pysqlite_cache_display(pysqlite_Cache* self, PyObject* args) Py_RETURN_NONE; } +static PyType_Slot pysqlite_NodeType_slots[] = { + {Py_tp_dealloc, pysqlite_node_dealloc}, + {Py_tp_new, PyType_GenericNew}, + {0, NULL}, +}; + +static PyType_Spec pysqlite_NodeType_spec = { + .name = MODULE_NAME ".Node", + .basicsize = sizeof(pysqlite_Node), + .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HEAPTYPE, + .slots = pysqlite_NodeType_slots, +}; +PyTypeObject pysqlite_NodeType = NULL; + static PyMethodDef cache_methods[] = { {"get", (PyCFunction)pysqlite_cache_get, METH_O, PyDoc_STR("Gets an entry from the cache or calls the factory function to produce one.")}, @@ -261,102 +280,32 @@ static PyMethodDef cache_methods[] = { {NULL, NULL} }; -PyTypeObject pysqlite_NodeType = { - PyVarObject_HEAD_INIT(NULL, 0) - MODULE_NAME "Node", / tp_name / - sizeof(pysqlite_Node), / tp_basicsize / - 0, / tp_itemsize / - (destructor)pysqlite_node_dealloc, / tp_dealloc / - 0, / tp_vectorcall_offset / - 0, / tp_getattr / - 0, / tp_setattr / - 0, / tp_as_async / - 0, / tp_repr / - 0, / tp_as_number / - 0, / tp_as_sequence / - 0, / tp_as_mapping / - 0, / tp_hash / - 0, / tp_call / - 0, / tp_str / - 0, / tp_getattro / - 0, / tp_setattro / - 0, / tp_as_buffer / - Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, / tp_flags / - 0, / tp_doc / - 0, / tp_traverse / - 0, / tp_clear / - 0, / tp_richcompare / - 0, / tp_weaklistoffset / - 0, / tp_iter / - 0, / tp_iternext / - 0, / tp_methods / - 0, / tp_members / - 0, / tp_getset / - 0, / tp_base / - 0, / tp_dict / - 0, / tp_descr_get / - 0, / tp_descr_set / - 0, / tp_dictoffset / - (initproc)0, / tp_init / - 0, / tp_alloc / - 0, / tp_new / - 0 / tp_free / +static PyType_Slot pysqlite_CacheType_slots[] = { + {Py_tp_dealloc, pysqlite_cache_dealloc}, + {Py_tp_methods, cache_methods}, + {Py_tp_new, PyType_GenericNew}, + {Py_tp_init, pysqlite_cache_init}, + {0, NULL}, }; -PyTypeObject pysqlite_CacheType = { - PyVarObject_HEAD_INIT(NULL, 0) - MODULE_NAME ".Cache", / tp_name / - sizeof(pysqlite_Cache), / tp_basicsize / - 0, / tp_itemsize / - (destructor)pysqlite_cache_dealloc, / tp_dealloc / - 0, / tp_vectorcall_offset / - 0, / tp_getattr / - 0, / tp_setattr / - 0, / tp_as_async / - 0, / tp_repr / - 0, / tp_as_number / - 0, / tp_as_sequence / - 0, / tp_as_mapping / - 0, / tp_hash / - 0, / tp_call / - 0, / tp_str / - 0, / tp_getattro / - 0, / tp_setattro / - 0, / tp_as_buffer / - Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, / tp_flags / - 0, / tp_doc / - 0, / tp_traverse / - 0, / tp_clear / - 0, / tp_richcompare / - 0, / tp_weaklistoffset / - 0, / tp_iter / - 0, / tp_iternext / - cache_methods, / tp_methods / - 0, / tp_members / - 0, / tp_getset / - 0, / tp_base / - 0, / tp_dict / - 0, / tp_descr_get / - 0, / tp_descr_set / - 0, / tp_dictoffset / - (initproc)pysqlite_cache_init, / tp_init / - 0, / tp_alloc / - 0, / tp_new / - 0 / tp_free / +static PyType_Spec pysqlite_CacheType_spec = { + .name = MODULE_NAME ".Cache", + .basicsize = sizeof(pysqlite_Cache), + .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HEAPTYPE, + .slots = pysqlite_CacheType_slots, }; +PyTypeObject pysqlite_CacheType = NULL; -extern int pysqlite_cache_setup_types(void) +extern int pysqlite_cache_setup_types(PyObject mod) { - int rc; - - pysqlite_NodeType.tp_new = PyType_GenericNew; - pysqlite_CacheType.tp_new = PyType_GenericNew; - - rc = PyType_Ready(&pysqlite_NodeType); - if (rc < 0) { - return rc; + pysqlite_NodeType = (PyTypeObject )PyType_FromModuleAndSpec(mod, &pysqlite_NodeType_spec, NULL); + if (pysqlite_NodeType == NULL) { + return -1; } - rc = PyType_Ready(&pysqlite_CacheType); - return rc; + pysqlite_CacheType = (PyTypeObject )PyType_FromModuleAndSpec(mod, &pysqlite_CacheType_spec, NULL); + if (pysqlite_CacheType == NULL) { + return -1; + } + return 0; } diff --git a/Modules/_sqlite/cache.h b/Modules/_sqlite/cache.h index 529010967c4f3..0afdf7f09b65c 100644 --- a/Modules/_sqlite/cache.h +++ b/Modules/_sqlite/cache.h @@ -59,8 +59,8 @@ typedef struct int decref_factory; } pysqlite_Cache; -extern PyTypeObject pysqlite_NodeType; -extern PyTypeObject pysqlite_CacheType; +extern PyTypeObject pysqlite_NodeType; +extern PyTypeObject pysqlite_CacheType; int pysqlite_node_init(pysqlite_Node self, PyObject* args, PyObject* kwargs); void pysqlite_node_dealloc(pysqlite_Node* self); @@ -69,6 +69,6 @@ int pysqlite_cache_init(pysqlite_Cache* self, PyObject* args, PyObject* kwargs); void pysqlite_cache_dealloc(pysqlite_Cache* self); PyObject* pysqlite_cache_get(pysqlite_Cache* self, PyObject* args); -int pysqlite_cache_setup_types(void); +int pysqlite_cache_setup_types(PyObject module); #endif diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c index 81fc1335371a6..121850ae7e1f3 100644 --- a/Modules/_sqlite/connection.c +++ b/Modules/_sqlite/connection.c @@ -133,7 +133,7 @@ int pysqlite_connection_init(pysqlite_Connection self, PyObject* args, PyObject } Py_DECREF(isolation_level); - self->statement_cache = (pysqlite_Cache)PyObject_CallFunction((PyObject)&pysqlite_CacheType, "Oi", self, cached_statements); + self->statement_cache = (pysqlite_Cache)PyObject_CallFunction((PyObject)pysqlite_CacheType, "Oi", self, cached_statements); if (PyErr_Occurred()) { return -1; } diff --git a/Modules/_sqlite/module.c b/Modules/_sqlite/module.c index 82f58eb248026..625d065a317ba 100644 --- a/Modules/_sqlite/module.c +++ b/Modules/_sqlite/module.c @@ -355,7 +355,7 @@ PyMODINIT_FUNC PyInit__sqlite3(void) (pysqlite_row_setup_types() < 0) || (pysqlite_cursor_setup_types() < 0) || (pysqlite_connection_setup_types() < 0) || - (pysqlite_cache_setup_types() < 0) || + (pysqlite_cache_setup_types(module) < 0) || (pysqlite_statement_setup_types() < 0) || (pysqlite_prepare_protocol_setup_types() < 0) ) { From webhook-mailer at python.org Sun Sep 27 15:07:08 2020 From: webhook-mailer at python.org (Andre Delfino) Date: Sun, 27 Sep 2020 19:07:08 -0000 Subject: [Python-checkins] [doc] Leverage the fact that the actual types can now be indexed for typing (GH-22340) Message-ID: https://github.com/python/cpython/commit/d9ab95ff1fe81efdf70e545d536d9f6927d1ba81 commit: d9ab95ff1fe81efdf70e545d536d9f6927d1ba81 branch: master author: Andre Delfino committer: GitHub date: 2020-09-27T12:07:04-07:00 summary: [doc] Leverage the fact that the actual types can now be indexed for typing (GH-22340) This shows users that they can use the actual types. Using deprecated types is confusing. This also prefers colections.abc.Sized instead of the alias typing.Sized. I guess the aliases were created to make it convenient to import all collections related types from the same place. This should be backported to 3.9. Automerge-Triggered-By: @gvanrossum files: M Doc/glossary.rst M Doc/library/typing.rst diff --git a/Doc/glossary.rst b/Doc/glossary.rst index 7be755e411310..9fdbdb1a83f28 100644 --- a/Doc/glossary.rst +++ b/Doc/glossary.rst @@ -1084,19 +1084,15 @@ Glossary Type aliases are useful for simplifying :term:`type hints `. For example:: - from typing import List, Tuple - def remove_gray_shades( - colors: List[Tuple[int, int, int]]) -> List[Tuple[int, int, int]]: + colors: list[tuple[int, int, int]]) -> list[tuple[int, int, int]]: pass could be made more readable like this:: - from typing import List, Tuple - - Color = Tuple[int, int, int] + Color = tuple[int, int, int] - def remove_gray_shades(colors: List[Color]) -> List[Color]: + def remove_gray_shades(colors: list[Color]) -> list[Color]: pass See :mod:`typing` and :pep:`484`, which describe this functionality. diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst index d31c65d38e1ab..3b824d0a4a8da 100644 --- a/Doc/library/typing.rst +++ b/Doc/library/typing.rst @@ -38,10 +38,9 @@ Type aliases ============ A type alias is defined by assigning the type to the alias. In this example, -``Vector`` and ``List[float]`` will be treated as interchangeable synonyms:: +``Vector`` and ``list[float]`` will be treated as interchangeable synonyms:: - from typing import List - Vector = List[float] + Vector = list[float] def scale(scalar: float, vector: Vector) -> Vector: return [scalar * num for num in vector] @@ -51,11 +50,11 @@ A type alias is defined by assigning the type to the alias. In this example, Type aliases are useful for simplifying complex type signatures. For example:: - from typing import Dict, Tuple, Sequence + from collections.abc import Sequence - ConnectionOptions = Dict[str, str] - Address = Tuple[str, int] - Server = Tuple[Address, ConnectionOptions] + ConnectionOptions = dict[str, str] + Address = tuple[str, int] + Server = tuple[Address, ConnectionOptions] def broadcast_message(message: str, servers: Sequence[Server]) -> None: ... @@ -64,7 +63,7 @@ Type aliases are useful for simplifying complex type signatures. For example:: # being exactly equivalent to this one. def broadcast_message( message: str, - servers: Sequence[Tuple[Tuple[str, int], Dict[str, str]]]) -> None: + servers: Sequence[tuple[tuple[str, int], dict[str, str]]]) -> None: ... Note that ``None`` as a type hint is a special case and is replaced by @@ -157,7 +156,7 @@ type hinted using ``Callable[[Arg1Type, Arg2Type], ReturnType]``. For example:: - from typing import Callable + from collections.abc import Callable def feeder(get_next_item: Callable[[], str]) -> None: # Body @@ -181,7 +180,7 @@ subscription to denote expected types for container elements. :: - from typing import Mapping, Sequence + from collections.abc import Mapping, Sequence def notify_by_email(employees: Sequence[Employee], overrides: Mapping[str, str]) -> None: ... @@ -191,7 +190,8 @@ called :class:`TypeVar`. :: - from typing import Sequence, TypeVar + from collections.abc import Sequence + from typing import TypeVar T = TypeVar('T') # Declare type variable @@ -235,7 +235,7 @@ class body. The :class:`Generic` base class defines :meth:`__class_getitem__` so that ``LoggedVar[t]`` is valid as a type:: - from typing import Iterable + from collections.abc import Iterable def zero_all_vars(vars: Iterable[LoggedVar[int]]) -> None: for var in vars: @@ -266,7 +266,8 @@ This is thus invalid:: You can use multiple inheritance with :class:`Generic`:: - from typing import TypeVar, Generic, Sized + from collections.abc import Sized + from typing import TypeVar, Generic T = TypeVar('T') @@ -275,7 +276,8 @@ You can use multiple inheritance with :class:`Generic`:: When inheriting from generic classes, some type variables could be fixed:: - from typing import TypeVar, Mapping + from collections.abc import Mapping + from typing import TypeVar T = TypeVar('T') @@ -288,13 +290,14 @@ Using a generic class without specifying type parameters assumes :data:`Any` for each position. In the following example, ``MyIterable`` is not generic but implicitly inherits from ``Iterable[Any]``:: - from typing import Iterable + from collections.abc import Iterable class MyIterable(Iterable): # Same as Iterable[Any] User defined generic type aliases are also supported. Examples:: - from typing import TypeVar, Iterable, Tuple, Union + from collections.abc import Iterable + from typing import TypeVar, Union S = TypeVar('S') Response = Union[Iterable[S], int] @@ -303,9 +306,9 @@ User defined generic type aliases are also supported. Examples:: ... T = TypeVar('T', int, float, complex) - Vec = Iterable[Tuple[T, T]] + Vec = Iterable[tuple[T, T]] - def inproduct(v: Vec[T]) -> T: # Same as Iterable[Tuple[T, T]] + def inproduct(v: Vec[T]) -> T: # Same as Iterable[tuple[T, T]] return sum(xy for x, y in v) .. versionchanged:: 3.7 @@ -408,7 +411,7 @@ to be explicitly marked to support them, which is unpythonic and unlike what one would normally do in idiomatic dynamically typed Python code. For example, this conforms to the :pep:`484`:: - from typing import Sized, Iterable, Iterator + from collections.abc import Sized, Iterable, Iterator class Bucket(Sized, Iterable[int]): ... @@ -421,7 +424,7 @@ allowing ``Bucket`` to be implicitly considered a subtype of both ``Sized`` and ``Iterable[int]`` by static type checkers. This is known as structural subtyping* (or static duck-typing):: - from typing import Iterator, Iterable + from collections.abc import Iterator, Iterable class Bucket: # Note: no base classes ... @@ -1371,10 +1374,10 @@ Asynchronous programming The variance and order of type variables correspond to those of :class:`Generator`, for example:: - from typing import List, Coroutine - c = None # type: Coroutine[List[str], str, int] + from collections.abc import Coroutine + c = None # type: Coroutine[list[str], str, int] ... - x = c.send('hi') # type: List[str] + x = c.send('hi') # type: list[str] async def bar() -> None: x = await c # type: int From webhook-mailer at python.org Sun Sep 27 15:42:33 2020 From: webhook-mailer at python.org (Miss Islington (bot)) Date: Sun, 27 Sep 2020 19:42:33 -0000 Subject: [Python-checkins] [doc] Leverage the fact that the actual types can now be indexed for typing (GH-22340) Message-ID: https://github.com/python/cpython/commit/bdf46bc7e12c08aaab676a2c947f03daffe035a7 commit: bdf46bc7e12c08aaab676a2c947f03daffe035a7 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com> committer: GitHub date: 2020-09-27T12:42:29-07:00 summary: [doc] Leverage the fact that the actual types can now be indexed for typing (GH-22340) This shows users that they can use the actual types. Using deprecated types is confusing. This also prefers colections.abc.Sized instead of the alias typing.Sized. I guess the aliases were created to make it convenient to import all collections related types from the same place. This should be backported to 3.9. Automerge-Triggered-By: @gvanrossum (cherry picked from commit d9ab95ff1fe81efdf70e545d536d9f6927d1ba81) Co-authored-by: Andre Delfino files: M Doc/glossary.rst M Doc/library/typing.rst diff --git a/Doc/glossary.rst b/Doc/glossary.rst index 7be755e411310..9fdbdb1a83f28 100644 --- a/Doc/glossary.rst +++ b/Doc/glossary.rst @@ -1084,19 +1084,15 @@ Glossary Type aliases are useful for simplifying :term:`type hints `. For example:: - from typing import List, Tuple - def remove_gray_shades( - colors: List[Tuple[int, int, int]]) -> List[Tuple[int, int, int]]: + colors: list[tuple[int, int, int]]) -> list[tuple[int, int, int]]: pass could be made more readable like this:: - from typing import List, Tuple - - Color = Tuple[int, int, int] + Color = tuple[int, int, int] - def remove_gray_shades(colors: List[Color]) -> List[Color]: + def remove_gray_shades(colors: list[Color]) -> list[Color]: pass See :mod:`typing` and :pep:`484`, which describe this functionality. diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst index 6d6b76c1d0895..78d90d19f74e0 100644 --- a/Doc/library/typing.rst +++ b/Doc/library/typing.rst @@ -38,10 +38,9 @@ Type aliases ============ A type alias is defined by assigning the type to the alias. In this example, -``Vector`` and ``List[float]`` will be treated as interchangeable synonyms:: +``Vector`` and ``list[float]`` will be treated as interchangeable synonyms:: - from typing import List - Vector = List[float] + Vector = list[float] def scale(scalar: float, vector: Vector) -> Vector: return [scalar * num for num in vector] @@ -51,11 +50,11 @@ A type alias is defined by assigning the type to the alias. In this example, Type aliases are useful for simplifying complex type signatures. For example:: - from typing import Dict, Tuple, Sequence + from collections.abc import Sequence - ConnectionOptions = Dict[str, str] - Address = Tuple[str, int] - Server = Tuple[Address, ConnectionOptions] + ConnectionOptions = dict[str, str] + Address = tuple[str, int] + Server = tuple[Address, ConnectionOptions] def broadcast_message(message: str, servers: Sequence[Server]) -> None: ... @@ -64,7 +63,7 @@ Type aliases are useful for simplifying complex type signatures. For example:: # being exactly equivalent to this one. def broadcast_message( message: str, - servers: Sequence[Tuple[Tuple[str, int], Dict[str, str]]]) -> None: + servers: Sequence[tuple[tuple[str, int], dict[str, str]]]) -> None: ... Note that ``None`` as a type hint is a special case and is replaced by @@ -157,7 +156,7 @@ type hinted using ``Callable[[Arg1Type, Arg2Type], ReturnType]``. For example:: - from typing import Callable + from collections.abc import Callable def feeder(get_next_item: Callable[[], str]) -> None: # Body @@ -181,7 +180,7 @@ subscription to denote expected types for container elements. :: - from typing import Mapping, Sequence + from collections.abc import Mapping, Sequence def notify_by_email(employees: Sequence[Employee], overrides: Mapping[str, str]) -> None: ... @@ -191,7 +190,8 @@ called :class:`TypeVar`. :: - from typing import Sequence, TypeVar + from collections.abc import Sequence + from typing import TypeVar T = TypeVar('T') # Declare type variable @@ -235,7 +235,7 @@ class body. The :class:`Generic` base class defines :meth:`__class_getitem__` so that ``LoggedVar[t]`` is valid as a type:: - from typing import Iterable + from collections.abc import Iterable def zero_all_vars(vars: Iterable[LoggedVar[int]]) -> None: for var in vars: @@ -266,7 +266,8 @@ This is thus invalid:: You can use multiple inheritance with :class:`Generic`:: - from typing import TypeVar, Generic, Sized + from collections.abc import Sized + from typing import TypeVar, Generic T = TypeVar('T') @@ -275,7 +276,8 @@ You can use multiple inheritance with :class:`Generic`:: When inheriting from generic classes, some type variables could be fixed:: - from typing import TypeVar, Mapping + from collections.abc import Mapping + from typing import TypeVar T = TypeVar('T') @@ -288,13 +290,14 @@ Using a generic class without specifying type parameters assumes :data:`Any` for each position. In the following example, ``MyIterable`` is not generic but implicitly inherits from ``Iterable[Any]``:: - from typing import Iterable + from collections.abc import Iterable class MyIterable(Iterable): # Same as Iterable[Any] User defined generic type aliases are also supported. Examples:: - from typing import TypeVar, Iterable, Tuple, Union + from collections.abc import Iterable + from typing import TypeVar, Union S = TypeVar('S') Response = Union[Iterable[S], int] @@ -303,9 +306,9 @@ User defined generic type aliases are also supported. Examples:: ... T = TypeVar('T', int, float, complex) - Vec = Iterable[Tuple[T, T]] + Vec = Iterable[tuple[T, T]] - def inproduct(v: Vec[T]) -> T: # Same as Iterable[Tuple[T, T]] + def inproduct(v: Vec[T]) -> T: # Same as Iterable[tuple[T, T]] return sum(xy for x, y in v) .. versionchanged:: 3.7 @@ -408,7 +411,7 @@ to be explicitly marked to support them, which is unpythonic and unlike what one would normally do in idiomatic dynamically typed Python code. For example, this conforms to the :pep:`484`:: - from typing import Sized, Iterable, Iterator + from collections.abc import Sized, Iterable, Iterator class Bucket(Sized, Iterable[int]): ... @@ -421,7 +424,7 @@ allowing ``Bucket`` to be implicitly considered a subtype of both ``Sized`` and ``Iterable[int]`` by static type checkers. This is known as structural subtyping* (or static duck-typing):: - from typing import Iterator, Iterable + from collections.abc import Iterator, Iterable class Bucket: # Note: no base classes ... @@ -1371,10 +1374,10 @@ Asynchronous programming The variance and order of type variables correspond to those of :class:`Generator`, for example:: - from typing import List, Coroutine - c = None # type: Coroutine[List[str], str, int] + from collections.abc import Coroutine + c = None # type: Coroutine[list[str], str, int] ... - x = c.send('hi') # type: List[str] + x = c.send('hi') # type: list[str] async def bar() -> None: x = await c # type: int From webhook-mailer at python.org Mon Sep 28 12:16:26 2020 From: webhook-mailer at python.org (Dong-hee Na) Date: Mon, 28 Sep 2020 16:16:26 -0000 Subject: [Python-checkins] bpo-41870: Use PEP 590 vectorcall to speed up bool() (GH-22427) Message-ID: https://github.com/python/cpython/commit/a195bceff7b552c5f86dec7894ff24dcc87235da commit: a195bceff7b552c5f86dec7894ff24dcc87235da branch: master author: Dong-hee Na committer: GitHub date: 2020-09-29T01:16:21+09:00 summary: bpo-41870: Use PEP 590 vectorcall to speed up bool() (GH-22427) * bpo-41870: Use PEP 590 vectorcall to speed up bool() * bpo-41870: Add NEWS.d files: A Misc/NEWS.d/next/Core and Builtins/2020-09-27-22-23-14.bpo-41870.2v6_v4.rst M Objects/boolobject.c diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-09-27-22-23-14.bpo-41870.2v6_v4.rst b/Misc/NEWS.d/next/Core and Builtins/2020-09-27-22-23-14.bpo-41870.2v6_v4.rst new file mode 100644 index 0000000000000..13a6bb04a28fd --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2020-09-27-22-23-14.bpo-41870.2v6_v4.rst @@ -0,0 +1,2 @@ +Speed up calls to ``bool()`` by using the :pep:`590` ``vectorcall`` calling +convention. Patch by Dong-hee Na. diff --git a/Objects/boolobject.c b/Objects/boolobject.c index 720835b98aa65..ab7669cb240de 100644 --- a/Objects/boolobject.c +++ b/Objects/boolobject.c @@ -55,6 +55,30 @@ bool_new(PyTypeObject type, PyObject args, PyObject kwds) return PyBool_FromLong(ok); } +static PyObject +bool_vectorcall(PyObject type, PyObject constargs, + size_t nargsf, PyObject kwnames) +{ + long ok = 0; + if (!_PyArg_NoKwnames("bool", kwnames)) { + return NULL; + } + + Py_ssize_t nargs = PyVectorcall_NARGS(nargsf); + if (!_PyArg_CheckPositional("bool", nargs, 0, 1)) { + return NULL; + } + + assert(PyType_Check(type)); + if (nargs) { + ok = PyObject_IsTrue(args[0]); + } + if (ok < 0) { + return NULL; + } + return PyBool_FromLong(ok); +} + /* Arithmetic operations redefined to return bool if both args are bool. / static PyObject @@ -170,6 +194,7 @@ PyTypeObject PyBool_Type = { 0, /* tp_init / 0, / tp_alloc / bool_new, / tp_new / + .tp_vectorcall = bool_vectorcall, }; / The objects representing bool values False and True / From webhook-mailer at python.org Mon Sep 28 14:53:42 2020 From: webhook-mailer at python.org (Jan Mazur) Date: Mon, 28 Sep 2020 18:53:42 -0000 Subject: [Python-checkins] bpo-40105: ZipFile truncate in append mode with shorter comment (GH-19337) Message-ID: https://github.com/python/cpython/commit/ff9147d93b868f0e13b9fe14e2a76c2879f6787b commit: ff9147d93b868f0e13b9fe14e2a76c2879f6787b branch: master author: Jan Mazur <16736821+mzr at users.noreply.github.com> committer: GitHub date: 2020-09-28T21:53:33+03:00 summary: bpo-40105: ZipFile truncate in append mode with shorter comment (GH-19337) files: A Misc/NEWS.d/next/Library/2020-04-03-16-13-59.bpo-40105.hfM2c0.rst M Lib/test/test_zipfile.py M Lib/zipfile.py diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py index 2851051425bf1..687e43df780d6 100644 --- a/Lib/test/test_zipfile.py +++ b/Lib/test/test_zipfile.py @@ -1856,11 +1856,14 @@ def test_comments(self): self.assertEqual(zipf.comment, b"an updated comment") # check that comments are correctly shortened in append mode + # and the file is indeed truncated with zipfile.ZipFile(TESTFN,mode="w") as zipf: zipf.comment = b"original comment that's longer" zipf.writestr("foo.txt", "O, for a Muse of Fire!") + original_zip_size = os.path.getsize(TESTFN) with zipfile.ZipFile(TESTFN,mode="a") as zipf: zipf.comment = b"shorter comment" + self.assertTrue(original_zip_size > os.path.getsize(TESTFN)) with zipfile.ZipFile(TESTFN,mode="r") as zipf: self.assertEqual(zipf.comment, b"shorter comment") diff --git a/Lib/zipfile.py b/Lib/zipfile.py index 915698f9e0588..816f8582bbf6d 100644 --- a/Lib/zipfile.py +++ b/Lib/zipfile.py @@ -1918,6 +1918,8 @@ def _write_end_record(self): centDirSize, centDirOffset, len(self._comment)) self.fp.write(endrec) self.fp.write(self._comment) + if self.mode == "a": + self.fp.truncate() self.fp.flush() def _fpclose(self, fp): diff --git a/Misc/NEWS.d/next/Library/2020-04-03-16-13-59.bpo-40105.hfM2c0.rst b/Misc/NEWS.d/next/Library/2020-04-03-16-13-59.bpo-40105.hfM2c0.rst new file mode 100644 index 0000000000000..f71a7a1e697a4 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-04-03-16-13-59.bpo-40105.hfM2c0.rst @@ -0,0 +1,2 @@ +ZipFile truncates files to avoid corruption when a shorter comment is provided +in append ("a") mode. Patch by Jan Mazur. From webhook-mailer at python.org Mon Sep 28 15:18:47 2020 From: webhook-mailer at python.org (Miss Islington (bot)) Date: Mon, 28 Sep 2020 19:18:47 -0000 Subject: [Python-checkins] bpo-40105: ZipFile truncate in append mode with shorter comment (GH-19337) Message-ID: https://github.com/python/cpython/commit/e4008404fbc0002c49becc565d42e93eca11dd75 commit: e4008404fbc0002c49becc565d42e93eca11dd75 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com> committer: GitHub date: 2020-09-28T12:18:39-07:00 summary: bpo-40105: ZipFile truncate in append mode with shorter comment (GH-19337) (cherry picked from commit ff9147d93b868f0e13b9fe14e2a76c2879f6787b) Co-authored-by: Jan Mazur <16736821+mzr at users.noreply.github.com> files: A Misc/NEWS.d/next/Library/2020-04-03-16-13-59.bpo-40105.hfM2c0.rst M Lib/test/test_zipfile.py M Lib/zipfile.py diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py index e2e37a1770418..31153445697fd 100644 --- a/Lib/test/test_zipfile.py +++ b/Lib/test/test_zipfile.py @@ -1844,11 +1844,14 @@ def test_comments(self): self.assertEqual(zipf.comment, b"an updated comment") # check that comments are correctly shortened in append mode + # and the file is indeed truncated with zipfile.ZipFile(TESTFN,mode="w") as zipf: zipf.comment = b"original comment that's longer" zipf.writestr("foo.txt", "O, for a Muse of Fire!") + original_zip_size = os.path.getsize(TESTFN) with zipfile.ZipFile(TESTFN,mode="a") as zipf: zipf.comment = b"shorter comment" + self.assertTrue(original_zip_size > os.path.getsize(TESTFN)) with zipfile.ZipFile(TESTFN,mode="r") as zipf: self.assertEqual(zipf.comment, b"shorter comment") diff --git a/Lib/zipfile.py b/Lib/zipfile.py index 73e89666309ff..e95e2b2d452df 100644 --- a/Lib/zipfile.py +++ b/Lib/zipfile.py @@ -1942,6 +1942,8 @@ def _write_end_record(self): centDirSize, centDirOffset, len(self._comment)) self.fp.write(endrec) self.fp.write(self._comment) + if self.mode == "a": + self.fp.truncate() self.fp.flush() def _fpclose(self, fp): diff --git a/Misc/NEWS.d/next/Library/2020-04-03-16-13-59.bpo-40105.hfM2c0.rst b/Misc/NEWS.d/next/Library/2020-04-03-16-13-59.bpo-40105.hfM2c0.rst new file mode 100644 index 0000000000000..f71a7a1e697a4 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-04-03-16-13-59.bpo-40105.hfM2c0.rst @@ -0,0 +1,2 @@ +ZipFile truncates files to avoid corruption when a shorter comment is provided +in append ("a") mode. Patch by Jan Mazur. From webhook-mailer at python.org Mon Sep 28 16:18:51 2020 From: webhook-mailer at python.org (Miss Islington (bot)) Date: Mon, 28 Sep 2020 20:18:51 -0000 Subject: [Python-checkins] bpo-40105: ZipFile truncate in append mode with shorter comment (GH-19337) Message-ID: https://github.com/python/cpython/commit/048f54dc75d51e8a1c5822ab7b2828295192aaa5 commit: 048f54dc75d51e8a1c5822ab7b2828295192aaa5 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com> committer: GitHub date: 2020-09-28T13:18:47-07:00 summary: bpo-40105: ZipFile truncate in append mode with shorter comment (GH-19337) (cherry picked from commit ff9147d93b868f0e13b9fe14e2a76c2879f6787b) Co-authored-by: Jan Mazur <16736821+mzr at users.noreply.github.com> files: A Misc/NEWS.d/next/Library/2020-04-03-16-13-59.bpo-40105.hfM2c0.rst M Lib/test/test_zipfile.py M Lib/zipfile.py diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py index b7bc218d17a3d..999197a0e32dc 100644 --- a/Lib/test/test_zipfile.py +++ b/Lib/test/test_zipfile.py @@ -1855,11 +1855,14 @@ def test_comments(self): self.assertEqual(zipf.comment, b"an updated comment") # check that comments are correctly shortened in append mode + # and the file is indeed truncated with zipfile.ZipFile(TESTFN,mode="w") as zipf: zipf.comment = b"original comment that's longer" zipf.writestr("foo.txt", "O, for a Muse of Fire!") + original_zip_size = os.path.getsize(TESTFN) with zipfile.ZipFile(TESTFN,mode="a") as zipf: zipf.comment = b"shorter comment" + self.assertTrue(original_zip_size > os.path.getsize(TESTFN)) with zipfile.ZipFile(TESTFN,mode="r") as zipf: self.assertEqual(zipf.comment, b"shorter comment") diff --git a/Lib/zipfile.py b/Lib/zipfile.py index 915698f9e0588..816f8582bbf6d 100644 --- a/Lib/zipfile.py +++ b/Lib/zipfile.py @@ -1918,6 +1918,8 @@ def _write_end_record(self): centDirSize, centDirOffset, len(self._comment)) self.fp.write(endrec) self.fp.write(self._comment) + if self.mode == "a": + self.fp.truncate() self.fp.flush() def _fpclose(self, fp): diff --git a/Misc/NEWS.d/next/Library/2020-04-03-16-13-59.bpo-40105.hfM2c0.rst b/Misc/NEWS.d/next/Library/2020-04-03-16-13-59.bpo-40105.hfM2c0.rst new file mode 100644 index 0000000000000..f71a7a1e697a4 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-04-03-16-13-59.bpo-40105.hfM2c0.rst @@ -0,0 +1,2 @@ +ZipFile truncates files to avoid corruption when a shorter comment is provided +in append ("a") mode. Patch by Jan Mazur. From webhook-mailer at python.org Mon Sep 28 16:41:33 2020 From: webhook-mailer at python.org (Dong-hee Na) Date: Mon, 28 Sep 2020 20:41:33 -0000 Subject: [Python-checkins] bpo-41875: Use __builtin_unreachable when possible (GH-22433) Message-ID: https://github.com/python/cpython/commit/24ba3b0df5e5f2f237d7b23b4017ba12f16320ae commit: 24ba3b0df5e5f2f237d7b23b4017ba12f16320ae branch: master author: Dong-hee Na committer: GitHub date: 2020-09-29T05:41:23+09:00 summary: bpo-41875: Use __builtin_unreachable when possible (GH-22433) files: A Misc/NEWS.d/next/Build/2020-09-28-21-56-51.bpo-38249.uzMCaZ.rst M Include/pymacro.h diff --git a/Include/pymacro.h b/Include/pymacro.h index 856cae774d61c..202b936d964f0 100644 --- a/Include/pymacro.h +++ b/Include/pymacro.h @@ -118,7 +118,9 @@ "We've reached an unreachable state. Anything is possible.\n" \ "The limits were in our heads all along. Follow your dreams.\n" \ "https://xkcd.com/2200") -#elif defined(GNUC) || defined(clang) || defined(__INTEL_COMPILER) +#elif defined(GNUC) && (GNUC > 4 || (GNUC == 4 && __GNUC_MINOR__ >= 5)) +# define Py_UNREACHABLE() __builtin_unreachable() +#elif defined(clang) || defined(__INTEL_COMPILER) # define Py_UNREACHABLE() __builtin_unreachable() #elif defined(_MSC_VER) # define Py_UNREACHABLE() __assume(0) diff --git a/Misc/NEWS.d/next/Build/2020-09-28-21-56-51.bpo-38249.uzMCaZ.rst b/Misc/NEWS.d/next/Build/2020-09-28-21-56-51.bpo-38249.uzMCaZ.rst new file mode 100644 index 0000000000000..3e409ec2e7c20 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2020-09-28-21-56-51.bpo-38249.uzMCaZ.rst @@ -0,0 +1,2 @@ +Update :c:macro:`Py_UNREACHABLE` to use __builtin_unreachable() if only the +compiler is able to use it. Patch by Dong-hee Na. From webhook-mailer at python.org Mon Sep 28 17:41:19 2020 From: webhook-mailer at python.org (Hai Shi) Date: Mon, 28 Sep 2020 21:41:19 -0000 Subject: [Python-checkins] bpo-41842: Add codecs.unregister() function (GH-22360) Message-ID: https://github.com/python/cpython/commit/d332e7b8164c3c9c885b9e631f33d9517b628b75 commit: d332e7b8164c3c9c885b9e631f33d9517b628b75 branch: master author: Hai Shi committer: GitHub date: 2020-09-28T23:41:11+02:00 summary: bpo-41842: Add codecs.unregister() function (GH-22360) Add codecs.unregister() and PyCodec_Unregister() functions to unregister a codec search function. files: A Misc/NEWS.d/next/C API/2020-09-27-20-43-16.bpo-41842.bCakAj.rst A Misc/NEWS.d/next/Library/2020-09-23-22-52-24.bpo-41842.lIuhC9.rst M Doc/c-api/codec.rst M Doc/library/codecs.rst M Doc/whatsnew/3.10.rst M Include/codecs.h M Lib/test/test_codecs.py M Misc/ACKS M Modules/_codecsmodule.c M Modules/clinic/_codecsmodule.c.h M Python/codecs.c diff --git a/Doc/c-api/codec.rst b/Doc/c-api/codec.rst index 172dcb326a4bc..235c77c945cc5 100644 --- a/Doc/c-api/codec.rst +++ b/Doc/c-api/codec.rst @@ -10,6 +10,14 @@ Codec registry and support functions As side effect, this tries to load the :mod:`encodings` package, if not yet done, to make sure that it is always first in the list of search functions. +.. c:function:: int PyCodec_Unregister(PyObject search_function) + + Unregister a codec search function and clear the registry's cache. + If the search function is not registered, do nothing. + Return 0 on success. Raise an exception and return -1 on error. + + .. versionadded:: 3.10 + .. c:function:: int PyCodec_KnownEncoding(const char encoding) Return ``1`` or ``0`` depending on whether there is a registered codec for diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst index f071057293eec..a026513520590 100644 --- a/Doc/library/codecs.rst +++ b/Doc/library/codecs.rst @@ -163,11 +163,14 @@ function: :class:`CodecInfo` object. In case a search function cannot find a given encoding, it should return ``None``. - .. note:: - Search function registration is not currently reversible, - which may cause problems in some cases, such as unit testing or - module reloading. +.. function:: unregister(search_function) + + Unregister a codec search function and clear the registry's cache. + If the search function is not registered, do nothing. + + .. versionadded:: 3.10 + While the builtin :func:`open` and the associated :mod:`io` module are the recommended approach for working with encoded text files, this module diff --git a/Doc/whatsnew/3.10.rst b/Doc/whatsnew/3.10.rst index 1228f2695496c..f74dd1aa247a3 100644 --- a/Doc/whatsnew/3.10.rst +++ b/Doc/whatsnew/3.10.rst @@ -109,6 +109,12 @@ base64 Add :func:`base64.b32hexencode` and :func:`base64.b32hexdecode` to support the Base32 Encoding with Extended Hex Alphabet. +codecs +------ + +Add a :func:`codecs.unregister` function to unregister a codec search function. +(Contributed by Hai Shi in :issue:`41842`.) + curses ------ @@ -237,6 +243,10 @@ New Features :class:`datetime.time` objects. (Contributed by Zackery Spytz in :issue:`30155`.) + Add a :c:func:`PyCodec_Unregister` function to unregister a codec + search function. + (Contributed by Hai Shi in :issue:`41842`.) + Porting to Python 3.10 ---------------------- diff --git a/Include/codecs.h b/Include/codecs.h index 3ad0f2b5aae79..37ecfb4ab757b 100644 --- a/Include/codecs.h +++ b/Include/codecs.h @@ -27,6 +27,14 @@ PyAPI_FUNC(int) PyCodec_Register( PyObject search_function ); +/ Unregister a codec search function and clear the registry's cache. + If the search function is not registered, do nothing. + Return 0 on success. Raise an exception and return -1 on error. / + +PyAPI_FUNC(int) PyCodec_Unregister( + PyObject search_function + ); + /* Codec registry lookup API. Looks up the given encoding and returns a CodecInfo object with diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py index 3dd56820cd107..ed508f36ad423 100644 --- a/Lib/test/test_codecs.py +++ b/Lib/test/test_codecs.py @@ -1641,6 +1641,18 @@ def test_register(self): self.assertRaises(TypeError, codecs.register) self.assertRaises(TypeError, codecs.register, 42) + def test_unregister(self): + name = "nonexistent_codec_name" + search_function = mock.Mock() + codecs.register(search_function) + self.assertRaises(TypeError, codecs.lookup, name) + search_function.assert_called_with(name) + search_function.reset_mock() + + codecs.unregister(search_function) + self.assertRaises(LookupError, codecs.lookup, name) + search_function.assert_not_called() + def test_lookup(self): self.assertRaises(TypeError, codecs.lookup) self.assertRaises(LookupError, codecs.lookup, "spam") diff --git a/Misc/ACKS b/Misc/ACKS index 7b743464c1c1c..85001daf67d23 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1575,6 +1575,7 @@ Akash Shende Charlie Shepherd Bruce Sherwood Gregory Shevchenko +Hai Shi Alexander Shigin Pete Shinners Michael Shiplett diff --git a/Misc/NEWS.d/next/C API/2020-09-27-20-43-16.bpo-41842.bCakAj.rst b/Misc/NEWS.d/next/C API/2020-09-27-20-43-16.bpo-41842.bCakAj.rst new file mode 100644 index 0000000000000..116d08f490859 --- /dev/null +++ b/Misc/NEWS.d/next/C API/2020-09-27-20-43-16.bpo-41842.bCakAj.rst @@ -0,0 +1,2 @@ +Add :c:func:`PyCodec_Unregister` function to unregister a codec search +function. diff --git a/Misc/NEWS.d/next/Library/2020-09-23-22-52-24.bpo-41842.lIuhC9.rst b/Misc/NEWS.d/next/Library/2020-09-23-22-52-24.bpo-41842.lIuhC9.rst new file mode 100644 index 0000000000000..306b02d76fffe --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-09-23-22-52-24.bpo-41842.lIuhC9.rst @@ -0,0 +1 @@ +Add :func:`codecs.unregister` function to unregister a codec search function. diff --git a/Modules/_codecsmodule.c b/Modules/_codecsmodule.c index 952072102d5d8..08a3d4ab024cc 100644 --- a/Modules/_codecsmodule.c +++ b/Modules/_codecsmodule.c @@ -68,6 +68,27 @@ _codecs_register(PyObject module, PyObject search_function) Py_RETURN_NONE; } +/[clinic input] +_codecs.unregister + search_function: object + / + +Unregister a codec search function and clear the registry's cache. + +If the search function is not registered, do nothing. +[clinic start generated code]/ + +static PyObject * +_codecs_unregister(PyObject module, PyObject search_function) +/[clinic end generated code: output=1f0edee9cf246399 input=dd7c004c652d345e]/ +{ + if (PyCodec_Unregister(search_function) < 0) { + return NULL; + } + + Py_RETURN_NONE; +} + /[clinic input] _codecs.lookup encoding: str @@ -992,6 +1013,7 @@ _codecs_lookup_error_impl(PyObject module, const char name) static PyMethodDef _codecs_functions[] = { _CODECS_REGISTER_METHODDEF + _CODECS_UNREGISTER_METHODDEF _CODECS_LOOKUP_METHODDEF _CODECS_ENCODE_METHODDEF _CODECS_DECODE_METHODDEF diff --git a/Modules/clinic/_codecsmodule.c.h b/Modules/clinic/_codecsmodule.c.h index 249065c9fd05a..e2ebb6861299e 100644 --- a/Modules/clinic/_codecsmodule.c.h +++ b/Modules/clinic/_codecsmodule.c.h @@ -15,6 +15,17 @@ PyDoc_STRVAR(_codecs_registerdoc, #define _CODECS_REGISTER_METHODDEF \ {"register", (PyCFunction)_codecs_register, METH_O, _codecs_registerdoc}, +PyDoc_STRVAR(_codecs_unregisterdoc, +"unregister($module, search_function, /)\n" +"--\n" +"\n" +"Unregister a codec search function and clear the registry\'s cache.\n" +"\n" +"If the search function is not registered, do nothing."); + +#define _CODECS_UNREGISTER_METHODDEF \ + {"unregister", (PyCFunction)_codecs_unregister, METH_O, _codecs_unregisterdoc}, + PyDoc_STRVAR(_codecs_lookupdoc, "lookup($module, encoding, /)\n" "--\n" @@ -2827,4 +2838,4 @@ _codecs_lookup_error(PyObject module, PyObject arg) #ifndef _CODECS_CODE_PAGE_ENCODE_METHODDEF #define _CODECS_CODE_PAGE_ENCODE_METHODDEF #endif / !defined(_CODECS_CODE_PAGE_ENCODE_METHODDEF) / -/[clinic end generated code: output=eeead01414be6e42 input=a9049054013a1b77]/ +/[clinic end generated code: output=9a97e2ddf3e69072 input=a9049054013a1b77]/ diff --git a/Python/codecs.c b/Python/codecs.c index 0f18c27e5fe46..a8233a73c4ed3 100644 --- a/Python/codecs.c +++ b/Python/codecs.c @@ -50,6 +50,31 @@ int PyCodec_Register(PyObject search_function) return -1; } +int +PyCodec_Unregister(PyObject search_function) +{ + PyInterpreterState interp = PyInterpreterState_Get(); + PyObject codec_search_path = interp->codec_search_path; + / Do nothing if codec_search_path is not created yet or was cleared. / + if (codec_search_path == NULL) { + return 0; + } + + assert(PyList_CheckExact(codec_search_path)); + Py_ssize_t n = PyList_GET_SIZE(codec_search_path); + for (Py_ssize_t i = 0; i < n; i++) { + PyObject item = PyList_GET_ITEM(codec_search_path, i); + if (item == search_function) { + if (interp->codec_search_cache != NULL) { + assert(PyDict_CheckExact(interp->codec_search_cache)); + PyDict_Clear(interp->codec_search_cache); + } + return PyList_SetSlice(codec_search_path, i, i+1, NULL); + } + } + return 0; +} + extern int _Py_normalize_encoding(const char , char , size_t); /* Convert a string to a normalized Python string(decoded from UTF-8): all characters are From webhook-mailer at python.org Mon Sep 28 18:05:11 2020 From: webhook-mailer at python.org (Erlend Egeberg Aasland) Date: Mon, 28 Sep 2020 22:05:11 -0000 Subject: [Python-checkins] bpo-41861: Convert _sqlite3 PrepareProtocolType to heap type (GH-22428) Message-ID: https://github.com/python/cpython/commit/cb6db8b6ae47dccc1aa97830d0f05d29f31e0cbc commit: cb6db8b6ae47dccc1aa97830d0f05d29f31e0cbc branch: master author: Erlend Egeberg Aasland committer: GitHub date: 2020-09-29T00:05:04+02:00 summary: bpo-41861: Convert _sqlite3 PrepareProtocolType to heap type (GH-22428) files: M Modules/_sqlite/microprotocols.c M Modules/_sqlite/module.c M Modules/_sqlite/prepare_protocol.c M Modules/_sqlite/prepare_protocol.h M Modules/_sqlite/statement.c diff --git a/Modules/_sqlite/microprotocols.c b/Modules/_sqlite/microprotocols.c index 3b2d7f42b8735..64095adb4db2b 100644 --- a/Modules/_sqlite/microprotocols.c +++ b/Modules/_sqlite/microprotocols.c @@ -56,7 +56,7 @@ pysqlite_microprotocols_add(PyTypeObject type, PyObject proto, PyObject cast) PyObject key; int rc; - if (proto == NULL) proto = (PyObject)&pysqlite_PrepareProtocolType; + if (proto == NULL) proto = (PyObject)pysqlite_PrepareProtocolType; key = Py_BuildValue("(OO)", (PyObject)type, proto); if (!key) { @@ -152,7 +152,7 @@ PyObject pysqlite_adapt(pysqlite_Cursor self, PyObject args) { PyObject obj, alt = NULL; - PyObject proto = (PyObject)&pysqlite_PrepareProtocolType; + PyObject proto = (PyObject)pysqlite_PrepareProtocolType; if (!PyArg_ParseTuple(args, "O|OO", &obj, &proto, &alt)) return NULL; return pysqlite_microprotocols_adapt(obj, proto, alt); diff --git a/Modules/_sqlite/module.c b/Modules/_sqlite/module.c index 625d065a317ba..d0a546c008de2 100644 --- a/Modules/_sqlite/module.c +++ b/Modules/_sqlite/module.c @@ -176,7 +176,7 @@ static PyObject* module_register_adapter(PyObject* self, PyObject* args) pysqlite_BaseTypeAdapted = 1; } - rc = pysqlite_microprotocols_add(type, (PyObject)&pysqlite_PrepareProtocolType, caster); + rc = pysqlite_microprotocols_add(type, (PyObject)pysqlite_PrepareProtocolType, caster); if (rc == -1) return NULL; @@ -357,7 +357,7 @@ PyMODINIT_FUNC PyInit__sqlite3(void) (pysqlite_connection_setup_types() < 0) || (pysqlite_cache_setup_types(module) < 0) || (pysqlite_statement_setup_types() < 0) || - (pysqlite_prepare_protocol_setup_types() < 0) + (pysqlite_prepare_protocol_setup_types(module) < 0) ) { Py_XDECREF(module); return NULL; @@ -365,7 +365,7 @@ PyMODINIT_FUNC PyInit__sqlite3(void) ADD_TYPE(module, pysqlite_ConnectionType); ADD_TYPE(module, pysqlite_CursorType); - ADD_TYPE(module, pysqlite_PrepareProtocolType); + ADD_TYPE(module, pysqlite_PrepareProtocolType); ADD_TYPE(module, pysqlite_RowType); if (!(dict = PyModule_GetDict(module))) { diff --git a/Modules/_sqlite/prepare_protocol.c b/Modules/_sqlite/prepare_protocol.c index 05a2ca5a652f5..7daf8a620096a 100644 --- a/Modules/_sqlite/prepare_protocol.c +++ b/Modules/_sqlite/prepare_protocol.c @@ -30,54 +30,33 @@ int pysqlite_prepare_protocol_init(pysqlite_PrepareProtocol self, PyObject* arg void pysqlite_prepare_protocol_dealloc(pysqlite_PrepareProtocol* self) { - Py_TYPE(self)->tp_free((PyObject)self); + PyTypeObject tp = Py_TYPE(self); + + tp->tp_free(self); + Py_DECREF(tp); } -PyTypeObject pysqlite_PrepareProtocolType= { - PyVarObject_HEAD_INIT(NULL, 0) - MODULE_NAME ".PrepareProtocol", /* tp_name / - sizeof(pysqlite_PrepareProtocol), / tp_basicsize / - 0, / tp_itemsize / - (destructor)pysqlite_prepare_protocol_dealloc, / tp_dealloc / - 0, / tp_vectorcall_offset / - 0, / tp_getattr / - 0, / tp_setattr / - 0, / tp_as_async / - 0, / tp_repr / - 0, / tp_as_number / - 0, / tp_as_sequence / - 0, / tp_as_mapping / - 0, / tp_hash / - 0, / tp_call / - 0, / tp_str / - 0, / tp_getattro / - 0, / tp_setattro / - 0, / tp_as_buffer / - Py_TPFLAGS_DEFAULT, / tp_flags / - 0, / tp_doc / - 0, / tp_traverse / - 0, / tp_clear / - 0, / tp_richcompare / - 0, / tp_weaklistoffset / - 0, / tp_iter / - 0, / tp_iternext / - 0, / tp_methods / - 0, / tp_members / - 0, / tp_getset / - 0, / tp_base / - 0, / tp_dict / - 0, / tp_descr_get / - 0, / tp_descr_set / - 0, / tp_dictoffset / - (initproc)pysqlite_prepare_protocol_init, / tp_init / - 0, / tp_alloc / - 0, / tp_new / - 0 / tp_free / +static PyType_Slot type_slots[] = { + {Py_tp_dealloc, pysqlite_prepare_protocol_dealloc}, + {Py_tp_new, PyType_GenericNew}, + {Py_tp_init, pysqlite_prepare_protocol_init}, + {0, NULL}, +}; + +static PyType_Spec type_spec = { + .name = MODULE_NAME ".PrepareProtocol", + .basicsize = sizeof(pysqlite_PrepareProtocol), + .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HEAPTYPE, + .slots = type_slots, }; -extern int pysqlite_prepare_protocol_setup_types(void) +PyTypeObject pysqlite_PrepareProtocolType = NULL; + +extern int pysqlite_prepare_protocol_setup_types(PyObject module) { - pysqlite_PrepareProtocolType.tp_new = PyType_GenericNew; - Py_SET_TYPE(&pysqlite_PrepareProtocolType, &PyType_Type); - return PyType_Ready(&pysqlite_PrepareProtocolType); + pysqlite_PrepareProtocolType = (PyTypeObject )PyType_FromModuleAndSpec(module, &type_spec, NULL); + if (pysqlite_PrepareProtocolType == NULL) { + return -1; + } + return 0; } diff --git a/Modules/_sqlite/prepare_protocol.h b/Modules/_sqlite/prepare_protocol.h index 3998a55e51caf..d0f717c754c1d 100644 --- a/Modules/_sqlite/prepare_protocol.h +++ b/Modules/_sqlite/prepare_protocol.h @@ -31,12 +31,12 @@ typedef struct PyObject_HEAD } pysqlite_PrepareProtocol; -extern PyTypeObject pysqlite_PrepareProtocolType; +extern PyTypeObject pysqlite_PrepareProtocolType; int pysqlite_prepare_protocol_init(pysqlite_PrepareProtocol self, PyObject* args, PyObject* kwargs); void pysqlite_prepare_protocol_dealloc(pysqlite_PrepareProtocol* self); -int pysqlite_prepare_protocol_setup_types(void); +int pysqlite_prepare_protocol_setup_types(PyObject module); #define UNKNOWN (-1) #endif diff --git a/Modules/_sqlite/statement.c b/Modules/_sqlite/statement.c index 02e47a02b718c..0458e1171ebdd 100644 --- a/Modules/_sqlite/statement.c +++ b/Modules/_sqlite/statement.c @@ -255,7 +255,7 @@ void pysqlite_statement_bind_parameters(pysqlite_Statement self, PyObject* para if (!_need_adapt(current_param)) { adapted = current_param; } else { - adapted = pysqlite_microprotocols_adapt(current_param, (PyObject)&pysqlite_PrepareProtocolType, current_param); + adapted = pysqlite_microprotocols_adapt(current_param, (PyObject)pysqlite_PrepareProtocolType, current_param); Py_DECREF(current_param); if (!adapted) { return; @@ -306,7 +306,7 @@ void pysqlite_statement_bind_parameters(pysqlite_Statement* self, PyObject* para if (!_need_adapt(current_param)) { adapted = current_param; } else { - adapted = pysqlite_microprotocols_adapt(current_param, (PyObject)&pysqlite_PrepareProtocolType, current_param); + adapted = pysqlite_microprotocols_adapt(current_param, (PyObject)pysqlite_PrepareProtocolType, current_param); Py_DECREF(current_param); if (!adapted) { return; From webhook-mailer at python.org Mon Sep 28 18:16:33 2020 From: webhook-mailer at python.org (Miss Islington (bot)) Date: Mon, 28 Sep 2020 22:16:33 -0000 Subject: [Python-checkins] bpo-41875: Use __builtin_unreachable when possible (GH-22433) Message-ID: https://github.com/python/cpython/commit/cca896e13b230a934fdb709b7f10c5451ffc25ba commit: cca896e13b230a934fdb709b7f10c5451ffc25ba branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com> committer: GitHub date: 2020-09-28T15:16:24-07:00 summary: bpo-41875: Use __builtin_unreachable when possible (GH-22433) (cherry picked from commit 24ba3b0df5e5f2f237d7b23b4017ba12f16320ae) Co-authored-by: Dong-hee Na files: A Misc/NEWS.d/next/Build/2020-09-28-21-56-51.bpo-38249.uzMCaZ.rst M Include/pymacro.h diff --git a/Include/pymacro.h b/Include/pymacro.h index 856cae774d61c..202b936d964f0 100644 --- a/Include/pymacro.h +++ b/Include/pymacro.h @@ -118,7 +118,9 @@ "We've reached an unreachable state. Anything is possible.\n" \ "The limits were in our heads all along. Follow your dreams.\n" \ "https://xkcd.com/2200") -#elif defined(GNUC) || defined(clang) || defined(__INTEL_COMPILER) +#elif defined(GNUC) && (GNUC > 4 || (GNUC == 4 && __GNUC_MINOR__ >= 5)) +# define Py_UNREACHABLE() __builtin_unreachable() +#elif defined(clang) || defined(__INTEL_COMPILER) # define Py_UNREACHABLE() __builtin_unreachable() #elif defined(_MSC_VER) # define Py_UNREACHABLE() __assume(0) diff --git a/Misc/NEWS.d/next/Build/2020-09-28-21-56-51.bpo-38249.uzMCaZ.rst b/Misc/NEWS.d/next/Build/2020-09-28-21-56-51.bpo-38249.uzMCaZ.rst new file mode 100644 index 0000000000000..3e409ec2e7c20 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2020-09-28-21-56-51.bpo-38249.uzMCaZ.rst @@ -0,0 +1,2 @@ +Update :c:macro:`Py_UNREACHABLE` to use __builtin_unreachable() if only the +compiler is able to use it. Patch by Dong-hee Na. From webhook-mailer at python.org Mon Sep 28 20:56:03 2020 From: webhook-mailer at python.org (Dennis Sweeney) Date: Tue, 29 Sep 2020 00:56:03 -0000 Subject: [Python-checkins] bpo-41873: Add vectorcall for float() (GH-22432) Message-ID: https://github.com/python/cpython/commit/e8acc355d430b45f1c3ff83312e72272262a854f commit: e8acc355d430b45f1c3ff83312e72272262a854f branch: master author: Dennis Sweeney <36520290+sweeneyde at users.noreply.github.com> committer: GitHub date: 2020-09-29T09:55:52+09:00 summary: bpo-41873: Add vectorcall for float() (GH-22432) files: A Misc/NEWS.d/next/Core and Builtins/2020-09-28-08-58-28.bpo-41873.VzEDhA.rst M Lib/test/test_float.py M Objects/floatobject.c diff --git a/Lib/test/test_float.py b/Lib/test/test_float.py index 9651281e24edb..99c81f0b72a5a 100644 --- a/Lib/test/test_float.py +++ b/Lib/test/test_float.py @@ -64,6 +64,9 @@ def test_float(self): # See bpo-34087 self.assertRaises(ValueError, float, '\u3053\u3093\u306b\u3061\u306f') + def test_noargs(self): + self.assertEqual(float(), 0.0) + def test_underscores(self): for lit in VALID_UNDERSCORE_LITERALS: if not any(ch in lit for ch in 'jJxXoObB'): diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-09-28-08-58-28.bpo-41873.VzEDhA.rst b/Misc/NEWS.d/next/Core and Builtins/2020-09-28-08-58-28.bpo-41873.VzEDhA.rst new file mode 100644 index 0000000000000..ee2636704c299 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2020-09-28-08-58-28.bpo-41873.VzEDhA.rst @@ -0,0 +1 @@ +Calls to ``float()`` are now faster due to the ``vectorcall`` calling convention. Patch by Dennis Sweeney. \ No newline at end of file diff --git a/Objects/floatobject.c b/Objects/floatobject.c index 0606f29ff5408..d0af0ea1a9825 100644 --- a/Objects/floatobject.c +++ b/Objects/floatobject.c @@ -1649,6 +1649,24 @@ float_subtype_new(PyTypeObject type, PyObject x) return newobj; } +static PyObject * +float_vectorcall(PyObject type, PyObject constargs, + size_t nargsf, PyObject kwnames) +{ + if (!_PyArg_NoKwnames("float", kwnames)) { + return NULL; + } + + Py_ssize_t nargs = PyVectorcall_NARGS(nargsf); + if (!_PyArg_CheckPositional("float", nargs, 0, 1)) { + return NULL; + } + + PyObject x = nargs >= 1 ? args[0] : _PyLong_Zero; + return float_new_impl((PyTypeObject )type, x); +} + + /[clinic input] float.getnewargs [clinic start generated code]/ @@ -1937,6 +1955,7 @@ PyTypeObject PyFloat_Type = { 0, /* tp_init / 0, / tp_alloc / float_new, / tp_new / + .tp_vectorcall = (vectorcallfunc)float_vectorcall, }; int From webhook-mailer at python.org Mon Sep 28 21:32:19 2020 From: webhook-mailer at python.org (Ram Rachum) Date: Tue, 29 Sep 2020 01:32:19 -0000 Subject: [Python-checkins] bpo-41773: Raise exception for non-finite weights in random.choices(). (GH-22441) Message-ID: https://github.com/python/cpython/commit/b0dfc7581697f20385813582de7e92ba6ba0105f commit: b0dfc7581697f20385813582de7e92ba6ba0105f branch: master author: Ram Rachum committer: GitHub date: 2020-09-28T18:32:10-07:00 summary: bpo-41773: Raise exception for non-finite weights in random.choices(). (GH-22441) files: A Misc/NEWS.d/next/Library/2020-09-28-23-22-25.bpo-41773.oKkus0.rst M Doc/library/random.rst M Lib/random.py M Lib/test/test_random.py diff --git a/Doc/library/random.rst b/Doc/library/random.rst index 0cdf0a6ac4a47..af5131df280c2 100644 --- a/Doc/library/random.rst +++ b/Doc/library/random.rst @@ -180,8 +180,8 @@ Functions for sequences The weights* or cum_weights can use any numeric type that interoperates with the :class:`float` values returned by :func:`random` (that includes - integers, floats, and fractions but excludes decimals). Behavior is - undefined if any weight is negative. A :exc:`ValueError` is raised if all + integers, floats, and fractions but excludes decimals). Weights are assumed + to be non-negative and finite. A :exc:`ValueError` is raised if all weights are zero. For a given seed, the :func:`choices` function with equal weighting diff --git a/Lib/random.py b/Lib/random.py index 3ea369b81b3e5..139e8a40bb272 100644 --- a/Lib/random.py +++ b/Lib/random.py @@ -48,7 +48,7 @@ from warnings import warn as _warn from math import log as _log, exp as _exp, pi as _pi, e as _e, ceil as _ceil from math import sqrt as _sqrt, acos as _acos, cos as _cos, sin as _sin -from math import tau as TWOPI, floor as _floor +from math import tau as TWOPI, floor as _floor, isfinite as _isfinite from os import urandom as _urandom from _collections_abc import Set as _Set, Sequence as _Sequence from itertools import accumulate as _accumulate, repeat as _repeat @@ -492,6 +492,8 @@ def choices(self, population, weights=None, , cum_weights=None, k=1): total = cum_weights[-1] + 0.0 # convert to float if total <= 0.0: raise ValueError('Total of weights must be greater than zero') + if not _isfinite(total): + raise ValueError('Total of weights must be finite') bisect = _bisect hi = n - 1 return [population[bisect(cum_weights, random() total, 0, hi)] diff --git a/Lib/test/test_random.py b/Lib/test/test_random.py index a80e71e67e4c6..0c1fdeec9915e 100644 --- a/Lib/test/test_random.py +++ b/Lib/test/test_random.py @@ -324,6 +324,22 @@ def test_choices_with_all_zero_weights(self): with self.assertRaises(ValueError): self.gen.choices('AB', [0.0, 0.0]) + def test_choices_negative_total(self): + with self.assertRaises(ValueError): + self.gen.choices('ABC', [3, -5, 1]) + + def test_choices_infinite_total(self): + with self.assertRaises(ValueError): + self.gen.choices('A', [float('inf')]) + with self.assertRaises(ValueError): + self.gen.choices('AB', [0.0, float('inf')]) + with self.assertRaises(ValueError): + self.gen.choices('AB', [-float('inf'), 123]) + with self.assertRaises(ValueError): + self.gen.choices('AB', [0.0, float('nan')]) + with self.assertRaises(ValueError): + self.gen.choices('AB', [float('-inf'), float('inf')]) + def test_gauss(self): # Ensure that the seed() method initializes all the hidden state. In # particular, through 2.2.1 it failed to reset a piece of state used diff --git a/Misc/NEWS.d/next/Library/2020-09-28-23-22-25.bpo-41773.oKkus0.rst b/Misc/NEWS.d/next/Library/2020-09-28-23-22-25.bpo-41773.oKkus0.rst new file mode 100644 index 0000000000000..cef7ff0188354 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-09-28-23-22-25.bpo-41773.oKkus0.rst @@ -0,0 +1,2 @@ +Note in documentation that :func:`random.choices` doesn't support non-finite +weights, raise :exc:`ValueError` when given non-finite weights. From webhook-mailer at python.org Tue Sep 29 01:02:55 2020 From: webhook-mailer at python.org (Terry Jan Reedy) Date: Tue, 29 Sep 2020 05:02:55 -0000 Subject: [Python-checkins] bpo-41774: Add programming FAQ entry (GH-22402) Message-ID: https://github.com/python/cpython/commit/5b0181d1f6474c2cb9b80bdaf3bc56a78bf5fbe7 commit: 5b0181d1f6474c2cb9b80bdaf3bc56a78bf5fbe7 branch: master author: Terry Jan Reedy committer: GitHub date: 2020-09-29T01:02:44-04:00 summary: bpo-41774: Add programming FAQ entry (GH-22402) In the "Sequences (Tuples/Lists)" section, add "How do you remove multiple items from a list". files: A Misc/NEWS.d/next/Documentation/2020-09-24-15-35-13.bpo-41774.5IqdGP.rst M Doc/faq/programming.rst diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst index 4f4ea8b18176c..76ae4d260fad4 100644 --- a/Doc/faq/programming.rst +++ b/Doc/faq/programming.rst @@ -1164,6 +1164,21 @@ This converts the list into a set, thereby removing duplicates, and then back into a list. +How do you remove multiple items from a list +-------------------------------------------- + +As with removing duplicates, explicitly iterating in reverse with a +delete condition is one possibility. However, it is easier and faster +to use slice replacement with an implicit or explicit forward iteration. +Here are three variations.:: + + mylist[:] = filter(keep_function, mylist) + mylist[:] = (x for x in mylist if keep_condition) + mylist[:] = [x for x in mylist if keep_condition] + +If space is not an issue, the list comprehension may be fastest. + + How do you make an array in Python? ----------------------------------- diff --git a/Misc/NEWS.d/next/Documentation/2020-09-24-15-35-13.bpo-41774.5IqdGP.rst b/Misc/NEWS.d/next/Documentation/2020-09-24-15-35-13.bpo-41774.5IqdGP.rst new file mode 100644 index 0000000000000..af8e02437cb2b --- /dev/null +++ b/Misc/NEWS.d/next/Documentation/2020-09-24-15-35-13.bpo-41774.5IqdGP.rst @@ -0,0 +1,2 @@ +In Programming FAQ "Sequences (Tuples/Lists)" section, add "How do you +remove multiple items from a list". From webhook-mailer at python.org Tue Sep 29 01:11:15 2020 From: webhook-mailer at python.org (Miss Islington (bot)) Date: Tue, 29 Sep 2020 05:11:15 -0000 Subject: [Python-checkins] bpo-41774: Add programming FAQ entry (GH-22402) Message-ID: https://github.com/python/cpython/commit/d50a0700265536a20bcce3fb108c954746d97625 commit: d50a0700265536a20bcce3fb108c954746d97625 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com> committer: GitHub date: 2020-09-28T22:11:06-07:00 summary: bpo-41774: Add programming FAQ entry (GH-22402) In the "Sequences (Tuples/Lists)" section, add "How do you remove multiple items from a list". (cherry picked from commit 5b0181d1f6474c2cb9b80bdaf3bc56a78bf5fbe7) Co-authored-by: Terry Jan Reedy files: A Misc/NEWS.d/next/Documentation/2020-09-24-15-35-13.bpo-41774.5IqdGP.rst M Doc/faq/programming.rst diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst index 70e9190e5a520..1af04483eb329 100644 --- a/Doc/faq/programming.rst +++ b/Doc/faq/programming.rst @@ -1163,6 +1163,21 @@ This converts the list into a set, thereby removing duplicates, and then back into a list. +How do you remove multiple items from a list +-------------------------------------------- + +As with removing duplicates, explicitly iterating in reverse with a +delete condition is one possibility. However, it is easier and faster +to use slice replacement with an implicit or explicit forward iteration. +Here are three variations.:: + + mylist[:] = filter(keep_function, mylist) + mylist[:] = (x for x in mylist if keep_condition) + mylist[:] = [x for x in mylist if keep_condition] + +If space is not an issue, the list comprehension may be fastest. + + How do you make an array in Python? ----------------------------------- diff --git a/Misc/NEWS.d/next/Documentation/2020-09-24-15-35-13.bpo-41774.5IqdGP.rst b/Misc/NEWS.d/next/Documentation/2020-09-24-15-35-13.bpo-41774.5IqdGP.rst new file mode 100644 index 0000000000000..af8e02437cb2b --- /dev/null +++ b/Misc/NEWS.d/next/Documentation/2020-09-24-15-35-13.bpo-41774.5IqdGP.rst @@ -0,0 +1,2 @@ +In Programming FAQ "Sequences (Tuples/Lists)" section, add "How do you +remove multiple items from a list". From webhook-mailer at python.org Tue Sep 29 01:27:15 2020 From: webhook-mailer at python.org (Miss Islington (bot)) Date: Tue, 29 Sep 2020 05:27:15 -0000 Subject: [Python-checkins] bpo-41774: Add programming FAQ entry (GH-22402) Message-ID: https://github.com/python/cpython/commit/868c8e41eb1d7dc032679ae06e62c0d60edd7725 commit: 868c8e41eb1d7dc032679ae06e62c0d60edd7725 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com> committer: GitHub date: 2020-09-28T22:27:06-07:00 summary: bpo-41774: Add programming FAQ entry (GH-22402) In the "Sequences (Tuples/Lists)" section, add "How do you remove multiple items from a list". (cherry picked from commit 5b0181d1f6474c2cb9b80bdaf3bc56a78bf5fbe7) Co-authored-by: Terry Jan Reedy files: A Misc/NEWS.d/next/Documentation/2020-09-24-15-35-13.bpo-41774.5IqdGP.rst M Doc/faq/programming.rst diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst index 66d210a55fac7..1435765063f73 100644 --- a/Doc/faq/programming.rst +++ b/Doc/faq/programming.rst @@ -1164,6 +1164,21 @@ This converts the list into a set, thereby removing duplicates, and then back into a list. +How do you remove multiple items from a list +-------------------------------------------- + +As with removing duplicates, explicitly iterating in reverse with a +delete condition is one possibility. However, it is easier and faster +to use slice replacement with an implicit or explicit forward iteration. +Here are three variations.:: + + mylist[:] = filter(keep_function, mylist) + mylist[:] = (x for x in mylist if keep_condition) + mylist[:] = [x for x in mylist if keep_condition] + +If space is not an issue, the list comprehension may be fastest. + + How do you make an array in Python? ----------------------------------- diff --git a/Misc/NEWS.d/next/Documentation/2020-09-24-15-35-13.bpo-41774.5IqdGP.rst b/Misc/NEWS.d/next/Documentation/2020-09-24-15-35-13.bpo-41774.5IqdGP.rst new file mode 100644 index 0000000000000..af8e02437cb2b --- /dev/null +++ b/Misc/NEWS.d/next/Documentation/2020-09-24-15-35-13.bpo-41774.5IqdGP.rst @@ -0,0 +1,2 @@ +In Programming FAQ "Sequences (Tuples/Lists)" section, add "How do you +remove multiple items from a list". From webhook-mailer at python.org Tue Sep 29 05:09:31 2020 From: webhook-mailer at python.org (Mark Shannon) Date: Tue, 29 Sep 2020 09:09:31 -0000 Subject: [Python-checkins] bpo-41670: Remove outdated predict macro invocation. (GH-22026) Message-ID: https://github.com/python/cpython/commit/17b5be0c0a3f74141014e06a660f1b5ddb002fec commit: 17b5be0c0a3f74141014e06a660f1b5ddb002fec branch: master author: Mark Shannon committer: GitHub date: 2020-09-29T10:09:13+01:00 summary: bpo-41670: Remove outdated predict macro invocation. (GH-22026) Remove PREDICTion of POP_BLOCK from FOR_ITER. files: A Misc/NEWS.d/next/Core and Builtins/2020-08-31-11-37-59.bpo-41670.vmRJRx.rst M Lib/test/test_sys_settrace.py M Python/ceval.c diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py index 3f902b1fe74ce..dd4418dd98b22 100644 --- a/Lib/test/test_sys_settrace.py +++ b/Lib/test/test_sys_settrace.py @@ -602,6 +602,23 @@ def run(tracer): self.compare_events(doit_async.code.co_firstlineno, tracer.events, events) + def test_loop_in_try_except(self): + # https://bugs.python.org/issue41670 + + def func(): + try: + for i in []: pass + return 1 + except: + return 2 + + self.run_and_compare(func, + [(0, 'call'), + (1, 'line'), + (2, 'line'), + (3, 'line'), + (3, 'return')]) + class SkipLineEventsTraceTestCase(TraceTestCase): """Repeat the trace tests, but with per-line events skipped""" diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-08-31-11-37-59.bpo-41670.vmRJRx.rst b/Misc/NEWS.d/next/Core and Builtins/2020-08-31-11-37-59.bpo-41670.vmRJRx.rst new file mode 100644 index 0000000000000..6ad5fb6dc9bb4 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2020-08-31-11-37-59.bpo-41670.vmRJRx.rst @@ -0,0 +1,4 @@ +Prevent line trace being skipped on platforms not compiled +with ``USE_COMPUTED_GOTOS``. +Fixes issue where some lines nested within a try-except block +were not being traced on Windows. diff --git a/Python/ceval.c b/Python/ceval.c index 6430e792b8c5d..6bd2d6bc13d86 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -2311,7 +2311,6 @@ _PyEval_EvalFrameDefault(PyThreadState tstate, PyFrameObject f, int throwflag) } case TARGET(POP_BLOCK): { - PREDICTED(POP_BLOCK); PyFrame_BlockPop(f); DISPATCH(); } @@ -3366,7 +3365,6 @@ _PyEval_EvalFrameDefault(PyThreadState tstate, PyFrameObject f, int throwflag) STACK_SHRINK(1); Py_DECREF(iter); JUMPBY(oparg); - PREDICT(POP_BLOCK); DISPATCH(); } From webhook-mailer at python.org Wed Sep 30 18:06:00 2020 From: webhook-mailer at python.org (Max Smolens) Date: Wed, 30 Sep 2020 22:06:00 -0000 Subject: [Python-checkins] Fix grammar in secrets module documentation (GH-22467) Message-ID: https://github.com/python/cpython/commit/63298930fb531ba2bb4f23bc3b915dbf1e17e9e1 commit: 63298930fb531ba2bb4f23bc3b915dbf1e17e9e1 branch: master author: Max Smolens committer: GitHub date: 2020-09-30T15:05:51-07:00 summary: Fix grammar in secrets module documentation (GH-22467) >From `In particularly,` to `In particular,` files: M Doc/library/secrets.rst diff --git a/Doc/library/secrets.rst b/Doc/library/secrets.rst index bc4766da2785b..afa8e2d385fa4 100644 --- a/Doc/library/secrets.rst +++ b/Doc/library/secrets.rst @@ -21,7 +21,7 @@ The :mod:`secrets` module is used for generating cryptographically strong random numbers suitable for managing data such as passwords, account authentication, security tokens, and related secrets. -In particularly, :mod:`secrets` should be used in preference to the +In particular, :mod:`secrets` should be used in preference to the default pseudo-random number generator in the :mod:`random` module, which is designed for modelling and simulation, not security or cryptography. From webhook-mailer at python.org Wed Sep 30 18:50:05 2020 From: webhook-mailer at python.org (Miss Islington (bot)) Date: Wed, 30 Sep 2020 22:50:05 -0000 Subject: [Python-checkins] Fix grammar in secrets module documentation (GH-22467) Message-ID: https://github.com/python/cpython/commit/8fc828ec4e867c111cef137a2daeea6c3d5db2c7 commit: 8fc828ec4e867c111cef137a2daeea6c3d5db2c7 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com> committer: GitHub date: 2020-09-30T15:49:52-07:00 summary: Fix grammar in secrets module documentation (GH-22467) >From `In particularly,` to `In particular,` (cherry picked from commit 63298930fb531ba2bb4f23bc3b915dbf1e17e9e1) Co-authored-by: Max Smolens files: M Doc/library/secrets.rst diff --git a/Doc/library/secrets.rst b/Doc/library/secrets.rst index bc4766da2785b..afa8e2d385fa4 100644 --- a/Doc/library/secrets.rst +++ b/Doc/library/secrets.rst @@ -21,7 +21,7 @@ The :mod:`secrets` module is used for generating cryptographically strong random numbers suitable for managing data such as passwords, account authentication, security tokens, and related secrets. -In particularly, :mod:`secrets` should be used in preference to the +In particular, :mod:`secrets` should be used in preference to the default pseudo-random number generator in the :mod:`random` module, which is designed for modelling and simulation, not security or cryptography. From webhook-mailer at python.org Wed Sep 30 18:50:12 2020 From: webhook-mailer at python.org (Miss Islington (bot)) Date: Wed, 30 Sep 2020 22:50:12 -0000 Subject: [Python-checkins] Fix grammar in secrets module documentation (GH-22467) Message-ID: https://github.com/python/cpython/commit/4c2e299d80c53591f05de2669c0edeaf8acd8544 commit: 4c2e299d80c53591f05de2669c0edeaf8acd8544 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com> committer: GitHub date: 2020-09-30T15:50:07-07:00 summary: Fix grammar in secrets module documentation (GH-22467) >From `In particularly,` to `In particular,` (cherry picked from commit 63298930fb531ba2bb4f23bc3b915dbf1e17e9e1) Co-authored-by: Max Smolens files: M Doc/library/secrets.rst diff --git a/Doc/library/secrets.rst b/Doc/library/secrets.rst index bc4766da2785b..afa8e2d385fa4 100644 --- a/Doc/library/secrets.rst +++ b/Doc/library/secrets.rst @@ -21,7 +21,7 @@ The :mod:`secrets` module is used for generating cryptographically strong random numbers suitable for managing data such as passwords, account authentication, security tokens, and related secrets. -In particularly, :mod:`secrets` should be used in preference to the +In particular, :mod:`secrets` should be used in preference to the default pseudo-random number generator in the :mod:`random` module, which is designed for modelling and simulation, not security or cryptography.

Navigation

Navigation

Navigation

Calltips?

Code Context?

Navigation

Calltips?

Code Context?

Navigation

Calltips?

Code Context?

Navigation

Calltips ?

Calltips ?

Calltips ?