From b877822883b5ca3ff8fd7af2356511da9b0fd1ab Mon Sep 17 00:00:00 2001 From: Stephan Gabler Date: Mon, 14 May 2012 21:44:30 +0200 Subject: [PATCH] simplify date parsing and remove some whitespace --- jrnl.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jrnl.py b/jrnl.py index 6da09640..b3603c6e 100755 --- a/jrnl.py +++ b/jrnl.py @@ -175,7 +175,7 @@ class Journal: for line in journal.split(os.linesep): if line: try: - new_date = datetime.fromtimestamp(time.mktime(time.strptime(line[:date_length], self.config['timeformat']))) + new_date = datetime.strptime(line[:date_length], self.config['timeformat']) # make a journal entry of the current stuff first if new_date and current_entry: entries.append(current_entry) @@ -459,8 +459,8 @@ if __name__ == "__main__": elif args.tags: # get all tags # Astute reader: should the following line leave you as puzzled as me the first time # I came across this construction, worry not and embrace the ensuing moment of enlightment. - tags = [tag - for entry in journal.entries + tags = [tag + for entry in journal.entries for tag in set(entry.tags) ] # To be read: [for entry in journal.entries: for tag in set(entry.tags): tag]