nerdd-module 0.3.44__tar.gz → 0.3.46__tar.gz

{nerdd_module-0.3.44 → nerdd_module-0.3.46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nerdd-module
-Version: 0.3.44
+Version: 0.3.46
 Summary: Base package to create NERDD modules
 Author-email: Steffen Hirte <steffen.hirte@univie.ac.at>
 Maintainer-email: Steffen Hirte <steffen.hirte@univie.ac.at>

{nerdd_module-0.3.44 → nerdd_module-0.3.46}/nerdd_module/input/list_reader.py

@@ -1,5 +1,5 @@
-from io import BytesIO, StringIO
-from typing import Any, BinaryIO, Iterable, Iterator
+from io import IOBase
+from typing import Any, Iterable, Iterator
 
 from .reader import ExploreCallable, MoleculeEntry, Reader
 
@@ -12,7 +12,7 @@ class ListReader(Reader):
 
     def read(self, input_iterable: Any, explore: ExploreCallable) -> Iterator[MoleculeEntry]:
         assert isinstance(input_iterable, Iterable) and not isinstance(
-            input_iterable, (str, bytes, BytesIO, StringIO, BinaryIO)
+            input_iterable, (str, bytes, IOBase)
         ), f"input must be an iterable, but is {type(input_iterable)}"
 
         for entry in input_iterable:

{nerdd_module-0.3.44 → nerdd_module-0.3.46}/nerdd_module/input/string_reader.py

@@ -11,9 +11,12 @@ class StringReader(Reader):
         super().__init__()
 
     def read(self, input: Any, explore: ExploreCallable) -> Iterator[MoleculeEntry]:
-        assert isinstance(input, str)
+        assert isinstance(input, (str, bytes))
 
-        with BytesIO(input.encode("utf-8")) as f:
+        if isinstance(input, str):
+            input = input.encode("utf-8")
+
+        with BytesIO(input) as f:
             yield from explore(f)
 
     def __repr__(self) -> str:

{nerdd_module-0.3.44 → nerdd_module-0.3.46}/nerdd_module/output/file_writer.py

@@ -1,5 +1,6 @@
 import codecs
 from abc import abstractmethod
+from io import BufferedIOBase, TextIOBase, TextIOWrapper
 from pathlib import Path
 from typing import IO, Any, BinaryIO, Iterable, TextIO, Union
 
@@ -14,6 +15,13 @@ __all__ = ["FileWriter", "FileLike"]
 FileLike = Union[str, Path, TextIO, BinaryIO]
 
 
+def is_bytes_stream(stream: Union[TextIO, BinaryIO]) -> bool:
+    if hasattr(stream, "buffer"):
+        return False
+    else:
+        return True
+
+
 class FileWriter(Writer):
     """Abstract class for writers."""
 
@@ -28,8 +36,21 @@ class FileWriter(Writer):
             with open(self._output_file, mode) as f:
                 self._write(f, entries)
         else:
-            self._write(self._output_file, entries)
-            self._output_file.flush()
+            if self._writes_bytes == is_bytes_stream(self._output_file):
+                stream = self._output_file
+            elif self._writes_bytes:
+                # underlying writer expects str (but the writer wants to write bytes)
+                assert isinstance(self._output_file, TextIOBase) and hasattr(
+                    self._output_file, "buffer"
+                )
+                stream = self._output_file.buffer
+            elif not self._writes_bytes:
+                # underlying writer expects bytes (but the writer wants to write str)
+                assert isinstance(self._output_file, BufferedIOBase)
+                stream = TextIOWrapper(self._output_file, encoding="utf-8")
+
+            self._write(stream, entries)
+            stream.flush()
 
     @abstractmethod
     def _write(self, output: IO[Any], entries: Iterable[dict]) -> None:

{nerdd_module-0.3.44 → nerdd_module-0.3.46}/nerdd_module.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nerdd-module
-Version: 0.3.44
+Version: 0.3.46
 Summary: Base package to create NERDD modules
 Author-email: Steffen Hirte <steffen.hirte@univie.ac.at>
 Maintainer-email: Steffen Hirte <steffen.hirte@univie.ac.at>

{nerdd_module-0.3.44 → nerdd_module-0.3.46}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "nerdd-module"
-version = "0.3.44"
+version = "0.3.46"
 description = "Base package to create NERDD modules"
 readme = "README.md"
 license = "BSD-3-Clause"