diff options
author | kotfu <kotfu@kotfu.net> | 2019-05-25 15:12:52 -0600 |
---|---|---|
committer | kotfu <kotfu@kotfu.net> | 2019-05-25 15:12:52 -0600 |
commit | 2c96da06b2009760bebc20bec1980bf34df93d86 (patch) | |
tree | 5d66a25f2331be1b55df07182e86a6eaca242ff6 | |
parent | 8fd6d50a58764ad0f8fa6e38fbce60b2b2a52014 (diff) | |
download | cmd2-git-2c96da06b2009760bebc20bec1980bf34df93d86.tar.gz |
Switch back to os.path from pathlib
python 3.4 pathlib doesn’t have .expanduser()
-rw-r--r-- | cmd2/cmd2.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/cmd2/cmd2.py b/cmd2/cmd2.py index f7c91172..8310da93 100644 --- a/cmd2/cmd2.py +++ b/cmd2/cmd2.py @@ -34,7 +34,6 @@ import cmd import glob import inspect import os -import pathlib import pickle import re import sys @@ -3466,29 +3465,29 @@ class Cmd(cmd.Cmd): self.persistent_history_file = hist_file return - histpath = pathlib.Path(hist_file).expanduser().resolve() + hist_file = os.path.expanduser(hist_file) # first we try and unpickle the history file history = History() # on Windows, trying to open a directory throws a permission # error, not a `IsADirectoryError`. So we'll check it ourselves. - if histpath.is_dir(): + if os.path.isdir(hist_file): msg = "persistent history file '{}' is a directory" - self.perror(msg.format(histpath)) + self.perror(msg.format(hist_file)) return try: - with open(str(histpath), 'rb') as fobj: + with open(hist_file, 'rb') as fobj: history = pickle.load(fobj) except (FileNotFoundError, KeyError, EOFError): pass except OSError as ex: msg = "can not read persistent history file '{}': {}" - self.perror(msg.format(histpath, ex), traceback_war=False) + self.perror(msg.format(hist_file, ex), traceback_war=False) return self.history = history - self.persistent_history_file = str(histpath) + self.persistent_history_file = hist_file # populate readline history if rl_type != RlType.NONE: |