Upgrade to 3.6 syntax using pyupgrade.

Author: jonathanslenders

docs/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # prompt_toolkit documentation build configuration file, created by
 # sphinx-quickstart on Thu Jul 31 14:17:08 2014.

examples/dialogs/button_dialog.py

@@ -12,7 +12,7 @@ def main():
         buttons=[("Yes", True), ("No", False), ("Maybe...", None)],
     ).run()
 
-    print("Result = {}".format(result))
+    print(f"Result = {result}")
 
 
 if __name__ == "__main__":

examples/dialogs/input_dialog.py

@@ -10,7 +10,7 @@ def main():
         title="Input dialog example", text="Please type your name:"
     ).run()
 
-    print("Result = {}".format(result))
+    print(f"Result = {result}")
 
 
 if __name__ == "__main__":

examples/dialogs/password_dialog.py

@@ -12,7 +12,7 @@ def main():
         password=True,
     ).run()
 
-    print("Result = {}".format(result))
+    print(f"Result = {result}")
 
 
 if __name__ == "__main__":

examples/dialogs/progress_dialog.py

@@ -19,7 +19,7 @@ def worker(set_percentage, log_text):
     percentage = 0
     for dirpath, dirnames, filenames in os.walk("../.."):
         for f in filenames:
-            log_text("{} / {}\n".format(dirpath, f))
+            log_text(f"{dirpath} / {f}\n")
             set_percentage(percentage + 1)
             percentage += 2
             time.sleep(0.1)

examples/dialogs/radio_dialog.py

@@ -18,7 +18,7 @@ def main():
         text="Please select a color:",
     ).run()
 
-    print("Result = {}".format(result))
+    print(f"Result = {result}")
 
     # With HTML.
     result = radiolist_dialog(
@@ -32,7 +32,7 @@ def main():
         text="Please select a color:",
     ).run()
 
-    print("Result = {}".format(result))
+    print(f"Result = {result}")
 
 
 if __name__ == "__main__":

examples/dialogs/yes_no_dialog.py

@@ -10,7 +10,7 @@ def main():
         title="Yes/No dialog example", text="Do you want to confirm?"
     ).run()
 
-    print("Result = {}".format(result))
+    print(f"Result = {result}")
 
 
 if __name__ == "__main__":

examples/full-screen/ansi-art-and-textarea.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-from __future__ import unicode_literals
 
 from prompt_toolkit.application import Application
 from prompt_toolkit.formatted_text import ANSI, HTML

examples/full-screen/calculator.py

@@ -54,7 +54,7 @@ def accept(buff):
                 input_field.text, eval(input_field.text)
             )  # Don't do 'eval' in real code!
         except BaseException as e:
-            output = "\n\n{}".format(e)
+            output = f"\n\n{e}"
         new_text = output_field.text + output
 
         # Add text to output buffer.

examples/full-screen/text-editor.py

@@ -185,8 +185,8 @@ async def coroutine():
             try:
                 with open(path, "rb") as f:
                     text_field.text = f.read().decode("utf-8", errors="ignore")
-            except IOError as e:
-                show_message("Error", "{}".format(e))
+            except OSError as e:
+                show_message("Error", f"{e}")
 
     ensure_future(coroutine())
 

examples/progress-bar/nested-progress-bars.py

@@ -15,9 +15,7 @@ def main():
     ) as pb:
 
         for i in pb(range(6), label="Main task"):
-            for j in pb(
-                range(200), label="Subtask <%s>" % (i + 1,), remove_when_done=True
-            ):
+            for j in pb(range(200), label=f"Subtask <{i + 1}>", remove_when_done=True):
                 time.sleep(0.01)
 
 

examples/progress-bar/unknown-length.py

