Fixed typing issues in tempfile/tempfile_suffix.

Author: jonathanslenders

prompt_toolkit/buffer.py

@@ -43,7 +43,7 @@
 from .history import History, InMemoryHistory
 from .search import SearchDirection, SearchState
 from .selection import PasteMode, SelectionState, SelectionType
-from .utils import Event, call_if_callable
+from .utils import Event, to_str
 from .validation import ValidationError, Validator
 
 __all__ = [
@@ -1401,8 +1401,7 @@ def _editor_simple_tempfile(self) -> Tuple[str, Callable[[], None]]:
         Simple (file) tempfile implementation.
         Return (tempfile, cleanup_func).
         """
-        suffix = call_if_callable(self.tempfile_suffix)
-        suffix = str(suffix) if suffix else None
+        suffix = to_str(self.tempfile_suffix)
         descriptor, filename = tempfile.mkstemp(suffix)
 
         os.write(descriptor, self.text.encode('utf-8'))
@@ -1415,7 +1414,7 @@ def cleanup() -> None:
 
     def _editor_complex_tempfile(self) -> Tuple[str, Callable[[], None]]:
         # Complex (directory) tempfile implementation.
-        headtail = call_if_callable(self.tempfile)
+        headtail = to_str(self.tempfile)
         if not headtail:
             # Revert to simple case.
             return self._editor_simple_tempfile()

prompt_toolkit/shortcuts/prompt.py

@@ -129,7 +129,7 @@
     SwapLightAndDarkStyleTransformation,
     merge_style_transformations,
 )
-from prompt_toolkit.utils import get_cwidth, suspend_to_background_supported
+from prompt_toolkit.utils import get_cwidth, suspend_to_background_supported, to_str
 from prompt_toolkit.validation import DynamicValidator, Validator
 from prompt_toolkit.widgets.toolbars import (
     SearchToolbar,
@@ -481,8 +481,8 @@ def accept(buff: Buffer) -> bool:
             history=self.history,
             auto_suggest=DynamicAutoSuggest(lambda: self.auto_suggest),
             accept_handler=accept,
-            tempfile_suffix=lambda: self.tempfile_suffix,
-            tempfile=lambda: self.tempfile)
+            tempfile_suffix=lambda: to_str(self.tempfile_suffix or ''),
+            tempfile=lambda: to_str(self.tempfile or ''))
 
     def _create_search_buffer(self) -> Buffer:
         return Buffer(name=SEARCH_BUFFER)

prompt_toolkit/utils.py

@@ -26,7 +26,6 @@
     'is_windows',
     'in_main_thread',
     'take_using_weights',
-    'call_if_callable',
     'to_str',
     'to_int',
     'to_float',
@@ -262,14 +261,6 @@ def take_using_weights(
         i += 1
 
 
-def call_if_callable(value: Union[Callable[[], _T], _T]) -> _T:
-    " Call if callable, otherwise return as is.. "
-    if callable(value):
-        return call_if_callable(value())
-    else:
-        return value
-
-
 def to_str(value: Union[Callable[[], str], str]) -> str:
     " Turn callable or string into string. "
     if callable(value):