Sourcery refactored master branch

examples/dialogs/checkbox_dialog.py

@@ -2,11 +2,12 @@
 """
 Example of a checkbox-list-based dialog.
 """
+
 from prompt_toolkit.formatted_text import HTML
 from prompt_toolkit.shortcuts import checkboxlist_dialog, message_dialog
 from prompt_toolkit.styles import Style
 
-results = checkboxlist_dialog(
+if results := checkboxlist_dialog(
     title="CheckboxList dialog",
     text="What would you like in your breakfast ?",
     values=[
@@ -26,8 +27,7 @@
             "dialog.body label": "#fd8bb6",
         }
     ),
-).run()
-if results:
+).run():
     message_dialog(
         title="Room service",
         text="You selected: %s\nGreat choice sir !" % ",".join(results),

examples/full-screen/calculator.py

@@ -50,9 +50,7 @@ def main():
     def accept(buff):
         # Evaluate "calculator" expression.
         try:
-            output = "\n\nIn:  {}\nOut: {}".format(
-                input_field.text, eval(input_field.text)
-            )  # Don't do 'eval' in real code!
+            output = f"\n\nIn:  {input_field.text}\nOut: {eval(input_field.text)}"
         except BaseException as e:
             output = f"\n\n{e}"
         new_text = output_field.text + output

examples/full-screen/pager.py

@@ -25,13 +25,10 @@
 
 def get_statusbar_text():
     return [
-        ("class:status", _pager_py_path + " - "),
+        ("class:status", f"{_pager_py_path} - "),
         (
             "class:status.position",
-            "{}:{}".format(
-                text_area.document.cursor_position_row + 1,
-                text_area.document.cursor_position_col + 1,
-            ),
+            f"{text_area.document.cursor_position_row + 1}:{text_area.document.cursor_position_col + 1}",
         ),
         ("class:status", " - Press "),
         ("class:status.key", "Ctrl-C"),

examples/full-screen/simple-demos/line-prefixes.py

@@ -35,7 +35,7 @@ def get_line_prefix(lineno, wrap_count):
     if wrap_count == 0:
         return HTML('[%s] <style bg="orange" fg="black">--&gt;</style> ') % lineno
 
-    text = str(lineno) + "-" + "*" * (lineno // 2) + ": "
+    text = f"{str(lineno)}-" + "*" * (lineno // 2) + ": "
     return HTML('[%s.%s] <style bg="ansigreen" fg="ansiblack">%s</style>') % (
         lineno,
         wrap_count,

examples/full-screen/text-editor.py

@@ -53,10 +53,7 @@ def get_statusbar_text():
 
 
 def get_statusbar_right_text():
-    return " {}:{}  ".format(
-        text_field.document.cursor_position_row + 1,
-        text_field.document.cursor_position_col + 1,
-    )
+    return f" {text_field.document.cursor_position_row + 1}:{text_field.document.cursor_position_col + 1}  "
 
 
 search_toolbar = SearchToolbar()

examples/print-text/named-colors.py

@@ -11,7 +11,7 @@
 
 
 def main():
-    tokens = FormattedText([("fg:" + name, name + "  ") for name in NAMED_COLORS])
+    tokens = FormattedText([(f"fg:{name}", f"{name}  ") for name in NAMED_COLORS])
 
     print(HTML("\n<u>Named colors, using 16 color output.</u>"))
     print("(Note that it doesn't really make sense to use named colors ")

examples/print-text/true-color-demo.py

@@ -21,10 +21,7 @@ def main():
         "bg:#00{0:02x}{0:02x}",  # Cyan.
         "bg:#{0:02x}{0:02x}{0:02x}",  # Gray.
     ]:
-        fragments = []
-        for i in range(0, 256, 4):
-            fragments.append((template.format(i), " "))
-
+        fragments = [(template.format(i), " ") for i in range(0, 256, 4)]
         print(FormattedText(fragments), color_depth=ColorDepth.DEPTH_4_BIT)
         print(FormattedText(fragments), color_depth=ColorDepth.DEPTH_8_BIT)
         print(FormattedText(fragments), color_depth=ColorDepth.DEPTH_24_BIT)

examples/progress-bar/a-lot-of-parallel-tasks.py

@@ -18,7 +18,7 @@ def main():
 
         def run_task(label, total, sleep_time):
             """Complete a normal run."""
-            for i in pb(range(total), label=label):
+            for _ in pb(range(total), label=label):
                 time.sleep(sleep_time)
 
         def stop_task(label, total, sleep_time):

examples/progress-bar/colored-title-and-label.py

@@ -14,7 +14,7 @@ def main():
     label = HTML("<ansired>some file</ansired>: ")
 
     with ProgressBar(title=title) as pb:
-        for i in pb(range(800), label=label):
+        for _ in pb(range(800), label=label):
             time.sleep(0.01)
 
 

examples/progress-bar/many-parallel-tasks.py

@@ -16,7 +16,7 @@ def main():
     ) as pb:
 
         def run_task(label, total, sleep_time):
-            for i in pb(range(total), label=label):
+            for _ in pb(range(total), label=label):
                 time.sleep(sleep_time)
 
         threads = [

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

@@ -10,12 +10,12 @@
 
 def main():
     with ProgressBar(
-        title=HTML('<b fg="#aa00ff">Nested progress bars</b>'),
-        bottom_toolbar=HTML(" <b>[Control-L]</b> clear  <b>[Control-C]</b> abort"),
-    ) as pb:
+            title=HTML('<b fg="#aa00ff">Nested progress bars</b>'),
+            bottom_toolbar=HTML(" <b>[Control-L]</b> clear  <b>[Control-C]</b> abort"),
+        ) as pb:
 
         for i in pb(range(6), label="Main task"):
-            for j in pb(range(200), label=f"Subtask <{i + 1}>", remove_when_done=True):
+            for _ in pb(range(200), label=f"Subtask <{i + 1}>", remove_when_done=True):
                 time.sleep(0.01)
 
 

examples/progress-bar/scrolling-task-name.py

@@ -10,9 +10,9 @@
 
 def main():
     with ProgressBar(
-        title="Scrolling task name (make sure the window is not too big)."
-    ) as pb:
-        for i in pb(
+            title="Scrolling task name (make sure the window is not too big)."
+        ) as pb:
+        for _ in pb(
             range(800),
             label="This is a very very very long task that requires horizontal scrolling ...",
         ):

examples/progress-bar/simple-progress-bar.py

@@ -10,7 +10,7 @@
 
 def main():
     with ProgressBar() as pb:
-        for i in pb(range(800)):
+        for _ in pb(range(800)):
             time.sleep(0.01)
 
 

examples/progress-bar/styled-1.py

@@ -26,9 +26,9 @@
 
 def main():
     with ProgressBar(
-        style=style, title="Progress bar example with custom styling."
-    ) as pb:
-        for i in pb(range(1600), label="Downloading..."):
+            style=style, title="Progress bar example with custom styling."
+        ) as pb:
+        for _ in pb(range(1600), label="Downloading..."):
             time.sleep(0.01)
 
 

examples/progress-bar/styled-2.py

@@ -37,12 +37,12 @@ def main():
         formatters.TimeLeft(),
     ]
     with ProgressBar(
-        title="Progress bar example with custom formatter.",
-        formatters=custom_formatters,
-        style=style,
-    ) as pb:
+            title="Progress bar example with custom formatter.",
+            formatters=custom_formatters,
+            style=style,
+        ) as pb:
 
