Handle datetime depricataion

Author: gitandy

src/adif_file/adi.py

@@ -5,10 +5,10 @@
 
 import re
 import copy
-import datetime
 from collections.abc import Iterator
 
 from . import __version_str__, __proj_name__
+from .util import get_cur_adif_dt
 
 
 class TooMuchHeadersException(Exception):
@@ -213,8 +213,7 @@ def dumpi(data_dict: dict, comment: str = 'ADIF export by ' + __proj_name__,
         default = {'ADIF_VER': '3.1.4',
                    'PROGRAMID': __proj_name__,
                    'PROGRAMVERSION': __version_str__,
-                   'CREATED_TIMESTAMP': datetime.datetime.utcnow().strftime('%Y%m%d %H%M%S')
-                   # TODO: Fix deprication > 3.10: datetime.datetime.now(tz=datetime.UTC).strftime('%Y%m%d %H%M%S')
+                   'CREATED_TIMESTAMP': get_cur_adif_dt(),
                    }
 
         data = comment + ' \n'

src/adif_file/adx.py

@@ -1,8 +1,10 @@
+# PyADIF-File (c) 2023-2025 by Andreas Schawo is licensed under CC BY-SA 4.0.
+# To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/4.0/
+
 """Convert ADIF ADX content to dictionary and vice versa
 The XML is validated against the XSD from ADIF.org"""
 
 import copy
-import datetime
 import os.path
 import xml
 from xml.etree.ElementTree import ElementTree, ParseError
@@ -11,6 +13,7 @@
 import xmltodict
 
 from . import __version_str__, __proj_name__
+from .util import get_cur_adif_dt
 
 ADX_EXPORT_SCHEMA = xmlschema.XMLSchema(os.path.join(os.path.dirname(__file__), 'xsd/adx314.xsd'))
 ADX_IMPORT_SCHEMA = xmlschema.XMLSchema(os.path.join(os.path.dirname(__file__), 'xsd/adx314generic.xsd'))
@@ -95,7 +98,7 @@ def dump(file_name: str, data_dict: dict, raise_exc=True) -> list[Exception]:
         'ADIF_VER': '3.1.4',
         'PROGRAMID': __proj_name__,
         'PROGRAMVERSION': __version_str__,
-        'CREATED_TIMESTAMP': datetime.datetime.utcnow().strftime('%Y%m%d %H%M%S')
+        'CREATED_TIMESTAMP': get_cur_adif_dt()
     }
 
     if 'HEADER' not in data_dict:

src/adif_file/util.py

@@ -0,0 +1,32 @@
+# PyADIF-File (c) 2023-2025 by Andreas Schawo is licensed under CC BY-SA 4.0.
+# To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/4.0/
+
+"""Provides some useful function to handle ADIF data"""
+
+import sys
+import datetime
+
+
+def get_cur_adif_dt() -> str:
+    """Get current date/time in ADIF format independant of Python version"""
+    if sys.version_info[0] == 3 and sys.version_info[1] < 11:
+        return datetime.datetime.utcnow().strftime('%Y%m%d %H%M%S')
+
+    return datetime.datetime.now(datetime.UTC).strftime('%Y%m%d %H%M%S')
+
+
+def adif_date2iso(date: str) -> str:
+    """Tries to convert ADIF date to iso format"""
+    if not date or len(date) != 8:
+        return date
+    return date[:4] + '-' + date[4:6] + '-' + date[6:8]
+
+
+def adif_time2iso(time: str) -> str:
+    """Tries to convert ADIF time to iso format"""
+    if not time or len(time) not in (4, 6):
+        return time
+    return time[:2] + ':' + time[2:4] + (':' + time[4:6] if len(time) == 6 else '')
+
+
+__all__ = ['get_cur_adif_dt', 'adif_date2iso', 'adif_time2iso']