intermediate changes

ref:7c971b97c72bbbcbf889118d39017bd14f99365a

6 files changed, 24 insertions, 34 deletions

diff --git a/contrib/python/prompt-toolkit/py3/prompt_toolkit/layout/containers.py b/contrib/python/prompt-toolkit/py3/prompt_toolkit/layout/containers.py
index 2c845a76aa0..03f9e7d2485 100644
--- a/contrib/python/prompt-toolkit/py3/prompt_toolkit/layout/containers.py
+++ b/contrib/python/prompt-toolkit/py3/prompt_toolkit/layout/containers.py
@@ -1365,7 +1365,7 @@ class ScrollOffsets:
         return to_int(self._right)
 
     def __repr__(self) -> str:
-        return "ScrollOffsets(top=%r, bottom=%r, left=%r, right=%r)" % (
+        return "ScrollOffsets(top={!r}, bottom={!r}, left={!r}, right={!r})".format(
             self._top,
             self._bottom,
             self._left,
@@ -2627,7 +2627,7 @@ class ConditionalContainer(Container):
         self.filter = to_filter(filter)
 
     def __repr__(self) -> str:
-        return "ConditionalContainer(%r, filter=%r)" % (self.content, self.filter)
+        return f"ConditionalContainer({self.content!r}, filter={self.filter!r})"
 
     def reset(self) -> None:
         self.content.reset()
@@ -2730,7 +2730,7 @@ def to_container(container: AnyContainer) -> Container:
     elif hasattr(container, "__pt_container__"):
         return to_container(container.__pt_container__())
     else:
-        raise ValueError("Not a container object: %r" % (container,))
+        raise ValueError(f"Not a container object: {container!r}")
 
 
 def to_window(container: AnyContainer) -> Window:
@@ -2742,7 +2742,7 @@ def to_window(container: AnyContainer) -> Window:
     elif hasattr(container, "__pt_container__"):
         return to_window(cast("MagicContainer", container).__pt_container__())
     else:
-        raise ValueError("Not a Window object: %r." % (container,))
+        raise ValueError(f"Not a Window object: {container!r}.")
 
 
 def is_container(value: object) -> "TypeGuard[AnyContainer]":
diff --git a/contrib/python/prompt-toolkit/py3/prompt_toolkit/layout/controls.py b/contrib/python/prompt-toolkit/py3/prompt_toolkit/layout/controls.py
index 45b50e68f83..016d2894665 100644
--- a/contrib/python/prompt-toolkit/py3/prompt_toolkit/layout/controls.py
+++ b/contrib/python/prompt-toolkit/py3/prompt_toolkit/layout/controls.py
@@ -336,7 +336,7 @@ class FormattedTextControl(UIControl):
         return self.focusable()
 
     def __repr__(self) -> str:
-        return "%s(%r)" % (self.__class__.__name__, self.text)
+        return f"{self.__class__.__name__}({self.text!r})"
 
     def _get_formatted_text_cached(self) -> StyleAndTextTuples:
         """
@@ -495,14 +495,10 @@ class DummyControl(UIControl):
         return False
 
 
-_ProcessedLine = NamedTuple(
-    "_ProcessedLine",
-    [
-        ("fragments", StyleAndTextTuples),
-        ("source_to_display", Callable[[int], int]),
-        ("display_to_source", Callable[[int], int]),
-    ],
-)
+class _ProcessedLine(NamedTuple):
+    fragments: StyleAndTextTuples
+    source_to_display: Callable[[int], int]
+    display_to_source: Callable[[int], int]
 
 
 class BufferControl(UIControl):
@@ -573,7 +569,7 @@ class BufferControl(UIControl):
         self._last_get_processed_line: Optional[Callable[[int], _ProcessedLine]] = None
 
     def __repr__(self) -> str:
-        return "<%s buffer=%r at %r>" % (self.__class__.__name__, self.buffer, id(self))
+        return f"<{self.__class__.__name__} buffer={self.buffer!r} at {id(self)!r}>"
 
     @property
     def search_buffer_control(self) -> Optional["SearchBufferControl"]:
diff --git a/contrib/python/prompt-toolkit/py3/prompt_toolkit/layout/layout.py b/contrib/python/prompt-toolkit/py3/prompt_toolkit/layout/layout.py
index 28bfcb3cac9..62a3184ee22 100644
--- a/contrib/python/prompt-toolkit/py3/prompt_toolkit/layout/layout.py
+++ b/contrib/python/prompt-toolkit/py3/prompt_toolkit/layout/layout.py
@@ -70,7 +70,7 @@ class Layout:
         self.visible_windows: List[Window] = []  # List of `Window` objects.
 
     def __repr__(self) -> str:
-        return "Layout(%r, current_window=%r)" % (self.container, self.current_window)
+        return f"Layout({self.container!r}, current_window={self.current_window!r})"
 
     def find_all_windows(self) -> Generator[Window, None, None]:
         """
@@ -103,9 +103,7 @@ class Layout:
                 if isinstance(control, BufferControl) and control.buffer.name == value:
                     self.focus(control)
                     return
-            raise ValueError(
-                "Couldn't find Buffer in the current layout: %r." % (value,)
-            )
+            raise ValueError(f"Couldn't find Buffer in the current layout: {value!r}.")
 
         # BufferControl by buffer object.
         elif isinstance(value, Buffer):
@@ -113,9 +111,7 @@ class Layout:
                 if isinstance(control, BufferControl) and control.buffer == value:
                     self.focus(control)
                     return
-            raise ValueError(
-                "Couldn't find Buffer in the current layout: %r." % (value,)
-            )
+            raise ValueError(f"Couldn't find Buffer in the current layout: {value!r}.")
 
         # Focus UIControl.
         elif isinstance(value, UIControl):
@@ -164,7 +160,7 @@ class Layout:
                     return
 
                 raise ValueError(
-                    "Invalid value. Container cannot be focused: %r" % (value,)
+                    f"Invalid value. Container cannot be focused: {value!r}"
                 )
 
     def has_focus(self, value: FocusableElement) -> bool:
@@ -342,8 +338,7 @@ class Layout:
         """
         Walk through all the layout nodes (and their children) and yield them.
         """
-        for i in walk(self.container):
-            yield i
+        yield from walk(self.container)
 
     def walk_through_modal_area(self) -> Iterable[Container]:
         """
@@ -356,8 +351,7 @@ class Layout:
         while not root.is_modal() and root in self._child_to_parent:
             root = self._child_to_parent[root]
 
-        for container in walk(root):
-            yield container
+        yield from walk(root)
 
     def update_parents_relations(self) -> None:
         """
diff --git a/contrib/python/prompt-toolkit/py3/prompt_toolkit/layout/menus.py b/contrib/python/prompt-toolkit/py3/prompt_toolkit/layout/menus.py
index 557450c0005..8218f741079 100644
--- a/contrib/python/prompt-toolkit/py3/prompt_toolkit/layout/menus.py
+++ b/contrib/python/prompt-toolkit/py3/prompt_toolkit/layout/menus.py
@@ -218,7 +218,7 @@ def _get_menu_item_fragments(
     width.
     """
     if is_current_completion:
-        style_str = "class:completion-menu.completion.current %s %s" % (
+        style_str = "class:completion-menu.completion.current {} {}".format(
             completion.style,
             completion.selected_style,
         )
diff --git a/contrib/python/prompt-toolkit/py3/prompt_toolkit/layout/processors.py b/contrib/python/prompt-toolkit/py3/prompt_toolkit/layout/processors.py
index 571e952971b..722658a846b 100644
--- a/contrib/python/prompt-toolkit/py3/prompt_toolkit/layout/processors.py
+++ b/contrib/python/prompt-toolkit/py3/prompt_toolkit/layout/processors.py
@@ -201,8 +201,8 @@ class HighlightSearchProcessor(Processor):
         ) = transformation_input.unpack()
 
         search_text = self._get_search_text(buffer_control)
-        searchmatch_fragment = " class:%s " % (self._classname,)
-        searchmatch_current_fragment = " class:%s " % (self._classname_current,)
+        searchmatch_fragment = f" class:{self._classname} "
+        searchmatch_current_fragment = f" class:{self._classname_current} "
 
         if search_text and not get_app().is_done:
             # For each search match, replace the style string.
@@ -526,7 +526,7 @@ class BeforeInput(Processor):
         )
 
     def __repr__(self) -> str:
-        return "BeforeInput(%r, %r)" % (self.text, self.style)
+        return f"BeforeInput({self.text!r}, {self.style!r})"
 
 
 class ShowArg(BeforeInput):
@@ -580,7 +580,7 @@ class AfterInput(Processor):
             return Transformation(fragments=ti.fragments)
 
     def __repr__(self) -> str:
-        return "%s(%r, style=%r)" % (self.__class__.__name__, self.text, self.style)
+        return f"{self.__class__.__name__}({self.text!r}, style={self.style!r})"
 
 
 class AppendAutoSuggestion(Processor):
@@ -940,7 +940,7 @@ class ConditionalProcessor(Processor):
             return Transformation(transformation_input.fragments)
 
     def __repr__(self) -> str:
-        return "%s(processor=%r, filter=%r)" % (
+        return "{}(processor={!r}, filter={!r})".format(
             self.__class__.__name__,
             self.processor,
             self.filter,
diff --git a/contrib/python/prompt-toolkit/py3/prompt_toolkit/layout/screen.py b/contrib/python/prompt-toolkit/py3/prompt_toolkit/layout/screen.py
index deb2f432227..5d27ab26c9f 100644
--- a/contrib/python/prompt-toolkit/py3/prompt_toolkit/layout/screen.py
+++ b/contrib/python/prompt-toolkit/py3/prompt_toolkit/layout/screen.py
@@ -135,7 +135,7 @@ class Char:
         __ne__ = _not_equal
 
     def __repr__(self) -> str:
-        return "%s(%r, %r)" % (self.__class__.__name__, self.char, self.style)
+        return f"{self.__class__.__name__}({self.char!r}, {self.style!r})"
 
 
 _CHAR_CACHE: FastDictCache[Tuple[str, str], Char] = FastDictCache(
@@ -318,7 +318,7 @@ class WritePosition:
         self.height = height
 
     def __repr__(self) -> str:
-        return "%s(x=%r, y=%r, width=%r, height=%r)" % (
+        return "{}(x={!r}, y={!r}, width={!r}, height={!r})".format(
             self.__class__.__name__,
             self.xpos,
             self.ypos,