@@ -355,13 +355,15 @@ def __init__(
355355 opener : Callable [..., T_File ],
356356 * args : Any ,
357357 mode : Any = _OMIT_MODE ,
358+ lock : Lock | None | Literal [False ] = None ,
358359 kwargs : Mapping [str , Any ] | None = None ,
359360 ):
360361 kwargs = {} if kwargs is None else dict (kwargs )
361362 self ._opener = opener
362363 self ._args = args
363364 self ._mode = "a" if mode == "w" else mode
364365 self ._kwargs = kwargs
366+ self ._lock = lock
365367
366368 # Note: No need for locking with PickleableFileManager, because all
367369 # opening of files happens in the constructor.
@@ -391,10 +393,13 @@ def acquire_context(self, needs_lock: bool = True) -> Iterator[T_File]:
391393 yield self ._get_unclosed_file ()
392394
393395 def close (self , needs_lock : bool = True ) -> None :
394- del needs_lock # unused
395396 if not self ._closed :
396397 file = self ._get_unclosed_file ()
397- file .close ()
398+ if needs_lock and self ._lock :
399+ with self ._lock :
400+ file .close ()
401+ else :
402+ file .close ()
398403 self ._file = None
399404 # Remove all references to opener arguments, so they can be garbage
400405 # collected.
@@ -417,11 +422,11 @@ def __del__(self) -> None:
417422 def __getstate__ (self ):
418423 # file is intentionally omitted: we want to open it again
419424 opener = _get_none if self ._closed else self ._opener
420- return (opener , self ._args , self ._mode , self ._kwargs )
425+ return (opener , self ._args , self ._mode , self ._lock , self . _kwargs )
421426
422427 def __setstate__ (self , state ) -> None :
423- opener , args , mode , kwargs = state
424- self .__init__ (opener , * args , mode = mode , kwargs = kwargs ) # type: ignore[misc]
428+ opener , args , mode , lock , kwargs = state
429+ self .__init__ (opener , * args , mode = mode , lock = lock , kwargs = kwargs ) # type: ignore[misc]
425430
426431 def __repr__ (self ) -> str :
427432 if self ._closed :
@@ -448,9 +453,16 @@ def _remove_del_methods():
448453class DummyFileManager (FileManager [T_File ]):
449454 """FileManager that simply wraps an open file in the FileManager interface."""
450455
451- def __init__ (self , value : T_File , * , close : Callable [[], None ] | None = None ):
456+ def __init__ (
457+ self ,
458+ value : T_File ,
459+ * ,
460+ close : Callable [[], None ] | None = None ,
461+ lock : Lock | None | Literal [False ] = None ,
462+ ):
452463 if close is None :
453464 close = value .close
465+ self ._lock = lock
454466 self ._value = value
455467 self ._close = close
456468
@@ -464,5 +476,8 @@ def acquire_context(self, needs_lock: bool = True) -> Iterator[T_File]:
464476 yield self ._value
465477
466478 def close (self , needs_lock : bool = True ) -> None :
467- del needs_lock # unused
468- self ._close ()
479+ if needs_lock and self ._lock :
480+ with self ._lock :
481+ self ._close ()
482+ else :
483+ self ._close ()
0 commit comments