diff --git a/aprsd/plugins/time.py b/aprsd/plugins/time.py index 4509022..a6ded11 100644 --- a/aprsd/plugins/time.py +++ b/aprsd/plugins/time.py @@ -1,9 +1,9 @@ import logging import re -import time from oslo_config import cfg import pytz +from tzlocal import get_localzone from aprsd import packets, plugin, plugin_utils from aprsd.utils import fuzzy, trace @@ -22,7 +22,8 @@ class TimePlugin(plugin.APRSDRegexCommandPluginBase): short_description = "What is the current local time." def _get_local_tz(self): - return pytz.timezone(time.strftime("%Z")) + lz = get_localzone() + return pytz.timezone(str(lz)) def _get_utcnow(self): return pytz.datetime.datetime.utcnow() diff --git a/dev-requirements.txt b/dev-requirements.txt index 02c2508..96a9ae7 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -23,7 +23,7 @@ coverage[toml]==7.4.4 # via pytest-cov distlib==0.3.8 # via virtualenv docutils==0.20.1 # via sphinx exceptiongroup==1.2.0 # via pytest -filelock==3.13.3 # via tox, virtualenv +filelock==3.13.4 # via tox, virtualenv fixit==2.1.0 # via gray flake8==7.0.0 # via -r dev-requirements.in, pep8-naming gray==0.14.0 # via -r dev-requirements.in diff --git a/requirements.in b/requirements.in index c948d5b..c6677e8 100644 --- a/requirements.in +++ b/requirements.in @@ -11,6 +11,7 @@ pbr pyyaml requests pytz +tzlocal six thesmuggler update_checker diff --git a/requirements.txt b/requirements.txt index 8d379a2..9fcb416 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,7 +23,7 @@ debtcollector==3.0.0 # via oslo-config deprecated==1.2.14 # via click-params dnspython==2.6.1 # via eventlet eventlet==0.36.1 # via -r requirements.in -flask==3.0.2 # via -r requirements.in, flask-httpauth, flask-socketio +flask==3.0.3 # via -r requirements.in, flask-httpauth, flask-socketio flask-httpauth==4.8.0 # via -r requirements.in flask-socketio==5.3.6 # via -r requirements.in geographiclib==2.0 # via geopy @@ -67,6 +67,7 @@ tabulate==0.9.0 # via -r requirements.in thesmuggler==1.0.1 # via -r requirements.in typing-extensions==4.11.0 # via typing-inspect typing-inspect==0.9.0 # via dataclasses-json +tzlocal==5.2 # via -r requirements.in update-checker==0.18.0 # via -r requirements.in urllib3==2.2.1 # via requests validators==0.22.0 # via click-params