flow.record 3.16.dev2__tar.gz → 3.16.dev4__tar.gz

{flow_record-3.16.dev2/flow.record.egg-info → flow_record-3.16.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flow.record
-Version: 3.16.dev2
+Version: 3.16.dev4
 Summary: A library for defining and creating structured data (called records) that can be streamed to disk or piped to other tools that use flow.record
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3

{flow_record-3.16.dev2 → flow_record-3.16.dev4}/flow/record/base.py

@@ -31,6 +31,7 @@ from urllib.parse import parse_qsl, urlparse
 
 from flow.record.adapter import AbstractReader, AbstractWriter
 from flow.record.exceptions import RecordAdapterNotFound, RecordDescriptorError
+from flow.record.utils import get_stdin, get_stdout
 
 try:
     import lz4.frame as lz4
@@ -812,10 +813,7 @@ def open_path(path: str, mode: str, clobber: bool = True) -> IO:
     # normal file or stdio for reading or writing
     if not fp:
         if is_stdio:
-            if binary:
-                fp = getattr(sys.stdout, "buffer", sys.stdout) if out else getattr(sys.stdin, "buffer", sys.stdin)
-            else:
-                fp = sys.stdout if out else sys.stdin
+            fp = get_stdout(binary=binary) if out else get_stdin(binary=binary)
         else:
             fp = io.open(path, mode)
         # check if we are reading a compressed stream
@@ -867,7 +865,7 @@ def RecordAdapter(
         if url in ("-", "", None) and fileobj is None:
             # For reading stdin, we cannot rely on an extension to know what sort of stream is incoming. Thus, we will
             # treat it as a 'fileobj', where we can peek into the stream and try to select the appropriate adapter.
-            fileobj = getattr(sys.stdin, "buffer", sys.stdin)
+            fileobj = get_stdin(binary=True)
         if fileobj is not None:
             # This record adapter has received a file-like object for record reading
             # We just need to find the right adapter by peeking into the first few bytes.

{flow_record-3.16.dev2 → flow_record-3.16.dev4}/flow/record/stream.py

@@ -12,6 +12,7 @@ from functools import lru_cache
 from flow.record import RECORDSTREAM_MAGIC, RecordWriter
 from flow.record.fieldtypes import fieldtype_for_value
 from flow.record.selector import make_selector
+from flow.record.utils import is_stdout
 
 from .base import RecordDescriptor, RecordReader
 from .packer import RecordPacker
@@ -70,7 +71,7 @@ class RecordStreamWriter:
         self.write(descriptor)
 
     def close(self):
-        if self.fp and self.fp != getattr(sys.stdout, "buffer", sys.stdout):
+        if self.fp and not is_stdout(self.fp):
             self.fp.close()
             self.fp = None
 

{flow_record-3.16.dev2 → flow_record-3.16.dev4}/flow/record/utils.py

@@ -1,15 +1,51 @@
+from __future__ import annotations
+
 import base64
 import os
 import sys
 from functools import wraps
+from typing import BinaryIO, TextIO
 
 _native = str
 _unicode = type("")
 _bytes = type(b"")
 
 
-def is_stdout(fp):
-    return fp in (sys.stdout, sys.stdout.buffer)
+def get_stdout(binary: bool = False) -> TextIO | BinaryIO:
+    """Return the stdout stream as binary or text stream.
+
+    This function is the preferred way to get the stdout stream in flow.record.
+
+    Arguments:
+        binary: Whether to return the stream as binary stream.
+
+    Returns:
+        The stdout stream.
+    """
+    fp = getattr(sys.stdout, "buffer", sys.stdout) if binary else sys.stdout
+    fp._is_stdout = True
+    return fp
+
+
+def get_stdin(binary: bool = False) -> TextIO | BinaryIO:
+    """Return the stdin stream as binary or text stream.
+
+    This function is the preferred way to get the stdin stream in flow.record.
+
+    Arguments:
+        binary: Whether to return the stream as binary stream.
+
+    Returns:
+        The stdin stream.
+    """
+    fp = getattr(sys.stdin, "buffer", sys.stdin) if binary else sys.stdin
+    fp._is_stdin = True
+    return fp
+
+
+def is_stdout(fp: TextIO | BinaryIO) -> bool:
+    """Returns True if ``fp`` is the stdout stream."""
+    return fp in (sys.stdout, sys.stdout.buffer) or hasattr(fp, "_is_stdout")
 
 
 def to_bytes(value):

{flow_record-3.16.dev2 → flow_record-3.16.dev4}/flow/record/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.16.dev2'
-__version_tuple__ = version_tuple = (3, 16, 'dev2')
+__version__ = version = '3.16.dev4'
+__version_tuple__ = version_tuple = (3, 16, 'dev4')

{flow_record-3.16.dev2 → flow_record-3.16.dev4/flow.record.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flow.record
-Version: 3.16.dev2
+Version: 3.16.dev4
 Summary: A library for defining and creating structured data (called records) that can be streamed to disk or piped to other tools that use flow.record
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3

{flow_record-3.16.dev2 → flow_record-3.16.dev4}/tox.ini

@@ -5,10 +5,11 @@ envlist = lint, py3, pypy3
 # locally installed tox to have a minimum version 3.3.0. This means the names
 # of the configuration options are still according to the tox 3.x syntax.
 minversion = 4.11.4
-# This version of virtualenv will install setuptools version 65.5.0 and pip
-# 22.3. These versions fully support python projects defined only through a
-# pyproject.toml file (PEP-517/PEP-518/PEP-621)
-requires = virtualenv>=20.16.6
+# This version of virtualenv will install setuptools version 68.2.2 and pip
+# 23.3.1. These versions fully support python projects defined only through a
+# pyproject.toml file (PEP-517/PEP-518/PEP-621). This pip version also support
+# the proper version resolving with (sub-)dependencies defining dev extra's.
+requires = virtualenv>=20.24.6
 
 [testenv]
 deps =