Use collections directly (new in 3.9)

Author: tammoippen

pydifact/parser.py

@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 from collections.abc import Iterator
-from typing import List, Optional, Union
+from typing import Optional, Union
 
 from pydifact.tokenizer import Tokenizer
 from pydifact.token import Token
@@ -134,10 +134,10 @@ def convert_tokens_to_segments(
         :rtype list of Segment
         """
 
-        segments: List[List[Union[str, List[str]]]] = []
+        segments: list[list[Union[str, list[str]]]] = []
         current_segment = []
-        data_element: List[str] = []
-        data_element_value: Union[List[str], str]
+        data_element: list[str] = []
+        data_element_value: Union[list[str], str]
         in_segment = False
         empty_component_counter = 0
 

pydifact/segmentcollection.py

@@ -23,7 +23,7 @@
 import codecs
 import datetime
 from collections.abc import Callable, Iterable, Iterator, Sequence
-from typing import List, Optional, Tuple, Type, TypeVar, Union
+from typing import Optional, Type, TypeVar, Union
 
 from pydifact.api import EDISyntaxError
 from pydifact.control import Characters
@@ -69,7 +69,7 @@ def __init__(
         extra_header_elements: Optional[Elements] = None,
         characters: Optional[Characters] = None,
     ) -> None:
-        self.segments: List[Segment] = []
+        self.segments: list[Segment] = []
 
         # set of control characters
         self.characters = characters or Characters()
@@ -198,7 +198,7 @@ def add_segments(self, segments: Iterable[Segment]) -> None:
         instead, without passing a ``UNA`` Segment.
 
         :param segments: The segments to add.
-        :type segments: List or iterable of :class:`~pydifact.segments.Segment` objects.
+        :type segments: list or iterable of :class:`~pydifact.segments.Segment` objects.
         """
         for segment in segments:
             self.add_segment(segment)
@@ -367,7 +367,7 @@ def __init__(
         sender: str,
         recipient: str,
         control_reference: str,
-        syntax_identifier: Tuple[str, int],
+        syntax_identifier: tuple[str, int],
         timestamp: Optional[datetime.datetime] = None,
         *args,
         **kwargs,

pydifact/segments.py

@@ -20,13 +20,12 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 from abc import abstractmethod
-from typing import Union, List
+from typing import Union
 
 from pydifact.api import EDISyntaxError, PluginMount
-from pydifact.control import Characters
 
-Element = Union[str, List[str], None]
-Elements = List[Element]
+Element = Union[str, list[str], None]
+Elements = list[Element]
 
 
 class SegmentProvider(metaclass=PluginMount):

pydifact/serializer.py

@@ -19,7 +19,7 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-from typing import List, Optional
+from typing import Optional
 
 from pydifact.control.characters import Characters
 import re
@@ -42,7 +42,7 @@ def __init__(self, characters: Optional[Characters] = None) -> None:
 
     def serialize(
         self,
-        segments: List[Segment],
+        segments: list[Segment],
         with_una_header: bool = True,
         break_lines: bool = False,
     ) -> str:
@@ -54,7 +54,7 @@ def serialize(
             is created.
         :param break_lines: if True, insert line break after each segment terminator.
         """
-        collection_parts: List[str] = []
+        collection_parts: list[str] = []
 
         # first, check if UNA header is wanted.
         if with_una_header:

pydifact/tokenizer.py

@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 from collections.abc import Iterator
-from typing import Dict, List, Optional
+from typing import Optional
 
 from pydifact.token import Token
 from pydifact.control.characters import Characters
@@ -35,7 +35,7 @@ def __init__(self) -> None:
         # The message that we are tokenizing.
         self._message: Iterator[str] = iter("")
 
-        self._current_chars: List[str] = []
+        self._current_chars: list[str] = []
 
         # The current character from the message we are dealing with.
         self._char: Optional[str] = ""
@@ -49,7 +49,7 @@ def __init__(self) -> None:
         # The control characters for the message
         self.characters: Optional[Characters] = None
 
-        self.token_selector: Dict[str, Token.Type] = {}
+        self.token_selector: dict[str, Token.Type] = {}
 
         self._message_index: int = 0
 

tests/test_segmentcollection.py

@@ -14,7 +14,7 @@
 #    You should have received a copy of the GNU Lesser General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import datetime
-from typing import Iterable, List
+from typing import Iterable, list
 
 import pytest
 
@@ -79,7 +79,7 @@ def test_get_segment_w_predicate():
 
 
 def test_split_by():
-    def _serialize(collections: Iterable[RawSegmentCollection]) -> List[List[str]]:
+    def _serialize(collections: Iterable[RawSegmentCollection]) -> list[list[str]]:
         lst: list[str] = []
         global_lst = []
         for collection in collections: