Merge remote-tracking branch 'upstream/main'

Author: pablogsal

Include/internal/pycore_frame.h

@@ -87,12 +87,12 @@ static inline void _PyFrame_StackPush(InterpreterFrame *f, PyObject *value) {
 
 void _PyFrame_Copy(InterpreterFrame *src, InterpreterFrame *dest);
 
+/* Consumes reference to func */
 static inline void
 _PyFrame_InitializeSpecials(
     InterpreterFrame *frame, PyFunctionObject *func,
     PyObject *locals, int nlocalsplus)
 {
-    Py_INCREF(func);
     frame->f_func = func;
     frame->f_code = (PyCodeObject *)Py_NewRef(func->func_code);
     frame->f_builtins = func->func_builtins;
@@ -166,9 +166,6 @@ _PyFrame_FastToLocalsWithError(InterpreterFrame *frame);
 void
 _PyFrame_LocalsToFast(InterpreterFrame *frame, int clear);
 
-InterpreterFrame *_PyThreadState_PushFrame(
-    PyThreadState *tstate, PyFunctionObject *func, PyObject *locals);
-
 extern InterpreterFrame *
 _PyThreadState_BumpFramePointerSlow(PyThreadState *tstate, size_t size);
 
@@ -189,6 +186,7 @@ _PyThreadState_BumpFramePointer(PyThreadState *tstate, size_t size)
 
 void _PyThreadState_PopFrame(PyThreadState *tstate, InterpreterFrame *frame);
 
+/* Consume reference to func */
 InterpreterFrame *
 _PyFrame_Push(PyThreadState *tstate, PyFunctionObject *func);
 

Lib/idlelib/NEWS.txt

@@ -4,6 +4,9 @@ Released on 2022-10-03
 =========================
 
 
+bpo-46630: Make query dialogs on Windows start with a cursor in the
+entry box.
+
 bpo-46591: Make the IDLE doc URL on the About IDLE dialog clickable.
 
 bpo-45296: Clarify close, quit, and exit in IDLE.  In the File menu,

Lib/idlelib/pyparse.py

@@ -179,7 +179,7 @@ def find_good_parse_start(self, is_char_in_string):
         # Peeking back worked; look forward until _synchre no longer
         # matches.
         i = pos + 1
-        while (m := _synchre(code, i)):
+        while m := _synchre(code, i):
             s, i = m.span()
             if not is_char_in_string(s):
                 pos = s

Lib/idlelib/query.py

@@ -83,6 +83,7 @@ def __init__(self, parent, title, message, *, text0='', used_names={},
 
         if not _utest:
             self.deiconify()  # Unhide now that geometry set.
+            self.entry.focus_set()
             self.wait_window()
 
     def create_widgets(self, ok_text='OK'):  # Do not replace.
@@ -100,7 +101,6 @@ def create_widgets(self, ok_text='OK'):  # Do not replace.
                            text=self.message)
         self.entryvar = StringVar(self, self.text0)
         self.entry = Entry(frame, width=30, textvariable=self.entryvar)
-        self.entry.focus_set()
         self.error_font = Font(name='TkCaptionFont',
                                exists=True, root=self.parent)
         self.entry_error = Label(frame, text=' ', foreground='red',

Lib/idlelib/replace.py

@@ -158,8 +158,8 @@ def replace_all(self, event=None):
         first = last = None
         # XXX ought to replace circular instead of top-to-bottom when wrapping
         text.undo_block_start()
-        while (res := self.engine.search_forward(
-                text, prog, line, col, wrap=False, ok=ok)):
+        while res := self.engine.search_forward(
+                text, prog, line, col, wrap=False, ok=ok):
             line, m = res
             chars = text.get("%d.0" % line, "%d.0" % (line+1))
             orig = m.group()

Lib/idlelib/run.py

@@ -482,7 +482,7 @@ def read(self, size=-1):
         result = self._line_buffer
         self._line_buffer = ''
         if size < 0:
-            while (line := self.shell.readline()):
+            while line := self.shell.readline():
                 result += line
         else:
             while len(result) < size:

Misc/NEWS.d/next/IDLE/2022-02-03-15-47-53.bpo-46630.tREOjo.rst

@@ -0,0 +1 @@
+Make query dialogs on Windows start with a cursor in the entry box.

Misc/NEWS.d/next/Library/2022-02-03-10-22-42.bpo-46626.r2e-n_.rst

@@ -0,0 +1 @@
+Expose Linux's ``IP_BIND_ADDRESS_NO_PORT`` option in :mod:`socket`.

Modules/socketmodule.c

@@ -8072,6 +8072,9 @@ PyInit__socket(void)
 #ifdef  IP_TRANSPARENT
     PyModule_AddIntMacro(m, IP_TRANSPARENT);
 #endif
+#ifdef IP_BIND_ADDRESS_NO_PORT
+    PyModule_AddIntMacro(m, IP_BIND_ADDRESS_NO_PORT);
+#endif
 
     /* IPv6 [gs]etsockopt options, defined in RFC2553 */
 #ifdef  IPV6_JOIN_GROUP

Objects/frameobject.c

@@ -784,6 +784,8 @@ _Py_IDENTIFIER(__builtins__);
 static void
 init_frame(InterpreterFrame *frame, PyFunctionObject *func, PyObject *locals)
 {
+    /* _PyFrame_InitializeSpecials consumes reference to func */
+    Py_INCREF(func);
     PyCodeObject *code = (PyCodeObject *)func->func_code;
     _PyFrame_InitializeSpecials(frame, func, locals, code->co_nlocalsplus);
     for (Py_ssize_t i = 0; i < code->co_nlocalsplus; i++) {