Merge pull request #769 from MinchinWeb/black

Black Formatter
This commit is contained in:
Jonathan Wren 2019-12-21 12:57:32 -08:00 committed by GitHub
commit 2e920a7e8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 14 deletions

View file

@ -53,6 +53,13 @@ jobs:
- os: windows
include:
- stage: Lint & Tests
name: Lint, via Black
python: 3.8
# black is automatically installed by peotry
script:
- black --check . --verbose --diff
# Python 3.6 Tests
- name: Python 3.6 on Linux
python: 3.6

View file

@ -60,12 +60,15 @@ 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
if type(journal_conf) is dict:
# We can override the default config on a by-journal basis
config.update(journal_conf)
else: # But also just give them a string to point to the journal file
else:
# But also just give them a string to point to the journal file
config["journal"] = journal_conf
return Journal.open_journal(journal_name, config)

View file

@ -108,9 +108,7 @@ class Entry:
return title
else:
return "{title}{sep}{body}\n".format(
title=title,
sep="\n" if has_body else "",
body=body if has_body else "",
title=title, sep="\n" if has_body else "", body=body if has_body else ""
)
def __repr__(self):

View file

@ -138,9 +138,8 @@ def install():
os.path.expandvars(journal_path)
)
path = os.path.split(default_config["journals"][DEFAULT_JOURNAL_KEY])[
0
] # If the folder doesn't exist, create it
# If the folder doesn't exist, create it
path = os.path.split(default_config["journals"][DEFAULT_JOURNAL_KEY])[0]
try:
os.makedirs(path)
except OSError:

View file

@ -26,7 +26,7 @@ def upgrade_jrnl_if_necessary(config_path):
config = util.load_config(config_path)
print(
"""Welcome to jrnl {}.
f"""Welcome to jrnl {__version__}.
It looks like you've been using an older version of jrnl until now. That's
okay - jrnl will now upgrade your configuration and journal files. Afterwards
@ -40,10 +40,9 @@ you can enjoy all of the great new features that come with jrnl 2:
Please note that jrnl 1.x is NOT forward compatible with this version of jrnl.
If you choose to proceed, you will not be able to use your journals with
older versions of jrnl anymore.
""".format(
__version__
)
"""
)
encrypted_journals = {}
plain_journals = {}
other_journals = {}