Apply black formatter to code

[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

.travis.yml

@@ -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

features/steps/core.py

@@ -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)
 
 

jrnl/Entry.py

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

jrnl/install.py

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

jrnl/upgrade.py

@@ -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 = {}