Merge branch 'test-pathlib'

rwe · rwe · commit 7dfc6b802915 · 2022-01-10T11:43:56.000-08:00
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -3,12 +3,12 @@
 import pytest
 import shlex
 import os
-import py.path
 import sys
 import tempfile
 import textwrap
 import subprocess
 import traceback
+from pathlib import Path
 from gitrevise.odb import Repository
 from gitrevise.utils import sh_path
 from contextlib import contextmanager
@@ -67,7 +67,7 @@ def repo(hermetic_seal):
 @pytest.fixture
 def short_tmpdir():
     with tempfile.TemporaryDirectory() as tdir:
-        yield py.path.local(tdir)
+        yield Path(tdir)
 
 
 @contextmanager
diff --git a/tests/test_gpgsign.py b/tests/test_gpgsign.py
@@ -26,7 +26,7 @@ def test_gpgsign(repo, short_tmpdir, monkeypatch):
         monkeypatch.setenv("GNUPGHOME", str(gnupghome))
 
     gnupghome.chmod(0o700)
-    (gnupghome / "gpg.conf").write("pinentry-mode loopback")
+    (gnupghome / "gpg.conf").write_text("pinentry-mode loopback")
     user_ident = repo.default_author.signing_key
     sh_run(
         ["gpg", "--batch", "--passphrase", "", "--quick-gen-key", user_ident],
