Change filenames in History to Path

sebastinas · sebastinas · commit cc3bac7e552c · 2022-05-04T11:09:59.000+02:00
diff --git a/bpython/history.py b/bpython/history.py
@@ -22,9 +22,10 @@
 # THE SOFTWARE.
 
 import os
+from pathlib import Path
 import stat
 from itertools import islice, chain
-from typing import Iterable, Optional, List, TextIO
+from typing import Iterable, Optional, List, TextIO, Union
 
 from .translations import _
 from .filelock import FileLock
@@ -190,9 +191,9 @@ def reset(self) -> None:
         self.index = 0
         self.saved_line = ""
 
-    def load(self, filename: str, encoding: str) -> None:
+    def load(self, filename: Path, encoding: str) -> None:
         with open(filename, encoding=encoding, errors="ignore") as hfile:
-            with FileLock(hfile, filename=filename):
+            with FileLock(hfile, filename=str(filename)):
                 self.entries = self.load_from(hfile)
 
     def load_from(self, fd: TextIO) -> List[str]:
@@ -201,14 +202,14 @@ def load_from(self, fd: TextIO) -> List[str]:
             self.append_to(entries, line)
         return entries if len(entries) else [""]
 
-    def save(self, filename: str, encoding: str, lines: int = 0) -> None:
+    def save(self, filename: Path, encoding: str, lines: int = 0) -> None:
         fd = os.open(
             filename,
             os.O_WRONLY | os.O_CREAT | os.O_TRUNC,
             stat.S_IRUSR | stat.S_IWUSR,
         )
         with open(fd, "w", encoding=encoding, errors="ignore") as hfile:
-            with FileLock(hfile, filename=filename):
+            with FileLock(hfile, filename=str(filename)):
                 self.save_to(hfile, self.entries, lines)
 
     def save_to(
@@ -221,7 +222,7 @@ def save_to(
             fd.write("\n")
 
     def append_reload_and_write(
-        self, s: str, filename: str, encoding: str
+        self, s: str, filename: Path, encoding: str
     ) -> None:
         if not self.hist_size:
             return self.append(s)
@@ -233,7 +234,7 @@ def append_reload_and_write(
                 stat.S_IRUSR | stat.S_IWUSR,
             )
             with open(fd, "a+", encoding=encoding, errors="ignore") as hfile:
-                with FileLock(hfile, filename=filename):
+                with FileLock(hfile, filename=str(filename)):
                     # read entries
                     hfile.seek(0, os.SEEK_SET)
                     entries = self.load_from(hfile)
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -520,7 +520,7 @@ def __init__(self, interp: Interpreter, config: Config):
         if self.config.hist_file.exists():
             try:
                 self.rl_history.load(
-                    str(self.config.hist_file),
+                    self.config.hist_file,
                     getpreferredencoding() or "ascii",
                 )
             except OSError:
@@ -744,7 +744,7 @@ def get_source_of_current_name(self) -> str:
                 msg = _("No source code found for %s") % (self.current_line,)
         raise SourceNotFound(msg)
 
-    def set_docstring(self):
+    def set_docstring(self) -> None:
         self.docstring = None
         if not self.get_args():
             self.funcprops = None
@@ -1009,7 +1009,7 @@ def push(self, s, insert_into_history=True) -> bool:
 
         return more
 
-    def insert_into_history(self, s):
+    def insert_into_history(self, s: str):
         try:
             self.rl_history.append_reload_and_write(
                 s, self.config.hist_file, getpreferredencoding()
diff --git a/bpython/test/test_history.py b/bpython/test/test_history.py
@@ -86,7 +86,7 @@ def test_reset(self):
 class TestHistoryFileAccess(unittest.TestCase):
     def setUp(self):
         self.tempdir = tempfile.TemporaryDirectory()
-        self.filename = str(Path(self.tempdir.name) / "history_temp_file")
+        self.filename = Path(self.tempdir.name) / "history_temp_file"
         self.encoding = getpreferredencoding()
 
         with open(
