Clean up copyright notices and version screen (#1553)

* update copyright symbols to unicode * clean up version screen/copyright notice * small change to make commands more similar * update imports to appease isort * fix test * update one more file merged since PR was open
2025-06-29 14:06:14 +02:00 · 2022-08-21 14:17:35 -07:00 · 2022-08-21 14:17:35 -07:00 · 4eb9c9fdec
commit 4eb9c9fdec
parent 5dcc721f15
102 changed files with 116 additions and 109 deletions
--- a/jrnl/DayOneJournal.py
+++ b/jrnl/DayOneJournal.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 import datetime
--- a/jrnl/EncryptedJournal.py
+++ b/jrnl/EncryptedJournal.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 import base64
--- a/jrnl/Entry.py
+++ b/jrnl/Entry.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 import datetime
--- a/jrnl/FolderJournal.py
+++ b/jrnl/FolderJournal.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 import codecs
--- a/jrnl/Journal.py
+++ b/jrnl/Journal.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 import datetime
--- a/jrnl/init.py
+++ b/jrnl/init.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 try:
--- a/jrnl/main.py
+++ b/jrnl/main.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 import sys
--- a/jrnl/args.py
+++ b/jrnl/args.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 import argparse
--- a/jrnl/cli.py
+++ b/jrnl/cli.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 import logging
--- a/jrnl/color.py
+++ b/jrnl/color.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 import re
--- a/jrnl/commands.py
+++ b/jrnl/commands.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 """
@ -26,27 +26,34 @@ from jrnl.prompt import create_password


 def preconfig_diagnostic(_):
+    from jrnl import __title__
    from jrnl import __version__

    print(
-        f"jrnl: {__version__}\n"
+        f"{__title__}: {__version__}\n"
        f"Python: {sys.version}\n"
        f"OS: {platform.system()} {platform.release()}"
    )


 def preconfig_version(_):
+    import textwrap
+
    from jrnl import __title__
    from jrnl import __version__

-    version_str = f"""{__title__} version {__version__}
+    output = f"""
+    {__title__} {__version__}

-Copyright (C) 2012-2022 jrnl contributors
+    Copyright © 2012-2022 jrnl contributors

-This is free software, and you are welcome to redistribute it under certain
-conditions; for details, see: https://www.gnu.org/licenses/gpl-3.0.html"""
+    This is free software, and you are welcome to redistribute it under certain
+    conditions; for details, see: https://www.gnu.org/licenses/gpl-3.0.html
+    """

-    print(version_str)
+    output = textwrap.dedent(output).strip()
+
+    print(output)


 def postconfig_list(config, **kwargs):
--- a/jrnl/config.py
+++ b/jrnl/config.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 import logging
--- a/jrnl/editor.py
+++ b/jrnl/editor.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 import logging
--- a/jrnl/exception.py
+++ b/jrnl/exception.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 from jrnl.messages import Message
--- a/jrnl/install.py
+++ b/jrnl/install.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 import glob
--- a/jrnl/jrnl.py
+++ b/jrnl/jrnl.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 import logging
--- a/jrnl/messages/Message.py
+++ b/jrnl/messages/Message.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 from typing import Mapping
--- a/jrnl/messages/MsgStyle.py
+++ b/jrnl/messages/MsgStyle.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 from enum import Enum
--- a/jrnl/messages/MsgText.py
+++ b/jrnl/messages/MsgText.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 from enum import Enum
--- a/jrnl/messages/init.py
+++ b/jrnl/messages/init.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 from jrnl.messages.Message import Message
--- a/jrnl/os_compat.py
+++ b/jrnl/os_compat.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 import shlex
--- a/jrnl/output.py
+++ b/jrnl/output.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 import textwrap
--- a/jrnl/override.py
+++ b/jrnl/override.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 from argparse import Namespace
--- a/jrnl/path.py
+++ b/jrnl/path.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 import os.path
--- a/jrnl/plugins/init.py
+++ b/jrnl/plugins/init.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 from jrnl.plugins.dates_exporter import DatesExporter
--- a/jrnl/plugins/dates_exporter.py
+++ b/jrnl/plugins/dates_exporter.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 from collections import Counter
--- a/jrnl/plugins/fancy_exporter.py
+++ b/jrnl/plugins/fancy_exporter.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 import logging
--- a/jrnl/plugins/jrnl_importer.py
+++ b/jrnl/plugins/jrnl_importer.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 import sys
--- a/jrnl/plugins/json_exporter.py
+++ b/jrnl/plugins/json_exporter.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 import json
--- a/jrnl/plugins/markdown_exporter.py
+++ b/jrnl/plugins/markdown_exporter.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 import os
--- a/jrnl/plugins/tag_exporter.py
+++ b/jrnl/plugins/tag_exporter.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 from jrnl.plugins.text_exporter import TextExporter
--- a/jrnl/plugins/text_exporter.py
+++ b/jrnl/plugins/text_exporter.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 import errno
--- a/jrnl/plugins/util.py
+++ b/jrnl/plugins/util.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html


--- a/jrnl/plugins/xml_exporter.py
+++ b/jrnl/plugins/xml_exporter.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 from xml.dom import minidom
--- a/jrnl/plugins/yaml_exporter.py
+++ b/jrnl/plugins/yaml_exporter.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 import os
--- a/jrnl/prompt.py
+++ b/jrnl/prompt.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 from jrnl.messages import Message
--- a/jrnl/time.py
+++ b/jrnl/time.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 import datetime
--- a/jrnl/upgrade.py
+++ b/jrnl/upgrade.py
@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022 jrnl contributors
+# Copyright © 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html

 import os