**Refactor and modernize codebase for improved clarity and functional…

…ity**

Refactored several modules and test cases to use type annotations, f-strings, and other Python 3 modernizations. Consolidated imports for better maintainability and readability. Enhanced context management and error handling, while replacing redundant or obsolete patterns like `list()` comprehensions and legacy formatting.

pgdumplib/constants.py

@@ -4,7 +4,6 @@
 unless you are hacking on the library itself.
 
 """
-import typing
 
 K_VERSION_MAP = {
     ((9, 0, 0), (10, 2)): (1, 12, 0),
@@ -24,14 +23,7 @@
 FORMAT_NULL: int = 4
 FORMAT_DIRECTORY: int = 5
 
-FORMATS: typing.List[str] = [
-    'Unknown',
-    'Custom',
-    'Files',
-    'Tar',
-    'Null',
-    'Directory'
-]
+FORMATS: list[str] = ['Unknown', 'Custom', 'Files', 'Tar', 'Null', 'Directory']
 
 K_OFFSET_POS_NOT_SET: int = 1
 """Specifies the entry has data but no offset"""
@@ -42,10 +34,10 @@
 
 MAGIC: bytes = b'PGDMP'
 
-MIN_VER: typing.Tuple[int, int, int] = (1, 12, 0)
+MIN_VER: tuple[int, int, int] = (1, 12, 0)
 """The minumum supported version of pg_dump files ot support"""
 
-MAX_VER: typing.Tuple[int, int, int] = (1, 14, 0)
+MAX_VER: tuple[int, int, int] = (1, 14, 0)
 """The maximum supported version of pg_dump files ot support"""
 
 PGDUMP_STRFTIME_FMT: str = '%Y-%m-%d %H:%M:%S %Z'
@@ -62,14 +54,11 @@
 SECTION_POST_DATA: str = 'Post-Data'
 """Post-data section for an entry in a dump's table of contents"""
 
-SECTIONS: typing.List[str] = [
-    SECTION_NONE,
-    SECTION_PRE_DATA,
-    SECTION_DATA,
-    SECTION_POST_DATA
+SECTIONS: list[str] = [
+    SECTION_NONE, SECTION_PRE_DATA, SECTION_DATA, SECTION_POST_DATA
 ]
 
-VERSION: typing.Tuple[int, int, int] = (1, 12, 0)
+VERSION: tuple[int, int, int] = (1, 12, 0)
 """pg_dump file format version to create by default"""
 
 ZLIB_OUT_SIZE: int = 4096
@@ -144,7 +133,7 @@
 USER_MAPPING: str = 'USER MAPPING'
 VIEW: str = 'VIEW'
 
-SECTION_MAPPING: typing.Dict[str, str] = {
+SECTION_MAPPING: dict[str, str] = {
     ACCESS_METHOD: SECTION_PRE_DATA,
     ACL: SECTION_NONE,
     AGGREGATE: SECTION_PRE_DATA,

pgdumplib/converters.py

@@ -16,7 +16,6 @@
 import datetime
 import decimal
 import ipaddress
-import typing
 import uuid
 
 import pendulum
@@ -33,7 +32,7 @@ class DataConverter:
 
     """
     @staticmethod
-    def convert(row: str) -> typing.Tuple[typing.Optional[str], ...]:
+    def convert(row: str) -> tuple[str | None, ...]:
         """Convert the string based row into a tuple of columns.
 
         :param str row: The row to convert
@@ -56,17 +55,9 @@ def convert(row: str) -> str:
         return row
 
 
-SmartColumn = typing.Union[
-    None,
-    str,
-    int,
-    datetime.datetime,
-    decimal.Decimal,
-    ipaddress.IPv4Address,
-    ipaddress.IPv4Network,
-    ipaddress.IPv6Address,
-    ipaddress.IPv6Network,
-    uuid.UUID]
+SmartColumn = (None | str | int | datetime.datetime | decimal.Decimal
+               | ipaddress.IPv4Address | ipaddress.IPv4Network
+               | ipaddress.IPv6Address | ipaddress.IPv6Network | uuid.UUID)
 
 
 class SmartDataConverter(DataConverter):
@@ -89,7 +80,7 @@ class SmartDataConverter(DataConverter):
         - :py:class:`uuid.UUID`
 
     """
-    def convert(self, row: str) -> typing.Tuple[SmartColumn, ...]:
+    def convert(self, row: str) -> tuple[SmartColumn, ...]:
         """Convert the string based row into a tuple of columns"""
         return tuple(self._convert_column(c) for c in row.split('\t'))
 
@@ -119,8 +110,8 @@ def _convert_column(column: str) -> SmartColumn:
             pass
         for tz_fmt in {'Z', 'ZZ', 'z', 'zz'}:
             try:
-                return pendulum.from_format(
-                    column, 'YYYY-MM-DD HH:mm:ss {}'.format(tz_fmt))
+                return pendulum.from_format(column,
+                                            f'YYYY-MM-DD HH:mm:ss {tz_fmt}')
             except ValueError:
                 pass
         return column