flow.record 3.21.dev10__tar.gz → 3.21.dev12__tar.gz

{flow_record-3.21.dev10 → flow_record-3.21.dev12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flow.record
-Version: 3.21.dev10
+Version: 3.21.dev12
 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-Expression: AGPL-3.0-or-later
@@ -23,8 +23,8 @@ Requires-Dist: msgpack>=0.5.2
 Requires-Dist: tzdata; platform_system == "Windows"
 Provides-Extra: compression
 Requires-Dist: lz4; extra == "compression"
-Requires-Dist: zstandard; extra == "compression"
 Requires-Dist: zstandard==0.23.0; (platform_python_implementation == "PyPy" and python_version == "3.9") and extra == "compression"
+Requires-Dist: zstandard; (platform_python_implementation != "PyPy" and python_version != "3.9") and extra == "compression"
 Provides-Extra: elastic
 Requires-Dist: elasticsearch; extra == "elastic"
 Provides-Extra: geoip

{flow_record-3.21.dev10 → flow_record-3.21.dev12}/flow/record/fieldtypes/__init__.py

@@ -722,6 +722,16 @@ class posix_path(pathlib.PurePosixPath, path):
 class windows_path(pathlib.PureWindowsPath, path):
     def __repr__(self) -> str:
         s = str(self)
+        # Only use repr() if we have surrogates that need escaping
+        try:
+            s.encode("utf-8")
+        except UnicodeEncodeError:
+            # Has surrogates - use repr but fix the over-escaping
+            s = repr(s)[1:-1]  # This escapes surrogates as \udcXX
+            s = s.replace("\\\\", "\\")  # Fix double backslashes
+            s = s.replace("\\'", "'")  # Fix over-escaped quotes
+            s = s.replace('\\"', '"')  # Fix over-escaped double quotes
+
         quote = "'"
         if "'" in s:
             if '"' in s:

{flow_record-3.21.dev10 → flow_record-3.21.dev12}/flow/record/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '3.21.dev10'
-__version_tuple__ = version_tuple = (3, 21, 'dev10')
+__version__ = version = '3.21.dev12'
+__version_tuple__ = version_tuple = (3, 21, 'dev12')
 
-__commit_id__ = commit_id = 'g04aec16c5'
+__commit_id__ = commit_id = 'gc3447bd98'

{flow_record-3.21.dev10 → flow_record-3.21.dev12}/flow.record.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flow.record
-Version: 3.21.dev10
+Version: 3.21.dev12
 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-Expression: AGPL-3.0-or-later
@@ -23,8 +23,8 @@ Requires-Dist: msgpack>=0.5.2
 Requires-Dist: tzdata; platform_system == "Windows"
 Provides-Extra: compression
 Requires-Dist: lz4; extra == "compression"
-Requires-Dist: zstandard; extra == "compression"
 Requires-Dist: zstandard==0.23.0; (platform_python_implementation == "PyPy" and python_version == "3.9") and extra == "compression"
+Requires-Dist: zstandard; (platform_python_implementation != "PyPy" and python_version != "3.9") and extra == "compression"
 Provides-Extra: elastic
 Requires-Dist: elasticsearch; extra == "elastic"
 Provides-Extra: geoip

{flow_record-3.21.dev10 → flow_record-3.21.dev12}/flow.record.egg-info/requires.txt

@@ -11,6 +11,8 @@ cramjam<2.8.4
 
 [compression]
 lz4
+
+[compression:platform_python_implementation != "PyPy" and python_version != "3.9"]
 zstandard
 
 [compression:platform_python_implementation == "PyPy" and python_version == "3.9"]

{flow_record-3.21.dev10 → flow_record-3.21.dev12}/pyproject.toml

@@ -37,8 +37,8 @@ repository = "https://github.com/fox-it/flow.record"
 # Note: these compression libraries do not work well with pypy
 compression = [
     "lz4",
-    "zstandard",
     "zstandard==0.23.0; platform_python_implementation == 'PyPy' and python_version == '3.9'", # Pin to last working for PyPy3.9
+    "zstandard; platform_python_implementation != 'PyPy' and python_version != '3.9'", # Otherwise, pick the latest
 ]
 elastic = [
     "elasticsearch",
@@ -133,7 +133,7 @@ version_file = "flow/record/version.py"
 compression = [
     "lz4",
     "zstandard==0.23.0; platform_python_implementation == 'PyPy' and python_version == '3.9'", # Pin to last working for PyPy3.9
-    "zstandard",
+    "zstandard; platform_python_implementation != 'PyPy' and python_version != '3.9'", # Otherwise, pick the latest
 ]
 elastic = [
     "elasticsearch",

{flow_record-3.21.dev10 → flow_record-3.21.dev12}/tests/record/test_record.py

@@ -29,6 +29,7 @@ from flow.record.base import (
     set_ignored_fields_for_comparison,
 )
 from flow.record.exceptions import RecordDescriptorError
+from flow.record.fieldtypes import windows_path
 from flow.record.stream import RecordFieldRewriter
 
 if TYPE_CHECKING:
@@ -307,7 +308,7 @@ def test_record_printer_stdout(capsys: pytest.CaptureFixture) -> None:
     writer = RecordPrinter(getattr(sys.stdout, "buffer", sys.stdout))
     writer.write(record)
 
-    out, err = capsys.readouterr()
+    out, _ = capsys.readouterr()
     expected = "<test/a a_string='hello' common='world' a_count=10>\n"
     assert out == expected
 
@@ -317,9 +318,13 @@ def test_record_printer_stdout_surrogateescape(capsys: pytest.CaptureFixture) ->
         "test/a",
         [
             ("string", "name"),
+            ("path", "value"),
         ],
     )
-    record = Record(b"R\xc3\xa9\xeamy")
+    record = Record(
+        b"R\xc3\xa9\xeamy",
+        windows_path(b"\x43\x3a\x5c\xc3\xa4\xc3\x84\xe4".decode(errors="surrogateescape")),
+    )
 
     # fake capsys to be a tty.
     def isatty() -> bool:
@@ -330,8 +335,8 @@ def test_record_printer_stdout_surrogateescape(capsys: pytest.CaptureFixture) ->
     writer = RecordPrinter(getattr(sys.stdout, "buffer", sys.stdout))
     writer.write(record)
 
-    out, err = capsys.readouterr()
-    expected = "<test/a name='Ré\\udceamy'>\n"
+    out, _ = capsys.readouterr()
+    expected = "<test/a name='Ré\\udceamy' value='C:\\äÄ\\udce4'>\n"
     assert out == expected