Compare commits

..

No commits in common. "5091c904cb488703c9be6c0b2412603eca4ed2cb" and "c36b8c01ec78592c7e5ccdcb31a5c78c6ec76065" have entirely different histories.

5 changed files with 4 additions and 140 deletions

View File

@ -1,36 +0,0 @@
From 9a6437521131490a72e68813164885cecfd1232d Mon Sep 17 00:00:00 2001
From: kota-iizuka <64062831+kota-iizuka@users.noreply.github.com>
Date: Mon, 25 Mar 2024 23:24:53 +0900
Subject: [PATCH] [BugFix] fix permission denied error when lock file is placed
in `/tmp` (#317)
---
src/filelock/_unix.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/filelock/_unix.py b/src/filelock/_unix.py
index 4ee6033..4ae1fbe 100644
--- a/src/filelock/_unix.py
+++ b/src/filelock/_unix.py
@@ -4,6 +4,7 @@ import os
import sys
from contextlib import suppress
from errno import ENOSYS
+from pathlib import Path
from typing import cast
from ._api import BaseFileLock
@@ -35,7 +36,9 @@ else: # pragma: win32 no cover
def _acquire(self) -> None:
ensure_directory_exists(self.lock_file)
- open_flags = os.O_RDWR | os.O_CREAT | os.O_TRUNC
+ open_flags = os.O_RDWR | os.O_TRUNC
+ if not Path(self.lock_file).exists():
+ open_flags |= os.O_CREAT
fd = os.open(self.lock_file, open_flags, self._context.mode)
with suppress(PermissionError): # This locked is not owned by this UID
os.fchmod(fd, self._context.mode)
--
2.33.0

View File

@ -1,83 +0,0 @@
From 3f6df70c77df591473e1d9b5efdd073ca49d9a5e Mon Sep 17 00:00:00 2001
From: nefrob <25070989+nefrob@users.noreply.github.com>
Date: Mon, 25 Mar 2024 12:54:25 -0400
Subject: [PATCH] Make singleton class instance dict unique per subclass (#318)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: Bernát Gábor <gaborjbernat@gmail.com>
Reference: https://github.com/tox-dev/filelock/commit/3f6df70c77df591473e1d9b5efdd073ca49d9a5e#diff-002cb54f397bb2d2e9abfc11353165034eeb49d2fd8aeba0195c241bf5c3daca
---
src/filelock/_api.py | 9 +++++++--
tests/test_filelock.py | 15 +++++++++++++++
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/filelock/_api.py b/src/filelock/_api.py
index 49eaf1e..7bec3ce 100644
--- a/src/filelock/_api.py
+++ b/src/filelock/_api.py
@@ -8,7 +8,7 @@ import warnings
from abc import ABC, abstractmethod
from dataclasses import dataclass
from threading import local
-from typing import TYPE_CHECKING, Any, ClassVar
+from typing import TYPE_CHECKING, Any
from weakref import WeakValueDictionary
from ._error import Timeout
@@ -77,7 +77,7 @@ class ThreadLocalFileContext(FileLockContext, local):
class BaseFileLock(ABC, contextlib.ContextDecorator):
"""Abstract base class for a file lock object."""
- _instances: ClassVar[WeakValueDictionary[str, BaseFileLock]] = WeakValueDictionary()
+ _instances: WeakValueDictionary[str, BaseFileLock]
def __new__( # noqa: PLR0913
cls,
@@ -100,6 +100,11 @@ class BaseFileLock(ABC, contextlib.ContextDecorator):
return instance # type: ignore[return-value] # https://github.com/python/mypy/issues/15322
+ def __init_subclass__(cls, **kwargs: dict[str, Any]) -> None:
+ """Setup unique state for lock subclasses."""
+ super().__init_subclass__(**kwargs)
+ cls._instances = WeakValueDictionary()
+
def __init__( # noqa: PLR0913
self,
lock_file: str | os.PathLike[str],
diff --git a/tests/test_filelock.py b/tests/test_filelock.py
index 674d81a..f9a4e5f 100644
--- a/tests/test_filelock.py
+++ b/tests/test_filelock.py
@@ -14,6 +14,7 @@ from stat import S_IWGRP, S_IWOTH, S_IWUSR, filemode
from types import TracebackType
from typing import TYPE_CHECKING, Any, Callable, Iterator, Tuple, Type, Union
from uuid import uuid4
+from weakref import WeakValueDictionary
import pytest
@@ -687,3 +688,17 @@ def test_singleton_locks_are_deleted_when_no_external_references_exist(
assert lock_type._instances == {str(lock_path): lock} # noqa: SLF001
del lock
assert lock_type._instances == {} # noqa: SLF001
+
+
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="del() does not trigger GC in PyPy")
+@pytest.mark.parametrize("lock_type", [FileLock, SoftFileLock])
+def test_singleton_instance_tracking_is_unique_per_subclass(lock_type: type[BaseFileLock]) -> None:
+ class Lock1(lock_type): # type: ignore[valid-type, misc]
+ pass
+
+ class Lock2(lock_type): # type: ignore[valid-type, misc]
+ pass
+
+ assert isinstance(Lock1._instances, WeakValueDictionary) # noqa: SLF001
+ assert isinstance(Lock2._instances, WeakValueDictionary) # noqa: SLF001
+ assert Lock1._instances is not Lock2._instances # noqa: SLF001
--
2.18.2

BIN
filelock-3.12.0.tar.gz Normal file

Binary file not shown.

Binary file not shown.

View File

@ -1,12 +1,10 @@
Name: python-filelock
Version: 3.13.1
Release: 3
Version: 3.12.0
Release: 1
Summary: A platform independent file lock
License: Unlicense
URL: https://github.com/benediktschmitt/py-filelock
Source0: https://files.pythonhosted.org/packages/70/70/41905c80dcfe71b22fb06827b8eae65781783d4a14194bce79d16a013263/filelock-3.13.1.tar.gz
Patch0: 0001-BugFix-fix-permission-denied-error-when-lock-file-is.patch
Patch1: 0002-backport-Make-singleton-class-instance-dict-unique-per-subclass.patch
Source0: https://files.pythonhosted.org/packages/24/85/cf4df939cc0a037ebfe18353005e775916faec24dcdbc7a2f6539ad9d943/filelock-3.12.0.tar.gz
BuildArch: noarch
@ -43,7 +41,7 @@ independent file locking mechanism for Python.
%pyproject_build
%install
%pyproject_install
%pyproject_install filelock==%{version}
%check
export PYTHONPATH=%{buildroot}%{python3_sitelib}/
@ -64,21 +62,6 @@ pytest
%doc README.md
%changelog
* Fri May 10 2024 lixiaoyong <lixiaoyong@kylinos.cn> - 3.13.1-3
- Backport patch:Make singleton class instance dict unique per subclass
* Thu May 09 2024 wangxiaomeng <wangxiaomeng@kylinos.cn> - 3.13.1-2
- Backport patch:fix permission denied error when lock file is placed in /tmp
* Wed Dec 06 2023 jiangxinyu <jiangxinyu@kylinos.cn> - 3.13.1-1
- Update package to version 3.13.1
* Thu Oct 26 2023 jiangxinyu <jiangxinyu@kylinos.cn> - 3.12.4-1
- Update package to version 3.12.4
* Wed Jun 21 2023 chendexi <chendexi@kylinos.cn> - 3.12.2-1
- Update package to version 3.12.2
* Thu Apr 27 2023 xu_ping <707078654@qq.com> - 3.12.0-1
- Upgrade to 3.12.0