Reverting to abspath,minor simplifications

5 files changed, 21 insertions, 32 deletions

diff --git a/qutebrowser/utils/standarddir.py b/qutebrowser/utils/standarddir.py
index 6eeacb5f3..5f23a12a8 100644
--- a/qutebrowser/utils/standarddir.py
+++ b/qutebrowser/utils/standarddir.py
@@ -20,6 +20,7 @@
 """Utilities to get and initialize data/config paths."""
 
 import os
+import os.path
 import pathlib
 import sys
 import contextlib
@@ -301,7 +302,7 @@ def _from_args(
         suffix = basedir_suffix[typ]
     except KeyError:  # pragma: no cover
         return None
-    return str((pathlib.Path(args.basedir) / suffix).resolve())
+    return os.path.abspath(pathlib.Path(args.basedir) / suffix)
 
 
 def _create(path: str) -> None:
diff --git a/tests/unit/utils/test_qtutils.py b/tests/unit/utils/test_qtutils.py
index 12425845f..2d98feece 100644
--- a/tests/unit/utils/test_qtutils.py
+++ b/tests/unit/utils/test_qtutils.py
@@ -442,8 +442,7 @@ class TestSavefileOpen:
         filename.write_text("Old data", encoding="utf-8")
         with qtutils.savefile_open(str(filename)) as f:
             f.write(data)
-        for x in tmp_path.iterdir():
-            assert x == filename
+        assert list(tmp_path.iterdir()) == [filename]
         assert filename.read_text(encoding='utf-8') == data
 
     def test_binary(self, tmp_path):
@@ -451,8 +450,7 @@ class TestSavefileOpen:
         filename = tmp_path / 'foo'
         with qtutils.savefile_open(str(filename), binary=True) as f:
             f.write(b'\xde\xad\xbe\xef')
-        for x in tmp_path.iterdir():
-            assert x == filename
+        assert list(tmp_path.iterdir()) == [filename]
         assert filename.read_bytes() == b'\xde\xad\xbe\xef'
 
     def test_exception(self, tmp_path):
@@ -463,8 +461,7 @@ class TestSavefileOpen:
             with qtutils.savefile_open(str(filename)) as f:
                 f.write("Hello World!")
                 raise SavefileTestException
-        for x in tmp_path.iterdir():
-            assert x == filename
+        assert list(tmp_path.iterdir()) == [filename]
         assert filename.read_text(encoding='utf-8') == "Old content"
 
     def test_existing_dir(self, tmp_path):
@@ -477,8 +474,7 @@ class TestSavefileOpen:
 
         msg = "Filename refers to a directory: {!r}".format(str(filename))
         assert str(excinfo.value) == msg
-        for x in tmp_path.iterdir():
-            assert x == filename
+        assert list(tmp_path.iterdir()) == [filename]
 
     def test_failing_flush(self, tmp_path):
         """Test with the file being closed before flushing."""
@@ -488,8 +484,7 @@ class TestSavefileOpen:
                 f.write(b'Hello')
                 f.dev.commit()  # provoke failing flush
 
-        for x in tmp_path.iterdir():
-            assert x == filename
+        assert list(tmp_path.iterdir()) == [filename]
 
     def test_failing_commit(self, tmp_path):
         """Test with the file being closed before committing."""
@@ -499,8 +494,7 @@ class TestSavefileOpen:
                 f.write(b'Hello')
                 f.dev.cancelWriting()  # provoke failing commit
 
-        for x in tmp_path.iterdir():
-            assert x == []
+        assert list(tmp_path.iterdir()) == []
 
     def test_line_endings(self, tmp_path):
         """Make sure line endings are translated correctly.
diff --git a/tests/unit/utils/test_standarddir.py b/tests/unit/utils/test_standarddir.py
index 1eec4fa82..f160c9290 100644
--- a/tests/unit/utils/test_standarddir.py
+++ b/tests/unit/utils/test_standarddir.py
@@ -140,7 +140,7 @@ class TestWritableLocation:
     def test_sep(self, monkeypatch):
         """Make sure the right kind of separator is used."""
         monkeypatch.setattr(standarddir.os, 'sep', '\\')
-        monkeypatch.setattr(standarddir.pathlib.Path, 'joinpath',
+        monkeypatch.setattr(standarddir.pathlib, 'Path',
                             lambda *parts: '\\'.join(parts))
         loc = standarddir._writable_location(QStandardPaths.AppDataLocation)
         assert '/' not in loc
@@ -194,13 +194,13 @@ class TestStandardDir:
         reason="Qt 5.14 automatically creates missing runtime dirs")
     def test_linux_invalid_runtimedir(self, monkeypatch, tmp_path):
         """With invalid XDG_RUNTIME_DIR, fall back to TempLocation."""
-        tmp_path_env = tmp_path / 'temp'
-        tmp_path_env.mkdir()
+        tmpdir_env = tmp_path / 'temp'
+        tmpdir_env.mkdir()
         monkeypatch.setenv('XDG_RUNTIME_DIR', str(tmp_path / 'does-not-exist'))
-        monkeypatch.setenv('TMPDIR', str(tmp_path_env))
+        monkeypatch.setenv('TMPDIR', str(tmpdir_env))
 
         standarddir._init_runtime(args=None)
-        assert standarddir.runtime() == str(tmp_path_env / APPNAME)
+        assert standarddir.runtime() == str(tmpdir_env / APPNAME)
 
     @pytest.mark.fake_os('windows')
     def test_runtimedir_empty_tempdir(self, monkeypatch, tmp_path):
@@ -301,8 +301,7 @@ class TestInitCacheDirTag:
         """Test creating a new CACHEDIR.TAG."""
         monkeypatch.setattr(standarddir, 'cache', lambda: str(tmp_path))
         standarddir._init_cachedir_tag()
-        for x in tmp_path.iterdir():
-            assert x == tmp_path / 'CACHEDIR.TAG'
+        assert list(tmp_path.iterdir()) == [(tmp_path / 'CACHEDIR.TAG')]
         data = (tmp_path / 'CACHEDIR.TAG').read_text('utf-8')
         assert data == textwrap.dedent("""
             Signature: 8a477f597d28d172789f06886806bc55
@@ -355,13 +354,10 @@ class TestCreatingDir:
         """
         (tmp_path / typ).mkdir()
 
-        m = mocker.patch('qutebrowser.utils.standarddir.pathlib')
-        m.Path.mkdir = pathlib.Path.mkdir
-        m.sep = '/'
-        m.Path.joinpath = pathlib.Path.joinpath
-        m.Path.expanduser = pathlib.Path.expanduser
-        m.Path.exists.return_value = False
-        m.Path.resolve = lambda x: x
+        m = mocker.patch('qutebrowser.utils.standarddir.pathlib.Path.exists')
+        j = mocker.patch('qutebrowser.utils.standarddir.pathlib.Path.resolve')
+        m.return_value = False
+        j.return_value = lambda x: x
 
         args = types.SimpleNamespace(basedir=str(tmp_path))
         standarddir._init_dirs(args)
diff --git a/tests/unit/utils/test_utils.py b/tests/unit/utils/test_utils.py
index 553df52ca..0019efe5d 100644
--- a/tests/unit/utils/test_utils.py
+++ b/tests/unit/utils/test_utils.py
@@ -837,8 +837,7 @@ class TestYaml:
 
     def test_dump_file(self, tmp_path):
         tmpfile = tmp_path / 'foo.yml'
-        with tmpfile.open('w', encoding='utf-8') as f:
-            utils.yaml_dump([1, 2], f)
+        tmpfile.write_text(utils.yaml_dump([1, 2]), encoding='utf-8')
         assert tmpfile.read_text() == '- 1\n- 2\n'
 
 
diff --git a/tests/unit/utils/test_version.py b/tests/unit/utils/test_version.py
index 40569c5ff..c75d1cef2 100644
--- a/tests/unit/utils/test_version.py
+++ b/tests/unit/utils/test_version.py
@@ -347,9 +347,8 @@ class GitStrSubprocessFake:
         retval = self.retval
         self.retval = self.UNSET
         gitpath = pathlib.Path(gitpath).resolve()
-        p = pathlib.Path(qutebrowser.__file__).parent
-        expected = p.parent
-        assert str(gitpath) == str(expected)
+        expected = pathlib.Path(qutebrowser.__file__).parent.parent
+        assert gitpath == expected
         return retval