Replaced stub TimeZone_UTC() class with the standard datetime.timezone.utc. This drops support for Python 3.8 and earlier, but OWSLib now targets 3.10 and later.

Author: spillner

owslib/util.py

@@ -11,7 +11,7 @@
 import sys
 from collections import OrderedDict
 from dateutil import parser
-from datetime import datetime, timedelta, tzinfo
+from datetime import datetime, timezone
 from owslib.etree import etree, ParseError
 from owslib.namespaces import Namespaces
 from urllib.parse import urlsplit, urlencode, urlparse, parse_qs, urlunparse, parse_qsl
@@ -36,21 +36,6 @@ class ServiceException(Exception):
     pass
 
 
-# Allows marking timestamps as UTC without pulling in all of Pytz
-class TimeZone_UTC(tzinfo):
-    def tzname(self, dt):
-        return "UTC"
-
-    def utcoffset(self, dt):
-        return timedelta(0)
-
-    def dst(self, dt):
-        return timedelta(0)
-
-
-tz_utc = TimeZone_UTC()
-
-
 # http://stackoverflow.com/questions/6256183/combine-two-dictionaries-of-dictionaries-python
 def dict_union(d1, d2):
     return dict((x, (dict_union(d1.get(x, {}), d2[x]) if isinstance(d2.get(x), dict) else d2.get(x, d1.get(x))))
@@ -662,7 +647,7 @@ def extract_time(element):
     except Exception:
         att = testXMLValue(element.attrib.get('indeterminatePosition'), True)
         if att and att == 'now':
-            dt = datetime.utcnow().replace(tzinfo=tz_utc)
+            dt = datetime.utcnow().replace(tzinfo=timezone.utc)
         else:
             dt = None
     return dt

tests/doctests/sml_ndbc_station.txt

@@ -3,7 +3,7 @@ Imports
     >>> from tests.utils import resource_file
     >>> from owslib.swe.sensor.sml import SensorML
     >>> from dateutil import parser
-	>>> from owslib.util import TimeZone_UTC
+	>>> from datetime import timezone
 
 Initialize
 
@@ -104,7 +104,7 @@ History
     2
 
     >>> event = his[0]
-    >>> parser.parse(event.date).replace(tzinfo=TimeZone_UTC()).isoformat()
+    >>> parser.parse(event.date).replace(tzinfo=timezone.utc).isoformat()
     '2010-01-12T00:00:00+00:00'
     >>> event.description
     'Deployment start event'

tests/test_util.py

@@ -1,6 +1,6 @@
 # -*- coding: UTF-8 -*-
 import codecs
-from owslib.util import clean_ows_url, build_get_url, strip_bom, extract_time, tz_utc
+from owslib.util import clean_ows_url, build_get_url, strip_bom, extract_time
 from owslib.etree import etree
 from datetime import datetime, timezone
 
@@ -57,7 +57,7 @@ def test_build_get_url_overwrite():
 
 def test_time_zone_utc():
     now = datetime.utcnow()
-    as_utc = now.replace(tzinfo=tz_utc)
+    as_utc = now.replace(tzinfo=timezone.utc)
     assert(as_utc.isoformat()[-6:] == "+00:00")