cfinterface 1.8.2__tar.gz → 1.8.3__tar.gz

{cfinterface-1.8.2 → cfinterface-1.8.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cfinterface
-Version: 1.8.2
+Version: 1.8.3
 Summary: Interface for handling custom formatted files
 Project-URL: Documentation, https://rjmalves.github.io/cfinterface/
 Project-URL: Repository, https://github.com/rjmalves/cfinterface/

{cfinterface-1.8.2 → cfinterface-1.8.3}/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.8.2"
+__version__ = "1.8.3"
 
 from . import components  # noqa
 from . import data  # noqa

{cfinterface-1.8.2 → cfinterface-1.8.3}/cfinterface/components/floatfield.py

@@ -92,11 +92,12 @@ class FloatField(Field):
                 value = value[: self.size]
             else:
                 for d in range(self.__decimal_digits, -1, -1):
+                    formatting_format = "E" if self.__format.lower() == "d" else self.__format
                     value = "{:.{d}{format}}".format(
                         round(self.value, d),
                         d=d,
-                        format=self.__format,
-                    )
+                        format=formatting_format,
+                    ).replace("E", self.__format)
                     if len(value) <= self._size:
                         break
         return value.rjust(self.size)

{cfinterface-1.8.2 → cfinterface-1.8.3}/tests/components/test_floatfield.py

@@ -19,6 +19,15 @@ def test_floatfield_read_scientific_notation():
     assert field.value == float(data)
 
 
+
+def test_floatfield_read_scientific_notation_d():
+    data = "1.2D3"
+    field = FloatField(5, 0, 1, format="D")
+    line = f"{data}-something-else"
+    field.read(line)
+    assert field.value == float(data.replace("D", "e"))
+
+
 def test_floatfield_comma_separator():
     data = "1,23"
     field = FloatField(4, 0, 1, sep=",")
@@ -56,6 +65,14 @@ def test_floatfield_write_scientific_notation():
     line_after = field.write(line_before)
     assert line_before == line_after
 
+def test_floatfield_write_scientific_notation_d():
+    data_text = "1.2D+3"
+    line_before = f"field-{data_text}-else"
+    data = float(data_text.replace("D", "e"))
+    field = FloatField(5, 6, 1, format="D", value=data)
+    line_after = field.write(line_before)
+    assert line_before == line_after
+
 
 def test_floatfield_write_scientific_notation_0():
     data_text = "0e+00"