Skip to content

Hotfix: Restore __init__ method; more robust initialization for singleton locks #338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Jun 12, 2024
Merged

Hotfix: Restore __init__ method; more robust initialization for singleton locks #338

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
adefc41
Restore __init__ method and use different strategy to bypass initiali…
ethanbb Jun 12, 2024
0d3d1cb
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 12, 2024
fa8fb4e
Fix previous commit
ethanbb Jun 12, 2024
59010cc
Merge branch 'init-signature-fix' of github.com:ethanbb/filelock into…
ethanbb Jun 12, 2024
42ee730
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 12, 2024
6df00e7
Another fix
ethanbb Jun 12, 2024
cfa4461
Merge branch 'init-signature-fix' of github.com:ethanbb/filelock into…
ethanbb Jun 12, 2024
9c07da7
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 12, 2024
57c4a31
Improve subclass test; put singleton validation in __init__
ethanbb Jun 12, 2024
cddd7ae
Better error message for non-matching arguments
ethanbb Jun 12, 2024
e667171
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 12, 2024
18544de
Add test for all arg differences for singleton locks
ethanbb Jun 12, 2024
8acba23
Make non_matching_params lines more idiomatic
ethanbb Jun 12, 2024
3775b03
Fix test failure due to not deleting exc_info
ethanbb Jun 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Another fix
  • Loading branch information
@ethanbb
ethanbb committed Jun 12, 2024
commit 6df00e7b07b6e47d3a152de2e9430d039506cccd
7 changes: 0 additions & 7 deletions src/filelock/_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,14 +114,7 @@ def __init_subclass__(cls, **kwargs: dict[str, Any]) -> None:
super().__init_subclass__(**kwargs)
cls._instances = WeakValueDictionary()

<<<<<<< HEAD
def __init__( # noqa: PLR0913
=======
def __init__(self, *args, **kwargs) -> None:
pass # for backwards compatibility (don't break super().__init__ calls)

def _initialize( # noqa: PLR0913
>>>>>>> 0d3d1cbd7830a436223d4e93712e7116237de86b
self,
lock_file: str | os.PathLike[str],
timeout: float = -1,
Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy