l.behm/bumblebee-status
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Use pytz to figure out local timezone dynamically"

Browse source 
This reverts commit c19de638a1.
This commit is contained in:
Tobias Witek 2020-01-02 13:50:15 +01:00
parent cede2de42c
commit 472b182ab8
1 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
bumblebee/modules/datetime.py
View file

@ -15,11 +15,6 @@ from __future__ import absolute_import
import datetime import datetime
import locale import locale
import bumblebee.engine import bumblebee.engine
import os
try:
import pytz
except ModuleNotFoundError:
pytz = None
def default_format(module): def default_format(module):
default = "%x %X" default = "%x %X"
@ -46,15 +41,8 @@ class Module(bumblebee.engine.Module):
locale.setlocale(locale.LC_TIME, ('en_US', 'UTF-8')) locale.setlocale(locale.LC_TIME, ('en_US', 'UTF-8'))
def get_time(self, widget): def get_time(self, widget):
if pytz:
# Get local timezone (see https://github.com/tobi-wan-kenobi/bumblebee-status/issues/468)
my_tz_name = '/'.join(os.path.realpath('/etc/localtime').split('/')[-2:])
my_tz = pytz.timezone(my_tz_name)
else:
my_tz = None
enc = locale.getpreferredencoding() enc = locale.getpreferredencoding()
retval = datetime.datetime.now(my_tz).strftime(self._fmt) retval = datetime.datetime.now().strftime(self._fmt)
if hasattr(retval, "decode"): if hasattr(retval, "decode"):
return retval.decode(enc) return retval.decode(enc)
return retval return retval