mirror of
https://github.com/jrnl-org/jrnl.git
synced 2025-05-18 12:08:31 +02:00
Run make format
This commit is contained in:
parent
076674f993
commit
58b3e3488f
1 changed files with 3 additions and 5 deletions
|
@ -68,14 +68,12 @@ class Journal:
|
||||||
|
|
||||||
def import_(self, other_journal_txt):
|
def import_(self, other_journal_txt):
|
||||||
imported_entries = self._parse(other_journal_txt)
|
imported_entries = self._parse(other_journal_txt)
|
||||||
for entry in imported_entries: entry.modified = True
|
for entry in imported_entries:
|
||||||
|
entry.modified = True
|
||||||
|
|
||||||
self.entries = list(
|
self.entries = list(frozenset(self.entries) | frozenset(imported_entries))
|
||||||
frozenset(self.entries) | frozenset(imported_entries)
|
|
||||||
)
|
|
||||||
self.sort()
|
self.sort()
|
||||||
|
|
||||||
|
|
||||||
def open(self, filename=None):
|
def open(self, filename=None):
|
||||||
"""Opens the journal file defined in the config and parses it into a list of Entries.
|
"""Opens the journal file defined in the config and parses it into a list of Entries.
|
||||||
Entries have the form (date, title, body)."""
|
Entries have the form (date, title, body)."""
|
||||||
|
|
Loading…
Add table
Reference in a new issue