fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-17 11:38:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix issues on namespace of 'colorama' variable

Browse source
This commit is contained in:
William Minchin 2014-01-02 18:53:16 -07:00
parent afb5c03389
commit 516b01bb18
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
jrnl/Journal.py
View file

@ -168,11 +168,11 @@ class Journal(object):
for tag in self.search_tags: for tag in self.search_tags:
tagre = re.compile(re.escape(tag), re.IGNORECASE) tagre = re.compile(re.escape(tag), re.IGNORECASE)
pp = re.sub(tagre, pp = re.sub(tagre,
lambda match: util.colorize(match.group(0)), lambda match: util.colorize(match.group(0), colorama),
pp, re.UNICODE) pp, re.UNICODE)
else: else:
pp = re.sub(r"(?u)([{tags}]\w+)".format(tags=self.config['tagsymbols']), pp = re.sub(r"(?u)([{tags}]\w+)".format(tags=self.config['tagsymbols']),
lambda match: util.colorize(match.group(0)), lambda match: util.colorize(match.group(0), colorama),
pp) pp)
return pp return pp
@ -435,4 +435,3 @@ class DayOne(Journal):
self._deleted_entries = [e for e in self.entries if e.uuid not in edited_uuids] self._deleted_entries = [e for e in self.entries if e.uuid not in edited_uuids]
self.entries[:] = [e for e in self.entries if e.uuid in edited_uuids] self.entries[:] = [e for e in self.entries if e.uuid in edited_uuids]
return entries return entries

2
jrnl/util.py
View file

@ -139,7 +139,7 @@ def get_text_from_editor(config, template=""):
prompt('[Nothing saved to file]') prompt('[Nothing saved to file]')
return raw return raw
def colorize(string): def colorize(string, colorama=None):
"""Returns the string wrapped in cyan ANSI escape""" """Returns the string wrapped in cyan ANSI escape"""
if os.name == "nt" and not colorama: if os.name == "nt" and not colorama:
return string return string