From a28f4bb75d2c9cc49b6e8d8d36ed53ff43d2a173 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 23 Nov 2022 00:33:37 -0800 Subject: [PATCH 1/1] New pylint likes explicit encodings --- git_cache.py | 6 +++--- test_git_cache.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/git_cache.py b/git_cache.py index 75f7b26..c7bcdd2 100644 --- a/git_cache.py +++ b/git_cache.py @@ -85,7 +85,7 @@ def _read_fetch_log(repo: Repo) -> Iterator[_LogEntry]: filename = _log_filename(repo) if not os.path.exists(filename): return - with open(filename, 'r') as f: + with open(filename, 'r', encoding='utf-8') as f: for line in f: _, _, rev, ref = line.strip().split(maxsplit=3) yield _LogEntry(ref, rev) @@ -107,7 +107,7 @@ def _log_fetch(repo: Repo, ref: Ref, rev: Rev, force: bool = False) -> None: verify_ancestry(repo, rev, prev_rev) filename = _log_filename(repo) os.makedirs(os.path.dirname(filename), exist_ok=True) - with open(filename, 'a') as f: + with open(filename, 'a', encoding='utf-8') as f: f.write( f'{time.strftime("%Y-%m%d-%H:%M:%S%z")} ' f'{"FORCEDFETCH" if force else "fetch"} {rev} {ref}\n' @@ -189,7 +189,7 @@ def fetch(repo: Repo, ref: Ref, force: bool = False) -> Tuple[Path, Rev]: logging.debug('Fetching ref "%s" from %s', ref, repo) _git_fetch(cachedir, repo, ref, force=force) - with open(os.path.join(cachedir, 'refs', 'heads', ref)) as rev_file: + with open(os.path.join(cachedir, 'refs', 'heads', ref), encoding='utf-8') as rev_file: rev = Rev(rev_file.read(999).strip()) verify_ancestry(repo, ref, rev, force=force) _log_fetch(repo, ref, rev, force=force) diff --git a/test_git_cache.py b/test_git_cache.py index cc3cf35..e97a788 100644 --- a/test_git_cache.py +++ b/test_git_cache.py @@ -27,7 +27,7 @@ def _commit_file( filename: str, contents: str, commit_message: str) -> None: - with open(os.path.join(directory, filename), 'w') as f: + with open(os.path.join(directory, filename), 'w', encoding='utf-8') as f: f.write(contents) _git(directory, 'add', filename) _git(directory, 'commit', '-m', commit_message) -- 2.44.1