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

Add and run isort on Python files (#1520)

Browse source 
* add and run isort

* udpate more import statements

* fix typo
This commit is contained in:
Jonathan Wren 2022-06-25 14:43:32 -07:00 • committed by GitHub
parent 20254f7434
commit 0f2962a95f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
44 changed files with 223 additions and 203 deletions
Download patch file Download diff file Expand all files Collapse all files

10
jrnl/DayOneJournal.py
View file

@ -4,22 +4,22 @@
import datetime
import fnmatch
import os
from pathlib import Path
import platform
import plistlib
import re
import socket
import time
import uuid
from pathlib import Path
from xml.parsers.expat import ExpatError
import pytz
import tzlocal
from . import Entry
from . import Journal
from . import __title__
from . import __version__
from jrnl import Entry
from jrnl import Journal
from jrnl import __title__
from jrnl import __version__
class DayOne(Journal.Journal):

9
jrnl/EncryptedJournal.py
View file

@ -18,15 +18,14 @@ from cryptography.hazmat.primitives.ciphers import algorithms
from cryptography.hazmat.primitives.ciphers import modes
from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC
from .Journal import Journal
from .Journal import LegacyJournal
from .prompt import create_password
from jrnl.exception import JrnlException
from jrnl.Journal import Journal
from jrnl.Journal import LegacyJournal
from jrnl.messages import Message
from jrnl.messages import MsgText
from jrnl.messages import MsgStyle
from jrnl.messages import MsgText
from jrnl.output import print_msg
from jrnl.prompt import create_password
def make_key(password):

4
jrnl/Entry.py
View file

@ -6,8 +6,8 @@ import re
import ansiwrap
from .color import colorize
from .color import highlight_tags_with_background_color
from jrnl.color import colorize
from jrnl.color import highlight_tags_with_background_color
class Entry:

4
jrnl/FolderJournal.py
View file

@ -5,8 +5,8 @@ import codecs
import fnmatch
import os
from . import Journal
from . import time
from jrnl import Journal
from jrnl import time
def get_files(journal_config):

21
jrnl/Journal.py
View file

@ -6,15 +6,14 @@ import logging
import os
import re
from . import Entry
from . import time
from .prompt import yesno
from .path import expand_path
from jrnl.output import print_msg
from jrnl import Entry
from jrnl import time
from jrnl.messages import Message
from jrnl.messages import MsgText
from jrnl.messages import MsgStyle
from jrnl.messages import MsgText
from jrnl.output import print_msg
from jrnl.path import expand_path
from jrnl.prompt import yesno
class Tag:
@ -449,11 +448,11 @@ def open_journal(journal_name, config, legacy=False):
if config["journal"].strip("/").endswith(".dayone") or "entries" in os.listdir(
config["journal"]
):
from . import DayOneJournal
from jrnl import DayOneJournal
return DayOneJournal.DayOne(**config).open()
else:
from . import FolderJournal
from jrnl import FolderJournal
return FolderJournal.Folder(journal_name, **config).open()
@ -461,12 +460,12 @@ def open_journal(journal_name, config, legacy=False):
if legacy:
return LegacyJournal(journal_name, **config).open()
if config["journal"].endswith(os.sep):
from . import FolderJournal
from jrnl import FolderJournal
return FolderJournal.Folder(journal_name, **config).open()
return PlainJournal(journal_name, **config).open()
from . import EncryptedJournal
from jrnl import EncryptedJournal
if legacy:
return EncryptedJournal.LegacyEncryptedJournal(journal_name, **config).open()

2
jrnl/__init__.py
View file

@ -2,7 +2,7 @@
# License: https://www.gnu.org/licenses/gpl-3.0.html
try:
from .__version__ import __version__
from jrnl.__version__ import __version__
except ImportError:
__version__ = "source"
__title__ = "jrnl"

2
jrnl/__main__.py
View file

@ -3,7 +3,7 @@
import sys
from .cli import cli
from jrnl.cli import cli
if __name__ == "__main__":
sys.exit(cli())

20
jrnl/args.py
View file

@ -5,16 +5,16 @@ import argparse
import re
import textwrap
from .commands import postconfig_decrypt
from .commands import postconfig_encrypt
from .commands import postconfig_import
from .commands import postconfig_list
from .commands import preconfig_diagnostic
from .commands import preconfig_version
from .output import deprecated_cmd
from .plugins import EXPORT_FORMATS
from .plugins import IMPORT_FORMATS
from .plugins import util
from jrnl.commands import postconfig_decrypt
from jrnl.commands import postconfig_encrypt
from jrnl.commands import postconfig_import
from jrnl.commands import postconfig_list
from jrnl.commands import preconfig_diagnostic
from jrnl.commands import preconfig_version
from jrnl.output import deprecated_cmd
from jrnl.plugins import EXPORT_FORMATS
from jrnl.plugins import IMPORT_FORMATS
from jrnl.plugins import util
class WrappingFormatter(argparse.RawTextHelpFormatter):

9
jrnl/cli.py
View file

@ -5,14 +5,13 @@ import logging
import sys
import traceback
from .jrnl import run
from .args import parse_args
from jrnl.output import print_msg
from jrnl.args import parse_args
from jrnl.exception import JrnlException
from jrnl.jrnl import run
from jrnl.messages import Message
from jrnl.messages import MsgText
from jrnl.messages import MsgStyle
from jrnl.messages import MsgText
from jrnl.output import print_msg
def configure_logger(debug=False):

2
jrnl/color.py
View file

@ -7,7 +7,7 @@ from string import whitespace
import colorama
from .os_compat import on_windows
from jrnl.os_compat import on_windows
if on_windows():
colorama.init()

26
jrnl/commands.py
View file

@ -17,11 +17,11 @@ avoid any possible overhead for these standalone commands.
import platform
import sys
from jrnl.output import print_msg
from jrnl.exception import JrnlException
from jrnl.messages import Message
from jrnl.messages import MsgText
from jrnl.messages import MsgStyle
from jrnl.messages import MsgText
from jrnl.output import print_msg
from jrnl.prompt import create_password
@ -50,14 +50,14 @@ conditions; for details, see: https://www.gnu.org/licenses/gpl-3.0.html"""
def postconfig_list(config, **kwargs):
from .output import list_journals
from jrnl.output import list_journals
print(list_journals(config))
def postconfig_import(args, config, **kwargs):
from .Journal import open_journal
from .plugins import get_importer
from jrnl.Journal import open_journal
from jrnl.plugins import get_importer
# Requires opening the journal
journal = open_journal(args.journal_name, config)
@ -70,10 +70,10 @@ def postconfig_encrypt(args, config, original_config, **kwargs):
"""
Encrypt a journal in place, or optionally to a new file
"""
from .EncryptedJournal import EncryptedJournal
from .Journal import open_journal
from .config import update_config
from .install import save_config
from jrnl.config import update_config
from jrnl.EncryptedJournal import EncryptedJournal
from jrnl.install import save_config
from jrnl.Journal import open_journal
# Open the journal
journal = open_journal(args.journal_name, config)
@ -118,10 +118,10 @@ def postconfig_encrypt(args, config, original_config, **kwargs):
def postconfig_decrypt(args, config, original_config, **kwargs):
"""Decrypts into new file. If filename is not set, we encrypt the journal file itself."""
from .Journal import PlainJournal
from .Journal import open_journal
from .config import update_config
from .install import save_config
from jrnl.config import update_config
from jrnl.install import save_config
from jrnl.Journal import PlainJournal
from jrnl.Journal import open_journal
journal = open_journal(args.journal_name, config)
journal.config["encrypt"] = False

13
jrnl/config.py
View file

@ -5,18 +5,17 @@ import logging
import os
import colorama
from ruamel.yaml import YAML
import xdg.BaseDirectory
from ruamel.yaml import YAML
from . import __version__
from jrnl.output import list_journals
from jrnl.output import print_msg
from jrnl import __version__
from jrnl.exception import JrnlException
from jrnl.messages import Message
from jrnl.messages import MsgText
from jrnl.messages import MsgStyle
from .path import home_dir
from jrnl.messages import MsgText
from jrnl.output import list_journals
from jrnl.output import print_msg
from jrnl.path import home_dir
# Constants
DEFAULT_CONFIG_NAME = "jrnl.yaml"

9
jrnl/editor.py
View file

@ -8,15 +8,14 @@ import sys
import tempfile
from pathlib import Path
from jrnl.exception import JrnlException
from jrnl.messages import Message
from jrnl.messages import MsgStyle
from jrnl.messages import MsgText
from jrnl.os_compat import on_windows
from jrnl.os_compat import split_args
from jrnl.output import print_msg
from jrnl.exception import JrnlException
from jrnl.messages import Message
from jrnl.messages import MsgText
from jrnl.messages import MsgStyle
def get_text_from_editor(config, template=""):
suffix = ".jrnl"

29
jrnl/install.py
View file

@ -6,24 +6,23 @@ import logging
import os
import sys
from .path import home_dir
from .path import absolute_path
from .path import expand_path
from .config import DEFAULT_JOURNAL_KEY
from .config import get_config_path
from .config import get_default_config
from .config import get_default_journal_path
from .config import load_config
from .config import save_config
from .config import verify_config_colors
from .prompt import yesno
from .upgrade import is_old_version
from jrnl.output import print_msg
from jrnl.config import DEFAULT_JOURNAL_KEY
from jrnl.config import get_config_path
from jrnl.config import get_default_config
from jrnl.config import get_default_journal_path
from jrnl.config import load_config
from jrnl.config import save_config
from jrnl.config import verify_config_colors
from jrnl.exception import JrnlException
from jrnl.messages import Message
from jrnl.messages import MsgText
from jrnl.messages import MsgStyle
from jrnl.messages import MsgText
from jrnl.output import print_msg
from jrnl.path import absolute_path
from jrnl.path import expand_path
from jrnl.path import home_dir
from jrnl.prompt import yesno
from jrnl.upgrade import is_old_version
def upgrade_config(config_data, alt_config_path=None):

31
jrnl/jrnl.py
View file

@ -4,24 +4,23 @@
import logging
import sys
from . import install
from . import plugins
from .Journal import open_journal
from .config import get_journal_name
from .config import scope_config
from .config import get_config_path
from .editor import get_text_from_editor
from .editor import get_text_from_stdin
from . import time
from .override import apply_overrides
from jrnl import install
from jrnl import plugins
from jrnl import time
from jrnl.config import get_config_path
from jrnl.config import get_journal_name
from jrnl.config import scope_config
from jrnl.editor import get_text_from_editor
from jrnl.editor import get_text_from_stdin
from jrnl.exception import JrnlException
from jrnl.Journal import open_journal
from jrnl.messages import Message
from jrnl.messages import MsgStyle
from jrnl.messages import MsgText
from jrnl.output import print_msg
from jrnl.output import print_msgs
from .path import expand_path
from jrnl.exception import JrnlException
from jrnl.messages import Message
from jrnl.messages import MsgText
from jrnl.messages import MsgStyle
from jrnl.override import apply_overrides
from jrnl.path import expand_path
def run(args):

6
jrnl/messages/Message.py
View file

@ -1,11 +1,11 @@
# Copyright (C) 2012-2022 jrnl contributors
# License: https://www.gnu.org/licenses/gpl-3.0.html
from typing import NamedTuple
from typing import Mapping
from typing import NamedTuple
from .MsgText import MsgText
from .MsgStyle import MsgStyle
from jrnl.messages.MsgStyle import MsgStyle
from jrnl.messages.MsgText import MsgText
class Message(NamedTuple):

9
jrnl/messages/MsgStyle.py
View file

@ -2,12 +2,13 @@
# License: https://www.gnu.org/licenses/gpl-3.0.html
from enum import Enum
from typing import NamedTuple
from typing import Callable
from rich.panel import Panel
from rich import box
from typing import NamedTuple
from .MsgText import MsgText
from rich import box
from rich.panel import Panel
from jrnl.messages.MsgText import MsgText
class MsgStyle(Enum):

6
jrnl/messages/__init__.py
View file

@ -1,9 +1,9 @@
# Copyright (C) 2012-2022 jrnl contributors
# License: https://www.gnu.org/licenses/gpl-3.0.html
from .Message import Message
from .MsgStyle import MsgStyle
from .MsgText import MsgText
from jrnl.messages.Message import Message
from jrnl.messages.MsgStyle import MsgStyle
from jrnl.messages.MsgText import MsgText
Message = Message
MsgStyle = MsgStyle

6
jrnl/output.py
View file

@ -2,10 +2,10 @@
# License: https://www.gnu.org/licenses/gpl-3.0.html
import textwrap
from typing import Union
from rich.text import Text
from rich.console import Console
from rich.text import Text
from jrnl.messages import Message
from jrnl.messages import MsgStyle
@ -26,7 +26,7 @@ def deprecated_cmd(old_cmd, new_cmd, callback=None, **kwargs):
def list_journals(configuration):
from . import config
from jrnl import config
"""List the journals specified in the configuration file"""
result = f"Journals defined in config ({config.get_config_path()})\n"

5
jrnl/override.py
View file

@ -1,9 +1,12 @@
# Copyright (C) 2012-2022 jrnl contributors
# License: https://www.gnu.org/licenses/gpl-3.0.html
from .config import update_config, make_yaml_valid_dict
from argparse import Namespace
from jrnl.config import make_yaml_valid_dict
from jrnl.config import update_config
# import logging
def apply_overrides(args: Namespace, base_config: dict) -> dict:
"""Unpack CLI provided overrides into the configuration tree.

18
jrnl/plugins/__init__.py
View file

@ -1,15 +1,15 @@
# Copyright (C) 2012-2022 jrnl contributors
# License: https://www.gnu.org/licenses/gpl-3.0.html
from .fancy_exporter import FancyExporter
from .jrnl_importer import JRNLImporter
from .json_exporter import JSONExporter
from .markdown_exporter import MarkdownExporter
from .tag_exporter import TagExporter
from .dates_exporter import DatesExporter
from .text_exporter import TextExporter
from .xml_exporter import XMLExporter
from .yaml_exporter import YAMLExporter
from jrnl.plugins.dates_exporter import DatesExporter
from jrnl.plugins.fancy_exporter import FancyExporter
from jrnl.plugins.jrnl_importer import JRNLImporter
from jrnl.plugins.json_exporter import JSONExporter
from jrnl.plugins.markdown_exporter import MarkdownExporter
from jrnl.plugins.tag_exporter import TagExporter
from jrnl.plugins.text_exporter import TextExporter
from jrnl.plugins.xml_exporter import XMLExporter
from jrnl.plugins.yaml_exporter import YAMLExporter
__exporters = [
JSONExporter,

2
jrnl/plugins/dates_exporter.py
View file

@ -3,7 +3,7 @@
from collections import Counter
from .text_exporter import TextExporter
from jrnl.plugins.text_exporter import TextExporter
class DatesExporter(TextExporter):

10
jrnl/plugins/fancy_exporter.py
View file

@ -1,13 +1,13 @@
# Copyright (C) 2012-2022 jrnl contributors
# License: https://www.gnu.org/licenses/gpl-3.0.html
from jrnl.exception import JrnlException
from jrnl.messages import Message
from jrnl.messages import MsgText
from jrnl.messages import MsgStyle
from textwrap import TextWrapper
from .text_exporter import TextExporter
from jrnl.exception import JrnlException
from jrnl.messages import Message
from jrnl.messages import MsgStyle
from jrnl.messages import MsgText
from jrnl.plugins.text_exporter import TextExporter
class FancyExporter(TextExporter):

2
jrnl/plugins/jrnl_importer.py
View file

@ -5,8 +5,8 @@ import sys
from jrnl.exception import JrnlException
from jrnl.messages import Message
from jrnl.messages import MsgText
from jrnl.messages import MsgStyle
from jrnl.messages import MsgText
from jrnl.output import print_msg

4
jrnl/plugins/json_exporter.py
View file

@ -3,8 +3,8 @@
import json
from .text_exporter import TextExporter
from .util import get_tags_count
from jrnl.plugins.text_exporter import TextExporter
from jrnl.plugins.util import get_tags_count
class JSONExporter(TextExporter):

7
jrnl/plugins/markdown_exporter.py
View file

@ -4,12 +4,11 @@
import os
import re
from .text_exporter import TextExporter
from jrnl.output import print_msg
from jrnl.messages import Message
from jrnl.messages import MsgText
from jrnl.messages import MsgStyle
from jrnl.messages import MsgText
from jrnl.output import print_msg
from jrnl.plugins.text_exporter import TextExporter
class MarkdownExporter(TextExporter):

4
jrnl/plugins/tag_exporter.py
View file

@ -1,8 +1,8 @@
# Copyright (C) 2012-2022 jrnl contributors
# License: https://www.gnu.org/licenses/gpl-3.0.html
from .text_exporter import TextExporter
from .util import get_tags_count
from jrnl.plugins.text_exporter import TextExporter
from jrnl.plugins.util import get_tags_count
class TagExporter(TextExporter):

4
jrnl/plugins/text_exporter.py
View file

@ -5,10 +5,10 @@ import os
import re
import unicodedata
from jrnl.output import print_msg
from jrnl.messages import Message
from jrnl.messages import MsgText
from jrnl.messages import MsgStyle
from jrnl.messages import MsgText
from jrnl.output import print_msg
class TextExporter:

4
jrnl/plugins/xml_exporter.py
View file

@ -3,8 +3,8 @@
from xml.dom import minidom
from .json_exporter import JSONExporter
from .util import get_tags_count
from jrnl.plugins.json_exporter import JSONExporter
from jrnl.plugins.util import get_tags_count
class XMLExporter(JSONExporter):

5
jrnl/plugins/yaml_exporter.py
View file

@ -4,13 +4,12 @@
import os
import re
from .text_exporter import TextExporter
from jrnl.exception import JrnlException
from jrnl.messages import Message
from jrnl.messages import MsgText
from jrnl.messages import MsgStyle
from jrnl.messages import MsgText
from jrnl.output import print_msg
from jrnl.plugins.text_exporter import TextExporter
class YAMLExporter(TextExporter):

4
jrnl/prompt.py
View file

@ -2,8 +2,8 @@
# License: https://www.gnu.org/licenses/gpl-3.0.html
from jrnl.messages import Message
from jrnl.messages import MsgText
from jrnl.messages import MsgStyle
from jrnl.messages import MsgText
from jrnl.output import print_msg
from jrnl.output import print_msgs
@ -35,7 +35,7 @@ def create_password(journal_name: str) -> str:
print_msg(Message(MsgText.PasswordDidNotMatch, MsgStyle.ERROR))
if yesno(Message(MsgText.PasswordStoreInKeychain), default=True):
from .EncryptedJournal import set_keychain
from jrnl.EncryptedJournal import set_keychain
set_keychain(journal_name, pw)

23
jrnl/upgrade.py
View file

@ -3,21 +3,20 @@
import os
from . import Journal
from . import __version__
from .EncryptedJournal import EncryptedJournal
from .config import is_config_json
from .config import load_config
from .config import scope_config
from .prompt import yesno
from .path import expand_path
from jrnl.output import print_msg
from jrnl.output import print_msgs
from jrnl import Journal
from jrnl import __version__
from jrnl.config import is_config_json
from jrnl.config import load_config
from jrnl.config import scope_config
from jrnl.EncryptedJournal import EncryptedJournal
from jrnl.exception import JrnlException
from jrnl.messages import Message
from jrnl.messages import MsgText
from jrnl.messages import MsgStyle
from jrnl.messages import MsgText
from jrnl.output import print_msg
from jrnl.output import print_msgs
from jrnl.path import expand_path
from jrnl.prompt import yesno
def backup(filename, binary=False):