fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-06-28 21:46:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Convert from local util.get_local_timezone() to tzlocal.get_localzone()

Browse source 
one side effect is that a `pytz` object is returned rather than a
string, and so conversion to a string must be done explicitly at run
time where needed.
This commit is contained in:
William Minchin 2014-01-29 09:57:15 -07:00
parent b77a195f23
commit 623fc076ad
3 changed files with 5 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

5
jrnl/Journal.py
View file

@ -23,6 +23,7 @@ import hashlib
import plistlib
import pytz
import uuid
import tzlocal
class Journal(object):
def __init__(self, name='default', **kwargs):
@ -333,7 +334,7 @@ class DayOne(Journal):
try:
timezone = pytz.timezone(dict_entry['Time Zone'])
except (KeyError, pytz.exceptions.UnknownTimeZoneError):
timezone = pytz.timezone(util.get_local_timezone())
timezone = tzlocal.get_localzone()
date = dict_entry['Creation Date']
date = date + timezone.utcoffset(date)
raw = dict_entry['Entry Text']
@ -357,7 +358,7 @@ class DayOne(Journal):
'Creation Date': utc_time,
'Starred': entry.starred if hasattr(entry, 'starred') else False,
'Entry Text': entry.title+"\n"+entry.body,
'Time Zone': util.get_local_timezone(),
'Time Zone': str(tzlocal.get_localzone()),
'UUID': entry.uuid,
'Tags': [tag.strip(self.config['tagsymbols']) for tag in entry.tags]
}