Merge branch 'release/2.10.1'

wolph · Jul 13, 2024 · 4d5905f · 4d5905f
2 parents 06d58c4 + c2c433d
commit 4d5905f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/portalocker/__about__.py b/portalocker/__about__.py
@@ -1,6 +1,6 @@
 __package_name__ = 'portalocker'
 __author__ = 'Rick van Hattem'
 __email__ = '[email protected]'
-__version__ = '2.10.0'
+__version__ = '2.10.1'
 __description__ = '''Wraps the portalocker recipe for easy usage'''
 __url__ = 'https://github.com/WoLpH/portalocker'
diff --git a/portalocker/__init__.py b/portalocker/__init__.py
@@ -20,7 +20,7 @@
 #: Current author's email address
 __email__ = __about__.__email__
 #: Version number
-__version__ = '2.10.0'
+__version__ = '2.10.1'
 #: Package description for Pypi
 __description__ = __about__.__description__
 #: Package homepage

diff --git a/portalocker/portalocker.py b/portalocker/portalocker.py
@@ -103,7 +103,7 @@ def unlock(file_: typing.IO):
     LOCKER = fcntl.flock
 
     def lock(file_: typing.Union[typing.IO, int], flags: LockFlags):
-        assert LOCKER is not None, 'We need a locing function in `LOCKER` '
+        assert LOCKER is not None, 'We need a locking function in `LOCKER` '
         # Locking with NON_BLOCKING without EXCLUSIVE or SHARED enabled
         # results in an error
         if (flags & LockFlags.NON_BLOCKING) and not flags & (
@@ -147,7 +147,7 @@ def lock(file_: typing.Union[typing.IO, int], flags: LockFlags):
             ) from exc_value
 
     def unlock(file_: typing.IO):
-        assert LOCKER is not None, 'We need a locing function in `LOCKER` '
+        assert LOCKER is not None, 'We need a locking function in `LOCKER` '
         LOCKER(file_.fileno(), LockFlags.UNBLOCK)
 
 else:  # pragma: no cover

diff --git a/portalocker_tests/tests.py b/portalocker_tests/tests.py
@@ -354,13 +354,13 @@ def test_exclusive_processes(tmpfile: str, fail_when_locked: bool, locker):
         result_b = pool.apply_async(lock, [tmpfile, fail_when_locked, flags])
 
         try:
-            a = result_a.get(timeout=1.0)  # Wait for 'a' with timeout
+            a = result_a.get(timeout=1.1)  # Wait for 'a' with timeout
         except multiprocessing.TimeoutError:
             a = None
 
         try:
             # Lower timeout since we already waited with `a`
-            b = result_b.get(timeout=0.1)  # Wait for 'b' with timeout
+            b = result_b.get(timeout=0.2)  # Wait for 'b' with timeout
         except multiprocessing.TimeoutError:
             b = None