@@ -13,8 +13,7 @@ def data():
     A generator that produces items. len() doesn't work here, so the progress
     bar can't estimate the time it will take.
     """
-    for i in range(1000):
-        yield i
+    yield from range(1000)
 
 
 def main():

examples/prompts/asyncio-prompt.py

@@ -45,7 +45,7 @@ async def interactive_shell():
     while True:
         try:
             result = await session.prompt_async()
-            print('You said: "{0}"'.format(result))
+            print(f'You said: "{result}"')
         except (EOFError, KeyboardInterrupt):
             return
 

examples/prompts/clock-input.py

@@ -11,7 +11,7 @@ def get_prompt():
     "Tokens to be shown before the prompt."
     now = datetime.datetime.now()
     return [
-        ("bg:#008800 #ffffff", "%s:%s:%s" % (now.hour, now.minute, now.second)),
+        ("bg:#008800 #ffffff", f"{now.hour}:{now.minute}:{now.second}"),
         ("bg:cornsilk fg:maroon", " Enter something: "),
     ]
 

examples/prompts/finalterm-shell-integration.py

@@ -35,7 +35,7 @@ def get_prompt_text():
     # Option 2: Using ANSI escape sequences.
     before = "\001" + BEFORE_PROMPT + "\002"
     after = "\001" + AFTER_PROMPT + "\002"
-    answer = prompt(ANSI("{}Say something: # {}".format(before, after)))
+    answer = prompt(ANSI(f"{before}Say something: # {after}"))
 
     # Output.
     sys.stdout.write(BEFORE_OUTPUT)

examples/prompts/history/slow-history.py

@@ -19,7 +19,7 @@ class SlowHistory(History):
     def load_history_strings(self):
         for i in range(1000):
             time.sleep(1)  # Emulate slowness.
-            yield "item-%s" % (i,)
+            yield f"item-{i}"
 
     def store_string(self, string):
         pass  # Don't store strings.

examples/telnet/dialog.py

@@ -18,7 +18,7 @@ async def interact(connection):
         title="Yes/no dialog demo", text="Press yes or no"
     ).run_async()
 
-    connection.send("You said: {}\n".format(result))
+    connection.send(f"You said: {result}\n")
     connection.send("Bye.\n")
 
 

examples/telnet/hello-world.py

@@ -25,7 +25,7 @@ async def interact(connection):
     result = await prompt(message="Say something: ", async_=True)
 
     # Send output.
-    connection.send("You said: {}\n".format(result))
+    connection.send(f"You said: {result}\n")
     connection.send("Bye.\n")
 
 

examples/telnet/toolbar.py

@@ -31,7 +31,7 @@ def get_toolbar():
         "Say something: ", bottom_toolbar=get_toolbar, completer=animal_completer
     )
 
-    connection.send("You said: {}\n".format(result))
+    connection.send(f"You said: {result}\n")
     connection.send("Bye.\n")
 
 

prompt_toolkit/application/application.py

@@ -583,8 +583,7 @@ def _update_invalidate_events(self) -> None:
         # (All controls are able to invalidate themselves.)
         def gather_events() -> Iterable[Event[object]]:
             for c in self.layout.find_all_controls():
-                for ev in c.get_invalidate_events():
-                    yield ev
+                yield from c.get_invalidate_events()
 
         self._invalidate_events = list(gather_events())
 
@@ -959,7 +958,7 @@ async def in_term() -> None:
                 # but don't use logger. (This works better on Python 2.)
                 print("\nUnhandled exception in event loop:")
                 print(formatted_tb)
-                print("Exception %s" % (context.get("exception"),))
+                print("Exception {}".format(context.get("exception")))
 
                 await _do_wait_for_enter("Press ENTER to continue...")
 
@@ -1256,10 +1255,8 @@ def get_used_style_strings(self) -> List[str]:
 
         if attrs_for_style:
             return sorted(
-                [
-                    re.sub(r"\s+", " ", style_str).strip()
-                    for style_str in attrs_for_style.keys()
-                ]
+                re.sub(r"\s+", " ", style_str).strip()
+                for style_str in attrs_for_style.keys()
             )
 
         return []

prompt_toolkit/application/current.py

@@ -53,7 +53,7 @@ def __init__(
         self.app: Optional["Application[Any]"] = None
 
     def __repr__(self) -> str:
-        return "AppSession(app=%r)" % (self.app,)
+        return f"AppSession(app={self.app!r})"
 
     @property
     def input(self) -> "Input":

prompt_toolkit/buffer.py

@@ -95,7 +95,7 @@ def __init__(
         self.complete_index = complete_index  # Position in the `_completions` array.
 
     def __repr__(self) -> str:
-        return "%s(%r, <%r> completions, index=%r)" % (
+        return "{}({!r}, <{!r}> completions, index={!r})".format(
             self.__class__.__name__,
             self.original_document,
             len(self.completions),
@@ -160,7 +160,7 @@ def __init__(
         self.n = n
 
     def __repr__(self) -> str:
-        return "%s(history_position=%r, n=%r, previous_inserted_word=%r)" % (
+        return "{}(history_position={!r}, n={!r}, previous_inserted_word={!r})".format(
             self.__class__.__name__,
             self.history_position,
             self.n,
@@ -317,7 +317,7 @@ def __repr__(self) -> str:
         else:
             text = self.text[:12] + "..."
 
-        return "<Buffer(name=%r, text=%r) at %r>" % (self.name, text, id(self))
+        return f"<Buffer(name={self.name!r}, text={text!r}) at {id(self)!r}>"
 
     def reset(
         self, document: Optional[Document] = None, append_to_history: bool = False
@@ -967,7 +967,7 @@ def start_history_lines_completion(self) -> None:
                         if i == self.working_index:
                             display_meta = "Current, line %s" % (j + 1)
                         else:
-                            display_meta = "History %s, line %s" % (i + 1, j + 1)
+                            display_meta = f"History {i + 1}, line {j + 1}"
 
                         completions.append(
                             Completion(

prompt_toolkit/completion/base.py

@@ -65,13 +65,13 @@ def __init__(
 
     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 @@ def __init__(
         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 @@ async def get_completions_async(
             yield completion
 
     def __repr__(self) -> str:
-        return "ThreadedCompleter(%r)" % (self.completer,)
+        return f"ThreadedCompleter({self.completer!r})"
 
 
 class DummyCompleter(Completer):
@@ -274,7 +274,7 @@ async def get_completions_async(
             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 @@ def __init__(self, completer: Completer, filter: FilterOrBool) -> None:
         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 @@ def get_completions(
     ) -> 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

prompt_toolkit/completion/fuzzy_completer.py

@@ -93,7 +93,7 @@ def _get_fuzzy_completions(
         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 @@ def get_completions(
         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

prompt_toolkit/completion/nested.py

@@ -33,7 +33,7 @@ def __init__(
         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 @@ def get_completions(
                     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)