intermediate changes

ref:7c971b97c72bbbcbf889118d39017bd14f99365a

3 files changed, 16 insertions, 20 deletions

diff --git a/contrib/python/prompt-toolkit/py3/prompt_toolkit/completion/base.py b/contrib/python/prompt-toolkit/py3/prompt_toolkit/completion/base.py
index 3bfde97d10d..371c0ea6e5c 100644
--- a/contrib/python/prompt-toolkit/py3/prompt_toolkit/completion/base.py
+++ b/contrib/python/prompt-toolkit/py3/prompt_toolkit/completion/base.py
@@ -65,13 +65,13 @@ class Completion:
 
     def __repr__(self) -> str:
         if isinstance(self.display, str) and self.display == self.text:
-            return "%s(text=%r, start_position=%r)" % (
+            return "{}(text={!r}, start_position={!r})".format(
                 self.__class__.__name__,
                 self.text,
                 self.start_position,
             )
         else:
-            return "%s(text=%r, start_position=%r, display=%r)" % (
+            return "{}(text={!r}, start_position={!r}, display={!r})".format(
                 self.__class__.__name__,
                 self.text,
                 self.start_position,
@@ -155,7 +155,7 @@ class CompleteEvent:
         self.completion_requested = completion_requested
 
     def __repr__(self) -> str:
-        return "%s(text_inserted=%r, completion_requested=%r)" % (
+        return "{}(text_inserted={!r}, completion_requested={!r})".format(
             self.__class__.__name__,
             self.text_inserted,
             self.completion_requested,
@@ -230,7 +230,7 @@ class ThreadedCompleter(Completer):
             yield completion
 
     def __repr__(self) -> str:
-        return "ThreadedCompleter(%r)" % (self.completer,)
+        return f"ThreadedCompleter({self.completer!r})"
 
 
 class DummyCompleter(Completer):
@@ -274,7 +274,7 @@ class DynamicCompleter(Completer):
             yield completion
 
     def __repr__(self) -> str:
-        return "DynamicCompleter(%r -> %r)" % (self.get_completer, self.get_completer())
+        return f"DynamicCompleter({self.get_completer!r} -> {self.get_completer()!r})"
 
 
 class ConditionalCompleter(Completer):
@@ -291,15 +291,14 @@ class ConditionalCompleter(Completer):
         self.filter = to_filter(filter)
 
     def __repr__(self) -> str:
-        return "ConditionalCompleter(%r, filter=%r)" % (self.completer, self.filter)
+        return f"ConditionalCompleter({self.completer!r}, filter={self.filter!r})"
 
     def get_completions(
         self, document: Document, complete_event: CompleteEvent
     ) -> Iterable[Completion]:
         # Get all completions in a blocking way.
         if self.filter():
-            for c in self.completer.get_completions(document, complete_event):
-                yield c
+            yield from self.completer.get_completions(document, complete_event)
 
     async def get_completions_async(
         self, document: Document, complete_event: CompleteEvent
@@ -326,8 +325,7 @@ class _MergedCompleter(Completer):
     ) -> Iterable[Completion]:
         # Get all completions from the other completers in a blocking way.
         for completer in self.completers:
-            for c in completer.get_completions(document, complete_event):
-                yield c
+            yield from completer.get_completions(document, complete_event)
 
     async def get_completions_async(
         self, document: Document, complete_event: CompleteEvent
diff --git a/contrib/python/prompt-toolkit/py3/prompt_toolkit/completion/fuzzy_completer.py b/contrib/python/prompt-toolkit/py3/prompt_toolkit/completion/fuzzy_completer.py
index 4f7c3ab5d68..627adc8738a 100644
--- a/contrib/python/prompt-toolkit/py3/prompt_toolkit/completion/fuzzy_completer.py
+++ b/contrib/python/prompt-toolkit/py3/prompt_toolkit/completion/fuzzy_completer.py
@@ -93,7 +93,7 @@ class FuzzyCompleter(Completer):
         fuzzy_matches: List[_FuzzyMatch] = []
 
         pat = ".*?".join(map(re.escape, word_before_cursor))
-        pat = "(?=({0}))".format(pat)  # lookahead regex to manage overlapping matches
+        pat = f"(?=({pat}))"  # lookahead regex to manage overlapping matches
         regex = re.compile(pat, re.IGNORECASE)
         for compl in completions:
             matches = list(regex.finditer(compl.text))
@@ -195,7 +195,7 @@ class FuzzyWordCompleter(Completer):
         return self.fuzzy_completer.get_completions(document, complete_event)
 
 
-_FuzzyMatch = NamedTuple(
-    "_FuzzyMatch",
-    [("match_length", int), ("start_pos", int), ("completion", Completion)],
-)
+class _FuzzyMatch(NamedTuple):
+    match_length: int
+    start_pos: int
+    completion: Completion
diff --git a/contrib/python/prompt-toolkit/py3/prompt_toolkit/completion/nested.py b/contrib/python/prompt-toolkit/py3/prompt_toolkit/completion/nested.py
index 8b0978ca32e..f8656b217ad 100644
--- a/contrib/python/prompt-toolkit/py3/prompt_toolkit/completion/nested.py
+++ b/contrib/python/prompt-toolkit/py3/prompt_toolkit/completion/nested.py
@@ -33,7 +33,7 @@ class NestedCompleter(Completer):
         self.ignore_case = ignore_case
 
     def __repr__(self) -> str:
-        return "NestedCompleter(%r, ignore_case=%r)" % (self.options, self.ignore_case)
+        return f"NestedCompleter({self.options!r}, ignore_case={self.ignore_case!r})"
 
     @classmethod
     def from_nested_dict(cls, data: NestedDict) -> "NestedCompleter":
@@ -97,13 +97,11 @@ class NestedCompleter(Completer):
                     cursor_position=document.cursor_position - move_cursor,
                 )
 
-                for c in completer.get_completions(new_document, complete_event):
-                    yield c
+                yield from completer.get_completions(new_document, complete_event)
 
         # No space in the input: behave exactly like `WordCompleter`.
         else:
             completer = WordCompleter(
                 list(self.options.keys()), ignore_case=self.ignore_case
             )
-            for c in completer.get_completions(document, complete_event):
-                yield c
+            yield from completer.get_completions(document, complete_event)