changed from os.umask to os.chmod

docs/changelog.rst

@@ -1,5 +1,9 @@
 Changelog
 =========
+v3.10.2 (2023-03-22)
+--------------------
+- Bug fix for using filelock with threaded programs causing undesired file permissions - by :user:`jahrules`.
+
 v3.10.1 (2023-03-22)
 --------------------
 - Handle pickle for :class:`filelock.Timeout` :pr:`203` - by :user:`TheMatt2`.

src/filelock/_api.py

@@ -179,11 +179,7 @@ def acquire(
                 with self._thread_lock:
                     if not self.is_locked:
                         _LOGGER.debug("Attempting to acquire lock %s on %s", lock_id, lock_filename)
-                        previous_umask = os.umask(0)
-                        try:
-                            self._acquire()
-                        finally:
-                            os.umask(previous_umask)  # reset umask to initial value
+                        self._acquire()
                 if self.is_locked:
                     _LOGGER.debug("Lock %s acquired on %s", lock_id, lock_filename)
                     break

src/filelock/_soft.py

@@ -22,6 +22,7 @@ def _acquire(self) -> None:
         )
         try:
             fd = os.open(self._lock_file, flags, self._mode)
+            os.chmod(fd, self._mode)
         except OSError as exception:
             if exception.errno == EEXIST:  # expected if cannot lock
                 pass

src/filelock/_unix.py

@@ -32,7 +32,8 @@ class UnixFileLock(BaseFileLock):
 
         def _acquire(self) -> None:
             open_flags = os.O_RDWR | os.O_CREAT | os.O_TRUNC
-            fd = os.open(self._lock_file, open_flags, self._mode)
+            fd = os.open(self._lock_file, open_flags)
+            os.chmod(fd, self._mode)
             try:
                 fcntl.flock(fd, fcntl.LOCK_EX | fcntl.LOCK_NB)
             except OSError:

src/filelock/_windows.py

@@ -22,7 +22,8 @@ def _acquire(self) -> None:
                 | os.O_TRUNC  # truncate file  if not empty
             )
             try:
-                fd = os.open(self._lock_file, flags, self._mode)
+                fd = os.open(self._lock_file, flags)
+                os.chmod(fd, self._mode)
             except OSError as exception:
                 if exception.errno == ENOENT:  # No such file or directory
                     raise

whitelist.txt

@@ -4,6 +4,7 @@ autosectionlabel
 caplog
 eacces
 extlinks
+fchmod
 filelock
 filemode
 frameinfo