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

Apply black formatter to code

Browse source 
[Travis] add a linting stage (via `black`)
[Travis] update as per code review
Remove "Lint" as separate stage; have `black` check the output rather
than run the re-formmater
This commit is contained in:
MinchinWeb 2019-12-07 12:32:55 -07:00
parent 46c4c88231
commit 04f6154c93
5 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
features/steps/core.py
View file

@ -60,12 +60,14 @@ def read_journal(journal_name="default"):
def open_journal(journal_name="default"):
config = util.load_config(install.CONFIG_FILE_PATH)
journal_conf = config["journals"][journal_name]
if (
type(journal_conf) is dict
): # We can override the default config on a by-journal basis
# We can override the default config on a by-journal basis
if type(journal_conf) is dict:
config.update(journal_conf)
else: # But also just give them a string to point to the journal file
# But also just give them a string to point to the journal file
else:
config["journal"] = journal_conf
return Journal.open_journal(journal_name, config)