3.10 adjustment: f-strings

Author: tammoippen

README.md

@@ -49,7 +49,7 @@ interchange = Interchange.from_str(
 )
 for message in interchange.get_messages():
     for segment in message.segments:
-        print("Segment tag: {}, content: {}".format(segment.tag, segment.elements))
+        print(f"Segment tag: {segment.tag}, content: {segment.elements}")
 ```
 
 You may also want to iterate directly on segments :
@@ -68,7 +68,7 @@ interchange = Interchange.from_str(
 )
 
 for segment in interchange.segments:
-    print("Segment tag: {}, content: {}".format(segment.tag, segment.elements))
+    print(f"Segment tag: {segment.tags}, content: {segment.elements}")
 ```
 
 Or you can create an EDI interchange on the fly:
@@ -100,7 +100,7 @@ from pydifact.segmentcollection import RawSegmentCollection
 collection = RawSegmentCollection.from_str("UNH+1+ORDERS:D:96A:UN:EAN008'")
 
 for segment in collection.segments:
-    print("Segment tag: {}, content: {}".format(segment.tag, segment.elements))
+    print(f"Segment tag: {segment.tags}, content: {segment.elements}")
 ```
 
 
@@ -124,7 +124,7 @@ To develop pydifact, clone the repository and install the dev requirements:
 
 ```bash
 make dev