-        for i in pb(range(20), label="Downloading..."):
+        for _ in pb(range(20), label="Downloading..."):
             time.sleep(1)
 
 

examples/progress-bar/styled-apt-get-install.py

@@ -30,7 +30,7 @@ def main():
     ]
 
     with ProgressBar(style=style, formatters=custom_formatters) as pb:
-        for i in pb(range(1600), label="Installing"):
+        for _ in pb(range(1600), label="Installing"):
             time.sleep(0.01)
 
 

examples/progress-bar/styled-rainbow.py

@@ -21,13 +21,9 @@ def main():
         formatters.Rainbow(formatters.TimeLeft()),
     ]
 
-    if true_color:
-        color_depth = ColorDepth.DEPTH_24_BIT
-    else:
-        color_depth = ColorDepth.DEPTH_8_BIT
-
+    color_depth = ColorDepth.DEPTH_24_BIT if true_color else ColorDepth.DEPTH_8_BIT
     with ProgressBar(formatters=custom_formatters, color_depth=color_depth) as pb:
-        for i in pb(range(20), label="Downloading..."):
+        for _ in pb(range(20), label="Downloading..."):
             time.sleep(1)
 
 

examples/progress-bar/styled-tqdm-1.py

@@ -32,7 +32,7 @@ def main():
     ]
 
     with ProgressBar(style=style, formatters=custom_formatters) as pb:
-        for i in pb(range(1600), label="Installing"):
+        for _ in pb(range(1600), label="Installing"):
             time.sleep(0.01)
 
 

examples/progress-bar/styled-tqdm-2.py

@@ -30,7 +30,7 @@ def main():
     ]
 
     with ProgressBar(style=style, formatters=custom_formatters) as pb:
-        for i in pb(range(1600), label="Installing"):
+        for _ in pb(range(1600), label="Installing"):
             time.sleep(0.01)
 
 

examples/progress-bar/two-tasks.py

@@ -12,11 +12,11 @@ def main():
     with ProgressBar() as pb:
         # Two parallal tasks.
         def task_1():
-            for i in pb(range(100)):
+            for _ in pb(range(100)):
                 time.sleep(0.05)
 
         def task_2():
-            for i in pb(range(150)):
+            for _ in pb(range(150)):
                 time.sleep(0.08)
 
         # Start threads.

examples/progress-bar/unknown-length.py

