Can use countdown without timezone

This commit is contained in:
nemunaire 2014-10-09 07:30:04 +02:00
parent dfde4c5f49
commit f9ee1fe898
2 changed files with 16 additions and 8 deletions

View File

@ -4,8 +4,7 @@
import re
import sys
from datetime import datetime
from datetime import date
from datetime import date, datetime
from hooks import hook
from tools.countdown import countdown_format

View File

@ -67,12 +67,21 @@ def countdown_format(date, msg_before, msg_after, tz=None):
time.tzset()
#Calculate time before the date
if datetime.now(timezone.utc) > date:
sentence_c = msg_after
delta = datetime.now(timezone.utc) - date
else:
sentence_c = msg_before
delta = date - datetime.now(timezone.utc)
try:
if datetime.now(timezone.utc) > date:
sentence_c = msg_after
delta = datetime.now(timezone.utc) - date
else:
sentence_c = msg_before
delta = date - datetime.now(timezone.utc)
except TypeError:
if datetime.now() > date:
sentence_c = msg_after
delta = datetime.now() - date
else:
sentence_c = msg_before
delta = date - datetime.now()
if tz != None:
os.environ['TZ'] = oldtz