summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicolargo <nicolas@nicolargo.com>2020-03-03 22:19:23 +0100
committernicolargo <nicolas@nicolargo.com>2020-03-03 22:19:23 +0100
commit105aa65f2117bd3af42292cf1a5f90abd0f78323 (patch)
treeefa381dd9e8e22582d7a0571593e18e096068e02
parent2c9e80b4a5d29b6c99ecfd94d6c186d5fa6cbc21 (diff)
Correct an issue on Windows, time zone not display correctly. Skip it for the moment
-rw-r--r--glances/plugins/glances_now.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/glances/plugins/glances_now.py b/glances/plugins/glances_now.py
index 85f4ece1..c549335a 100644
--- a/glances/plugins/glances_now.py
+++ b/glances/plugins/glances_now.py
@@ -22,6 +22,7 @@
from time import tzname, localtime
from datetime import datetime
+from glances.globals import WINDOWS
from glances.plugins.glances_plugin import GlancesPlugin
@@ -49,11 +50,12 @@ class Plugin(GlancesPlugin):
"""Update current date/time."""
# Had to convert it to string because datetime is not JSON serializable
self.stats = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
- # Add the time zone (issue #1249 and issue #1337)
- if 'tmzone' in localtime():
- self.stats += ' {}'.format(localtime().tm_zone)
- elif len(tzname) > 0:
- self.stats += ' {}'.format(tzname[1])
+ # Add the time zone (issue #1249 / #1337 / #1598)
+ if not WINDOWS:
+ if 'tmzone' in localtime():
+ self.stats += ' {}'.format(localtime().tm_zone)
+ elif len(tzname) > 0:
+ self.stats += ' {}'.format(tzname[1])
return self.stats