@@ -18,7 +18,7 @@ def data():
 
 def main():
     with ProgressBar() as pb:
-        for i in pb(data()):
+        for _ in pb(data()):
             time.sleep(0.1)
 
 

examples/prompts/accept-default.py

@@ -6,11 +6,12 @@
 This should display the prompt with all the formatting like usual, but not
 allow any editing.
 """
+
 from prompt_toolkit import HTML, prompt
 
 if __name__ == "__main__":
     answer = prompt(
         HTML("<b>Type <u>some input</u>: </b>"), accept_default=True, default="test"
     )
 
-    print("You said: %s" % answer)
+    print(f"You said: {answer}")

examples/prompts/auto-completion/autocomplete-with-control-space.py

@@ -68,7 +68,7 @@ def main():
         complete_while_typing=False,
         key_bindings=kb,
     )
-    print("You said: %s" % text)
+    print(f"You said: {text}")
 
 
 if __name__ == "__main__":

examples/prompts/auto-completion/autocompletion-like-readline.py

@@ -51,7 +51,7 @@ def main():
         completer=animal_completer,
         complete_style=CompleteStyle.READLINE_LIKE,
     )
-    print("You said: %s" % text)
+    print(f"You said: {text}")
 
 
 if __name__ == "__main__":

examples/prompts/auto-completion/autocompletion.py

@@ -53,7 +53,7 @@ def main():
     text = prompt(
         "Give some animals: ", completer=animal_completer, complete_while_typing=False
     )
-    print("You said: %s" % text)
+    print(f"You said: {text}")
 
 
 if __name__ == "__main__":

examples/prompts/auto-completion/colored-completions.py

@@ -28,8 +28,8 @@ def get_completions(self, document, complete_event):
                 yield Completion(
                     color,
                     start_position=-len(word),
-                    style="fg:" + color,
-                    selected_style="fg:white bg:" + color,
+                    style=f"fg:{color}",
+                    selected_style=f"fg:white bg:{color}",
                 )
 
 

examples/prompts/auto-completion/combine-multiple-completers.py

@@ -69,7 +69,7 @@ def main():
     text = prompt(
         "Give some animals: ", completer=completer, complete_while_typing=False
     )
-    print("You said: %s" % text)
+    print(f"You said: {text}")
 
 
 if __name__ == "__main__":

examples/prompts/auto-completion/fuzzy-custom-completer.py

@@ -28,8 +28,8 @@ def get_completions(self, document, complete_event):
                 yield Completion(
                     color,
                     start_position=-len(word),
-                    style="fg:" + color,
-                    selected_style="fg:white bg:" + color,
+                    style=f"fg:{color}",
+                    selected_style=f"fg:white bg:{color}",
                 )
 
 

examples/prompts/auto-completion/fuzzy-word-completer.py

@@ -52,7 +52,7 @@ def main():
     text = prompt(
         "Give some animals: ", completer=animal_completer, complete_while_typing=True
     )
-    print("You said: %s" % text)
+    print(f"You said: {text}")
 
 
 if __name__ == "__main__":

examples/prompts/auto-completion/multi-column-autocompletion-with-meta.py

@@ -43,7 +43,7 @@ def main():
         completer=animal_completer,
         complete_style=CompleteStyle.MULTI_COLUMN,
     )
-    print("You said: %s" % text)
+    print(f"You said: {text}")
 
 
 if __name__ == "__main__":

examples/prompts/auto-completion/multi-column-autocompletion.py

@@ -50,7 +50,7 @@ def main():
         completer=animal_completer,
         complete_style=CompleteStyle.MULTI_COLUMN,
     )
-    print("You said: %s" % text)
+    print(f"You said: {text}")
 
 
 if __name__ == "__main__":

examples/prompts/auto-completion/nested-autocompletion.py

@@ -15,7 +15,7 @@
 
 def main():
     text = prompt("Type a command: ", completer=completer)
-    print("You said: %s" % text)
+    print(f"You said: {text}")
 
 
 if __name__ == "__main__":

examples/prompts/auto-suggestion.py

@@ -41,7 +41,7 @@ def main():
         else:
             break
 
-    print("You said: %s" % text)
+    print(f"You said: {text}")
 
 
 if __name__ == "__main__":

examples/prompts/autocorrection.py

@@ -28,10 +28,9 @@ def _(event):
         b = event.app.current_buffer
         w = b.document.get_word_before_cursor()
 
-        if w is not None:
-            if w in corrections:
-                b.delete_before_cursor(count=len(w))
-                b.insert_text(corrections[w])
+        if w is not None and w in corrections:
+            b.delete_before_cursor(count=len(w))
+            b.insert_text(corrections[w])
 
         b.insert_text(" ")
 

examples/prompts/clock-input.py

@@ -18,7 +18,7 @@ def get_prompt():
 
 def main():
     result = prompt(get_prompt, refresh_interval=0.5)
-    print("You said: %s" % result)
+    print(f"You said: {result}")
 
 
 if __name__ == "__main__":