cfinterface 1.6.0__tar.gz → 1.7.1__tar.gz

{cfinterface-1.6 → cfinterface-1.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cfinterface
-Version: 1.6.0
+Version: 1.7.1
 Summary: Interface for handling custom formatted files
 Home-page: https://github.com/rjmalves/cfi
 Author: Rogerio Alves

{cfinterface-1.6 → cfinterface-1.7.1}/cfinterface/__init__.py

@@ -6,7 +6,7 @@ cfi is a Python module for handling custom formatted files
 and provide reading, storing and writing utilities.
 """
 
-__version__ = "1.6.0"
+__version__ = "1.7.1"
 
 from . import components  # noqa
 from . import data  # noqa

cfinterface-1.7.1/cfinterface/components/datetimefield.py

@@ -0,0 +1,96 @@
+from datetime import datetime
+import pandas as pd  # type: ignore
+from typing import Optional, Union, List
+
+from cfinterface.components.field import Field
+
+
+class DatetimeField(Field):
+    """
+    Class for representing an datetime field for being read from and
+    written to a file. The format to read and write the value is given
+    by an optional argument.
+    """
+
+    __slots__ = ["__format"]
+
+    def __init__(
+        self,
+        size: int = 16,
+        starting_position: int = 0,
+        format: Union[str, List[str]] = "%Y/%m/%d",
+        value: Optional[datetime] = None,
+    ) -> None:
+        super().__init__(size, starting_position, value)
+        self.__format = format
+
+    # Override
+    def _binary_read(self, line: bytes) -> datetime:
+        formats = (
+            [self.__format]
+            if isinstance(self.__format, str)
+            else self.__format
+        )
+        for fmt in formats:
+            try:
+                return datetime.strptime(
+                    line[self._starting_position : self._ending_position]
+                    .decode("utf-8")
+                    .strip(),
+                    fmt,
+                )
+            except ValueError:
+                pass
+        raise ValueError("Could not read datetime")
+
+    # Override
+    def _textual_read(self, line: str) -> datetime:
+        formats = (
+            [self.__format]
+            if isinstance(self.__format, str)
+            else self.__format
+        )
+        for fmt in formats:
+            try:
+                return datetime.strptime(
+                    line[
+                        self._starting_position : self._ending_position
+                    ].strip(),
+                    fmt,
+                )
+            except ValueError:
+                pass
+        raise ValueError("Could not read datetime")
+
+    # Override
+    def _binary_write(self) -> bytes:
+        if self.value is None or pd.isnull(self.value):
+            return b"".ljust(self.size)
+        else:
+            format = (
+                self.__format
+                if isinstance(self.__format, str)
+                else self.__format[0]
+            )
+            return self.value.strftime(format).ljust(self.size).encode("utf-8")
+
+    # Override
+    def _textual_write(self) -> str:
+        if self.value is None or pd.isnull(self.value):
+            value = ""
+        else:
+            format = (
+                self.__format
+                if isinstance(self.__format, str)
+                else self.__format[0]
+            )
+            value = self.value.strftime(format)
+        return value.ljust(self._size)
+
+    @property
+    def value(self) -> Optional[datetime]:
+        return self._value
+
+    @value.setter
+    def value(self, val: datetime):
+        self._value = val

{cfinterface-1.6 → cfinterface-1.7.1}/cfinterface/files/registerfile.py

@@ -73,7 +73,7 @@ class RegisterFile:
             to a file or the IO buffer
         :type to: str | IO
         """
-        writer = RegisterWriting(self.__data, self.__storage, *args, **kwargs)
+        writer = RegisterWriting(self.__data, self.__storage)
         writer.write(to, self.__encoding, *args, **kwargs)
 
     @property

{cfinterface-1.6 → cfinterface-1.7.1}/cfinterface/files/sectionfile.py

@@ -46,7 +46,7 @@ class SectionFile:
         reader = SectionReading(cls.SECTIONS, cls.STORAGE)
         return cls(reader.read(content, cls.ENCODING, *args, **kwargs))
 
-    def write(self, to: Union[str, IO], filename: str = "", *args, **kwargs):
+    def write(self, to: Union[str, IO], *args, **kwargs):
         """
         Write the sectionfile data to a given file or buffer.
 

{cfinterface-1.6 → cfinterface-1.7.1}/cfinterface.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cfinterface
-Version: 1.6.0
+Version: 1.7.1
 Summary: Interface for handling custom formatted files
 Home-page: https://github.com/rjmalves/cfi
 Author: Rogerio Alves

{cfinterface-1.6 → cfinterface-1.7.1}/setup.py

@@ -9,6 +9,7 @@ requirements = []
 with open("requirements.txt", "r") as fh:
     requirements = fh.readlines()
 
+
 setup(
     name="cfinterface",
     version=cfinterface.__version__,

{cfinterface-1.6 → cfinterface-1.7.1}/tests/components/test_datetimefield.py

@@ -21,6 +21,15 @@ def test_datetimefield_read():
     assert field.value == datetime.strptime(data, format)
 
 
+def test_datetimefield_read_format_list():
+    data = "2020/01/10"
+    formats = ["%Y-%m-%d", "%Y/%m/%d"]
+    field = DatetimeField(10, 0, format=formats)
+    line = f"{data}-something-else"
+    field.read(line)
+    assert field.value == datetime.strptime(data, formats[1])
+
+
 def test_datetimefield_write():
     data = "2020/01/10"
     format = "%Y/%m/%d"
@@ -31,6 +40,16 @@ def test_datetimefield_write():
     assert line_before == line_after
 
 
+def test_datetimefield_write_format_list():
+    data = "2020/01/10"
+    formats = ["%Y-%m-%d", "%Y/%m/%d"]
+    line_before = f"field-{data}-else"
+    date_data = datetime.strptime(data, formats[1])
+    field = DatetimeField(10, 6, format=formats, value=date_data)
+    line_after = field.write(line_before)
+    assert line_before.replace("/", "-") == line_after
+
+
 def test_datetimefield_write_empty():
     field = DatetimeField(5, 0)
     assert len(field.write("")) == 5

cfinterface-1.6/cfinterface/components/datetimefield.py

@@ -1,68 +0,0 @@
-from datetime import datetime
-import pandas as pd  # type: ignore
-from typing import Optional
-
-from cfinterface.components.field import Field
-
-
-class DatetimeField(Field):
-    """
-    Class for representing an datetime field for being read from and
-    written to a file. The format to read and write the value is given
-    by an optional argument.
-    """
-
-    __slots__ = ["__format"]
-
-    def __init__(
-        self,
-        size: int = 16,
-        starting_position: int = 0,
-        format: str = "%Y/%m/%d",
-        value: Optional[datetime] = None,
-    ) -> None:
-        super().__init__(size, starting_position, value)
-        self.__format = format
-
-    # Override
-    def _binary_read(self, line: bytes) -> datetime:
-        return datetime.strptime(
-            line[self._starting_position : self._ending_position]
-            .decode("utf-8")
-            .strip(),
-            self.__format,
-        )
-
-    # Override
-    def _textual_read(self, line: str) -> datetime:
-        return datetime.strptime(
-            line[self._starting_position : self._ending_position].strip(),
-            self.__format,
-        )
-
-    # Override
-    def _binary_write(self) -> bytes:
-        if self.value is None or pd.isnull(self.value):
-            return b"".ljust(self.size)
-        else:
-            return (
-                self.value.strftime(self.__format)
-                .ljust(self.size)
-                .encode("utf-8")
-            )
-
-    # Override
-    def _textual_write(self) -> str:
-        if self.value is None or pd.isnull(self.value):
-            value = ""
-        else:
-            value = self.value.strftime(self.__format)
-        return value.ljust(self._size)
-
-    @property
-    def value(self) -> Optional[datetime]:
-        return self._value
-
-    @value.setter
-    def value(self, val: datetime):
-        self._value = val