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

Merge master and fix merge conflict

Browse source 
Signed-off-by: Aniket Pant <me@aniketpant.com>
This commit is contained in:
Aniket Pant 2013-06-26 11:19:10 +05:30
commit c9d5e13667
4 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
jrnl/Entry.py
View file

@ -15,7 +15,7 @@ class Entry:
def parse_tags(self):
fulltext = " ".join([self.title, self.body]).lower()
tags = re.findall(ur'([{}]\w+)'.format(self.journal.config['tagsymbols']), fulltext, re.UNICODE)
tags = re.findall(r'(?u)([{}]\w+)'.format(self.journal.config['tagsymbols']), fulltext, re.UNICODE)
self.tags = set(tags)
def __unicode__(self):

6
jrnl/Journal.py
View file

@ -171,13 +171,13 @@ class Journal(object):
lambda match: self._colorize(match.group(0)),
pp, re.UNICODE)
else:
pp = re.sub(ur"(?u)([{}]\w+)".format(self.config['tagsymbols']),
pp = re.sub(r"(?u)([{}]\w+)".format(self.config['tagsymbols']),
lambda match: self._colorize(match.group(0)),
pp)
return pp
def __repr__(self):
return "<Journal with %d entries>" % len(self.entries)
return "<Journal with {} entries>".format(len(self.entries))
def write(self, filename=None):
"""Dumps the journal into the config file, overwriting it"""
@ -230,7 +230,7 @@ class Journal(object):
for m in matches:
date = e.date.strftime(self.config['timeformat'])
excerpt = e.body[m.start():min(len(e.body), m.end()+60)]
res.append('%s %s ..' % (date, excerpt))
res.append('{} {} ..'.format(date, excerpt))
e.body = "\n".join(res)
else:
for e in self.entries: