platformdirs 4.13.0__tar.gz → 4.13.2__tar.gz

{platformdirs-4.13.0 → platformdirs-4.13.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: platformdirs
-Version: 4.13.0
+Version: 4.13.2
 Summary: A small Python package for determining appropriate platform-specific dirs, e.g. a `user data dir`.
 Project-URL: Changelog, https://platformdirs.readthedocs.io/en/latest/changelog.html
 Project-URL: Documentation, https://platformdirs.readthedocs.io

{platformdirs-4.13.0 → platformdirs-4.13.2}/src/platformdirs/_xdg.py

@@ -132,7 +132,8 @@ class XDGMixin(PlatformDirsABC):
     def user_fonts_dir(self) -> str:
         """Fonts directory tied to the user, from ``$XDG_DATA_HOME/fonts`` if set, else platform default."""
         if path := _xdg_dir("XDG_DATA_HOME"):
-            return f"{os.path.expanduser(path)}/fonts"  # ruff:ignore[os-path-expanduser]  # API returns str, not Path
+            # posixpath keeps the XDG separator even when this mixin runs on a non-POSIX host.
+            return posixpath.join(path, "fonts")
         return super().user_fonts_dir
 
     @property

{platformdirs-4.13.0 → platformdirs-4.13.2}/src/platformdirs/unix.py

@@ -354,7 +354,7 @@ def _resolve_user_dirs_value(entry: re.Match[str]) -> str | None:
         return None
     if entry["quoted"] is not None:
         # xdg-user-dirs-update backslash-escapes $, `, " and \ inside the quotes.
-        value = re.sub(r"\\(.)", r"\1", value)
+        value = re.sub(r'\\([$`"\\])', r"\1", value)
     return prefix + value
 
 

{platformdirs-4.13.0 → platformdirs-4.13.2}/src/platformdirs/version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '4.13.0'
-__version_tuple__ = version_tuple = (4, 13, 0)
+__version__ = version = '4.13.2'
+__version_tuple__ = version_tuple = (4, 13, 2)
 
 __commit_id__ = commit_id = None

{platformdirs-4.13.0 → platformdirs-4.13.2}/src/platformdirs/windows.py

@@ -355,9 +355,11 @@ def _build_get_win_folder_via_ctypes() -> Callable[[str], str]:
         ole32.CLSIDFromString(folder_guid, byref(guid))
 
         path_ptr = wintypes.LPWSTR()
-        shell32.SHGetKnownFolderPath(byref(guid), _KF_FLAG_DONT_VERIFY, None, byref(path_ptr))
-        result = path_ptr.value
-        ole32.CoTaskMemFree(path_ptr)
+        try:
+            shell32.SHGetKnownFolderPath(byref(guid), _KF_FLAG_DONT_VERIFY, None, byref(path_ptr))
+            result = path_ptr.value
+        finally:
+            ole32.CoTaskMemFree(path_ptr)
 
         if result is None:
             msg = f"SHGetKnownFolderPath returned NULL for {csidl_name}"

{platformdirs-4.13.0 → platformdirs-4.13.2}/tests/test_unix.py

@@ -701,6 +701,19 @@ def test_without_home_absolute_xdg_dir_applies(
     assert getattr(dirs_class(appname="app"), prop) == f"/xdg{suffix}"
 
 
+@pytest.mark.usefixtures("_clear_xdg_env")
+@pytest.mark.parametrize("dirs_class", _CLASSES)
+@pytest.mark.parametrize(
+    ("data_home", "expected"),
+    [pytest.param("/", "/fonts", id="root"), pytest.param("/xdg/", "/xdg/fonts", id="trailing_slash")],
+)
+def test_user_fonts_dir_xdg_trailing_separator(
+    monkeypatch: pytest.MonkeyPatch, dirs_class: type[Unix | MacOS], data_home: str, expected: str
+) -> None:
+    monkeypatch.setenv("XDG_DATA_HOME", data_home)
+    assert dirs_class().user_fonts_dir == expected
+
+
 @pytest.mark.usefixtures("_clear_xdg_env", "_unknown_home")
 def test_without_home_absolute_user_dirs_entry_applies(monkeypatch: pytest.MonkeyPatch, tmp_path: Path) -> None:
     (tmp_path / "user-dirs.dirs").write_text('XDG_DOCUMENTS_DIR="/srv/docs"\n', encoding="utf-8")
@@ -1282,6 +1295,29 @@ def test_user_dirs_preserves_percent_signs(folder: str, base: str, tmp_path: Pat
     assert Unix().user_documents_path == Path(tmp_path if base == "$HOME" else base) / folder
 
 
+@pytest.mark.parametrize(
+    ("folder", "expected"),
+    [
+        pytest.param(r"a\q", r"a\q", id="ordinary-letter"),
+        pytest.param(r"a\ b", r"a\ b", id="space"),
+        pytest.param(r"a\-b", r"a\-b", id="hyphen"),
+        pytest.param(r"a\nb", r"a\nb", id="literal-backslash-n"),
+        pytest.param(r"a\'b", r"a\'b", id="single-quote"),
+        pytest.param(r"a\\b", r"a\b", id="escaped-backslash"),
+        pytest.param(r"a\$b", "a$b", id="escaped-dollar"),
+        pytest.param(r"a\`b", "a`b", id="escaped-backtick"),
+        pytest.param(r"a\"b", 'a"b', id="escaped-double-quote"),
+        pytest.param(r"a\q\\b\$c", r"a\q\b$c", id="mixed-escapes"),
+    ],
+)
+@pytest.mark.parametrize("base", ["$HOME", "/absolute"])
+def test_user_dirs_double_quoted_backslashes(
+    folder: str, expected: str, base: str, tmp_path: Path, user_dirs_file: Path
+) -> None:
+    user_dirs_file.write_text(f'XDG_DOCUMENTS_DIR="{base}/{folder}"\n', encoding="utf-8")
+    assert Unix().user_documents_path == Path(tmp_path if base == "$HOME" else base) / expected
+
+
 @pytest.mark.parametrize(
     ("content", "expected"),
     [

{platformdirs-4.13.0 → platformdirs-4.13.2}/tests/test_windows.py

@@ -483,6 +483,29 @@ def test_get_win_folder_via_ctypes_null_result(mocker: MockerFixture) -> None:
         _cleanup_ctypes_mocks()
 
 
+@pytest.mark.parametrize(
+    "path",
+    [pytest.param(None, id="null"), pytest.param(r"C:\Users\Test\AppData\Local", id="populated")],
+)
+def test_get_win_folder_via_ctypes_frees_path_on_error(mocker: MockerFixture, path: str | None) -> None:
+    _setup_ctypes_mocks(mocker)
+    error = OSError("SHGetKnownFolderPath failed")
+    dlls = {"ole32": MagicMock(), "shell32": MagicMock(SHGetKnownFolderPath=MagicMock(side_effect=error))}
+    mocker.patch.object(ctypes, "WinDLL", MagicMock(side_effect=dlls.__getitem__))
+    mocker.patch("ctypes.byref", side_effect=lambda x: x)
+    path_ptr = MagicMock(value=path)
+    mocker.patch("ctypes.wintypes.LPWSTR", return_value=path_ptr)
+
+    try:
+        importlib.reload(windows)
+        with pytest.raises(OSError, match=r"^SHGetKnownFolderPath failed$"):
+            windows.get_win_folder_via_ctypes("CSIDL_LOCAL_APPDATA")
+    finally:
+        _cleanup_ctypes_mocks()
+
+    dlls["ole32"].CoTaskMemFree.assert_called_once_with(path_ptr)
+
+
 def _short_name(_long: str, buf: ctypes.Array[ctypes.c_wchar], _size: int) -> int:
     buf.value = r"C:\Users\UKASZ~1\AppData\Local"
     return len(buf.value)