safer 5.0.0__py3-none-any.whl → 5.1.0__py3-none-any.whl

safer/__init__.py

@@ -147,6 +147,8 @@ With `safer`
         # Either the whole file is written, or nothing
 
 """
+from __future__ import annotations
+
 import contextlib
 import functools
 import io
@@ -162,15 +164,15 @@ __all__ = 'writer', 'open', 'closer', 'dump', 'printer'
 
 
 def writer(
-    stream: t.Union[t.Callable, None, t.IO, Path, str] = None,
-    is_binary: t.Optional[bool] = None,
+    stream: t.Callable | None | t.IO | Path | str = None,
+    is_binary: bool | None = None,
     close_on_exit: bool = False,
     temp_file: bool = False,
     chunk_size: int = 0x100000,
     delete_failures: bool = True,
-    dry_run: t.Union[bool, t.Callable] = False,
+    dry_run: bool | t.Callable = False,
     enabled: bool = True,
-) -> t.Union[t.Callable, t.IO]:
+) -> t.Callable | t.IO:
     """
     Write safely to file streams, sockets and callables.
 
@@ -231,78 +233,84 @@ def writer(
     if not enabled:
         return stream
 
-    write: t.Optional[t.Callable]
+    write: t.Callable | None
 
-    if callable(dry_run):
-        write, dry_run = dry_run, True
+    if close_on_exit and stream in (sys.stdout, sys.stderr):
+        raise ValueError('You cannot close stdout or stderr')
 
-    elif dry_run:
-        write = len
+    if dry_run:
+        close_on_exit = False
 
-    elif close_on_exit and hasattr(stream, 'write'):
-        if temp_file and BUG_MESSAGE:
-            raise NotImplementedError(BUG_MESSAGE)
+    try:
+        if callable(dry_run):
+            write, dry_run = dry_run, True
 
-        def write(v):
-            with stream:
-                stream.write(v)
+        elif dry_run:
+            write = len
 
-    else:
-        write = getattr(stream, 'write', None)
+        elif close_on_exit and hasattr(stream, 'write'):
+            if temp_file and BUG_MESSAGE:
+                raise NotImplementedError(BUG_MESSAGE)
 
-    send = getattr(stream, 'send', None)
-    mode = getattr(stream, 'mode', None)
+            def write(v):
+                with stream:
+                    stream.write(v)
 
-    if dry_run:
-        close_on_exit = False
+        else:
+            write = getattr(stream, 'write', None)
 
-    if close_on_exit and stream in (sys.stdout, sys.stderr):
-        raise ValueError('You cannot close stdout or stderr')
+        send = getattr(stream, 'send', None)
+        mode = getattr(stream, 'mode', None)
 
-    if write and mode:
-        if not set('w+a').intersection(mode):
-            raise ValueError('Stream mode "%s" is not a write mode' % mode)
+        if write and mode:
+            if not set('w+a').intersection(mode):
+                raise ValueError(f'Stream mode "{mode}" is not a write mode')
 
-        binary_mode = 'b' in mode
-        if is_binary is not None and is_binary is not binary_mode:
-            raise ValueError('is_binary is inconsistent with the file stream')
+            binary_mode = 'b' in mode
+            if is_binary is not None and is_binary is not binary_mode:
+                raise ValueError('is_binary is inconsistent with the file stream')
 
-        is_binary = binary_mode
+            is_binary = binary_mode
 
-    elif dry_run:
-        pass
+        elif dry_run:
+            pass
 
-    elif send and hasattr(stream, 'recv'):  # It looks like a socket:
-        if not (is_binary is None or is_binary is True):
-            raise ValueError('is_binary=False is inconsistent with a socket')
+        elif send and hasattr(stream, 'recv'):  # It looks like a socket:
+            if not (is_binary is None or is_binary is True):
+                raise ValueError('is_binary=False is inconsistent with a socket')
 
-        write = send
-        is_binary = True
+            write = send
+            is_binary = True
 
-    elif callable(stream):
-        write = stream
+        elif callable(stream):
+            write = stream
 
-    else:
-        raise ValueError('Stream is not a file, a socket, or callable')
-
-    closer: _StreamCloser
-
-    if temp_file:
-        closer = _FileStreamCloser(
-            write,
-            close_on_exit,
-            is_binary,
-            temp_file,
-            chunk_size,
-            delete_failures,
-        )
-    else:
-        closer = _MemoryStreamCloser(write, close_on_exit, is_binary)
+        else:
+            raise ValueError('Stream is not a file, a socket, or callable')
+
+        closer: _StreamCloser
+
+        if temp_file:
+            closer = _FileStreamCloser(
+                write,
+                close_on_exit,
+                is_binary,
+                temp_file,
+                chunk_size,
+                delete_failures,
+            )
+        else:
+            closer = _MemoryStreamCloser(write, close_on_exit, is_binary)
+
+        if send is write:
+            closer.fp.send = write
 
-    if send is write:
-        closer.fp.send = write
+        return closer.fp
 
-    return closer.fp
+    except Exception:
+        if close_on_exit:
+            getattr(stream, 'close', lambda: None)()
+        raise
 
 
 # There's an edge case in #23 I can't yet fix, so I fail
@@ -311,18 +319,18 @@ BUG_MESSAGE = 'Sorry, safer.writer fails if temp_file (#23)'
 
 
 def open(
-    name: t.Union[Path, str],
+    name: Path | str,
     mode: str = 'r',
     buffering: int = -1,
-    encoding: t.Optional[str] = None,
-    errors: t.Optional[str] = None,
-    newline: t.Optional[str] = None,
+    encoding: str | None = None,
+    errors: str | None = None,
+    newline: str | None = None,
     closefd: bool = True,
-    opener: t.Optional[t.Callable] = None,
+    opener: t.Callable | None = None,
     make_parents: bool = False,
     delete_failures: bool = True,
     temp_file: bool = False,
-    dry_run: t.Union[bool, t.Callable] = False,
+    dry_run: bool | t.Callable = False,
     enabled: bool = True,
 ) -> t.IO:
     """
@@ -385,7 +393,7 @@ def open(
         name = str(name)
 
     if not isinstance(name, str):
-        raise TypeError('`name` must be string, not %s' % type(name).__name__)
+        raise TypeError(f'`name` must be string, not {type(name).__name__}')
 
     name = os.path.realpath(name)
     parent = os.path.dirname(os.path.abspath(name))
@@ -431,7 +439,7 @@ def open(
             raise ValueError("binary mode doesn't take an errors argument")
 
     if 'x' in mode and os.path.exists(name):
-        raise FileExistsError("File exists: '%s'" % name)
+        raise FileExistsError(f"File exists: '{name}'")
 
     if buffering == -1:
         buffering = io.DEFAULT_BUFFER_SIZE
@@ -447,8 +455,8 @@ def open(
 
 
 def closer(
-    stream: t.IO, is_binary: t.Optional[bool] = None, close_on_exit: bool = True, **kwds
-) -> t.Union[t.Callable, t.IO]:
+    stream: t.IO, is_binary: bool | None = None, close_on_exit: bool = True, **kwds
+) -> t.Callable | t.IO:
     """
     Like `safer.writer()` but with `close_on_exit=True` by default
 
@@ -460,7 +468,7 @@ def closer(
 
 def dump(
     obj,
-    stream: t.Union[t.Callable, None, t.IO, Path, str] = None,
+    stream: t.Callable | None | t.IO | Path | str = None,
     dump: t.Any = None,
     **kwargs,
 ) -> t.Any:
@@ -533,8 +541,8 @@ def _get_dumper(dump: t.Any) -> t.Callable:
 
 @contextlib.contextmanager
 def printer(
-    name: t.Union[Path, str], mode: str = 'w', *args, **kwargs
-) -> t.Generator[t.Callable, None, None]:
+    name: Path | str, mode: str = 'w', *args, **kwargs
+) -> t.Iterator[t.Callable]:
     """
     A context manager that yields a function that prints to the opened file,
     only writing to the original file at the exit of the context,

{safer-5.0.0.dist-info → safer-5.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: safer
-Version: 5.0.0
+Version: 5.1.0
 Summary: 🧿 A safer writer for files and streams 🧿
 Home-page: https://github.com/rec/safer
 License: MIT

safer-5.1.0.dist-info/RECORD

@@ -0,0 +1,6 @@
+safer/__init__.py,sha256=gol1HEWHBCBlrotKRuS2mSln5GAyv6PWdML09x9GZI8,22692
+safer/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+safer-5.1.0.dist-info/LICENSE,sha256=YrPqlE_MughiZSHUT2iVoduqlqmStMop9EEwCTdlzBw,1067
+safer-5.1.0.dist-info/METADATA,sha256=TiGbpkpfSotKcUdbSdeR8kz27YdpbD1EroL_D52Zi0M,5449
+safer-5.1.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+safer-5.1.0.dist-info/RECORD,,

safer-5.0.0.dist-info/RECORD

@@ -1,6 +0,0 @@
-safer/__init__.py,sha256=eRkfOSVTIr5Wd9aOF6EJBkfyizjeS_P6Uaeu0qBKe3Y,22455
-safer/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-safer-5.0.0.dist-info/LICENSE,sha256=YrPqlE_MughiZSHUT2iVoduqlqmStMop9EEwCTdlzBw,1067
-safer-5.0.0.dist-info/METADATA,sha256=v2pjAfB1KHIGyg7W-fhSb0_mP2FOHePB8B7rPjzow8M,5449
-safer-5.0.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-safer-5.0.0.dist-info/RECORD,,