-# or 
+# or
 # pip install -e .[dev]
 ```
 

TODO.md

@@ -2,7 +2,4 @@
 
 * Translation of following files:
   * Parser, ParserTest
-  * Message, MessageTest 
-* When Python 3.10 is adapted: 
-  * replace Union[x,y] with x|y and Optional[x] with x|None in annotations
-  * use f-strings instead of .format-strings
+  * Message, MessageTest

pydifact/control/characters.py

@@ -82,7 +82,7 @@ def with_control_character(self, cc_type: str, char: str):
         # set the attribute dynamically.
         if not hasattr(self, cc_type):
             raise AttributeError(
-                "{} doesn't have an attribute with the name '{}'".format(self, cc_type)
+                f"{self} doesn't have an attribute with the name '{cc_type}'"
             )
 
         other = copy(self)
@@ -114,10 +114,10 @@ def __str__(self) -> str:
         )
 
     def __repr__(self):
-        return "'{}'".format(self.__str__())
+        return f"'{self.__str__()}'"
 
     def __eq__(self, other):
-        if type(other) == str:
+        if isinstance(other, str):
             other = Characters.from_str(other)
         return (
             (self.component_separator == other.component_separator)

pydifact/segmentcollection.py

@@ -313,7 +313,7 @@ def version(self) -> str:
 
         :return: message version, parsable by pkg_resources.parse_version()
         """
-        return "{}.{}".format(self.identifier[1], self.identifier[2])
+        return f"{self.identifier[1]}.{self.identifier[2]}"
 
     def get_header_segment(self) -> Segment:
         return Segment(
@@ -382,7 +382,7 @@ def get_header_segment(self) -> Segment:
             [self.syntax_identifier[0], str(self.syntax_identifier[1])],
             self.sender,
             self.recipient,
-            ["{:%y%m%d}".format(self.timestamp), "{:%H%M}".format(self.timestamp)],
+            [f"{self.timestamp:%y%m%d}", f"{self.timestamp:%H%M}"],
             self.control_reference,
             *self.extra_header_elements,
         )
@@ -422,7 +422,7 @@ def get_messages(self) -> Iterator[Message]:
                     last_segment = segment
                 else:
                     raise EDISyntaxError(
-                        "Missing UNT segment before new UNH: {}".format(segment)
+                        f"Missing UNT segment before new UNH: segment{segment}"
                     )
             elif segment.tag == "UNT":
                 if message:
@@ -431,7 +431,7 @@ def get_messages(self) -> Iterator[Message]:
                     last_segment = segment
                 else:
                     raise EDISyntaxError(
-                        'UNT segment without matching UNH: "{}"'.format(segment)
+                        f'UNT segment without matching UNH: "{segment}"'
                     )
             else:
                 if message:

pydifact/segments.py

@@ -68,12 +68,10 @@ def __init__(self, tag: str, *elements: Element) -> None:
 
     def __str__(self) -> str:
         """Returns the Segment in Python list printout"""
-        return "'{tag}' EDI segment: {elements}".format(
-            tag=self.tag, elements=str(self.elements)
-        )
+        return f"'{self.tag}' EDI segment: {self.elements}"
 
     def __repr__(self) -> str:
-        return "{} segment: {}".format(self.tag, str(self.elements))
+        return f"{self.tag} segment: {str(self.elements)}"
 
     def __eq__(self, other) -> bool:
         # FIXME the other way round too? isinstance(other, type(self))?
@@ -125,16 +123,12 @@ def create_segment(name: str, *elements: Element, validate: bool = True) -> Segm
 
         if not isinstance(name, str):
             raise EDISyntaxError(
-                "The tag name of a segment must be a str, but is a {}: {}".format(
-                    type(name), name
-                )
+                f"The tag name of a segment must be a str, but is a {type(name)}: {name}"
             )
 
         if not name.isalnum():
             raise EDISyntaxError(
-                "Tag '{}': A tag name must only contain alphanumeric characters.".format(
-                    name
-                )
+                f"Tag '{name}': A tag name must only contain alphanumeric characters."
             )
 
         for Plugin in SegmentProvider.plugins:
@@ -149,7 +143,7 @@ def create_segment(name: str, *elements: Element, validate: bool = True) -> Segm
         if validate:
             if not s.validate():
                 raise EDISyntaxError(
-                    "could not create '{}' Segment. Validation failed.".format(name)
+                    f"could not create '{name}' Segment. Validation failed."
                 )
 
         return s

pydifact/serializer.py

@@ -101,6 +101,9 @@ def escape(self, string: str | None) -> str:
 
         if string is None:
             return ""
-        assert isinstance(string, str), "%s is not a str, it is %s" % (string, type(string))
+        assert isinstance(string, str), "%s is not a str, it is %s" % (
+            string,
+            type(string),
+        )
 
         return self.regexp.sub(lambda match: self.replace_map[match.group(0)], string)

pydifact/token.py

@@ -45,12 +45,10 @@ def __init__(self, token_type: Type, value: str):
         self.value = value
 
     def __str__(self) -> str:
-        return "{name} Token: '{value}'".format(name=self.type.name, value=self.value)
+        return f"{self.type.name} Token: '{self.value}'"
 
     def __repr__(self) -> str:
-        return "<{name} Token object '{value}' at {address}>".format(
-            name=self.type.name, value=self.value, address=hex(id(self))
-        )
+        return f"<{self.type.name} Token object '{self.value}' at {hex(id(self))}>"
 
     def __eq__(self, other) -> bool:
         return self.type == other.type and self.value == other.value

tests/test_characters.py

@@ -22,7 +22,7 @@ def test_with_separator_identity():
     one = Characters()
     other = Characters()
     # a copy of a characters object must be equal, but not the same
-    assert one == other, 'Objects differ: "{}", "{}"'.format(one, other)
+    assert one == other, f'Objects differ: "{one}", "{other}"'
     assert one is not other
 
 

tests/test_input_output.py

@@ -22,7 +22,7 @@
 
 
 def test_wikipedia_file():
-    message = Interchange.from_file("{}/wikipedia.edi".format(path))
+    message = Interchange.from_file(f"{path}/wikipedia.edi")
     # make some checks
     assert message.get_header_segment() == Segment(
         "UNB", ["IATB", "1"], "6XPPC", "LHPPC", ["940101", "0950"], "1"
@@ -34,7 +34,7 @@ def test_wikipedia_file():
 
 
 def test_invoice_file():
-    message = Interchange.from_file("{}/invoice1.edi".format(path))
+    message = Interchange.from_file(f"{path}/invoice1.edi")
     # make some checks
     assert message.get_header_segment() == Segment(
         "UNB",
@@ -52,8 +52,8 @@ def test_invoice_file():
 
 
 # def test_order_file():
-#     _test_file_read("{}/order.edi".format(path))
+#     _test_file_read(f"{path}/order.edi")
 #
 #
 # def test_patient1_file():
-#     _test_file_read("{}/patient1.edi".format(path))
+#     _test_file_read(f"{path}/patient1.edi")

tests/test_parser.py

@@ -95,8 +95,8 @@ def _assert_segments(parser, default_una_segment, collection: str, segments: lis
 
     input_str = "UNA:+,? '\n" + collection + "'\n"
     result = list(parser.parse(input_str))
-    # print("input segments: {}".format(segments[0]))
-    # print("parser result:  {}".format(result[0]))
+    # print(f"input segments: {segments[0]}")
+    # print(f"parser result:  {result[0]}")
     assert segments == result