Replace pyflakes with flake8 for linting

tests/step_defs/conftest.py

@@ -1,13 +1,17 @@
 # Copyright (C) 2012-2021 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html
 
-from jrnl.os_compat import on_windows
 from pytest import mark
 
-from .fixtures import *
-from .given_steps import *
-from .when_steps import *
-from .then_steps import *
+from jrnl.os_compat import on_windows
+
+
+pytest_plugins = [
+    "tests.step_defs.fixtures",
+    "tests.step_defs.given_steps",
+    "tests.step_defs.when_steps",
+    "tests.step_defs.then_steps",
+]
 
 
 def pytest_bdd_apply_tag(tag, function):

tests/step_defs/fixtures.py

@@ -1,14 +1,14 @@
 # Copyright (C) 2012-2021 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html
 
-import os
 from collections import defaultdict
-from keyring import backend
-from keyring import set_keyring
-from keyring import errors
+import os
 from pathlib import Path
 import tempfile
 
+from keyring import backend
+from keyring import errors
+from keyring import set_keyring
 from pytest import fixture
 import toml
 
@@ -59,7 +59,7 @@ class NoKeyring(backend.KeyringBackend):
 
 
 class FailedKeyring(backend.KeyringBackend):
-    """ A keyring that cannot be retrieved.  """
+    """A keyring that cannot be retrieved."""
 
     priority = 2
 
@@ -192,11 +192,10 @@ def editor(editor_state):
         Path(tmpfile).touch()
         with open(tmpfile, editor_state["intent"]["method"]) as f:
             # Touch the file so jrnl knows it was edited
-            if editor_state["intent"]["input"] != None:
+            if editor_state["intent"]["input"] is not None:
                 f.write(editor_state["intent"]["input"])
 
             file_content = f.read()
             editor_state["tmpfile"]["content"] = file_content
 
     return _mock_editor
-

tests/step_defs/given_steps.py

@@ -1,22 +1,23 @@
 # Copyright (C) 2012-2021 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html
 
+from datetime import datetime
 import json
 import os
-from datetime import datetime
-from keyring import set_keyring
 import random
-import string
 import shutil
-from unittest.mock import patch
+import string
 from unittest.mock import MagicMock
+from unittest.mock import patch
 from xml.etree import ElementTree
 
+from keyring import set_keyring
+from pytest_bdd import given
+from pytest_bdd.parsers import parse
+
 from jrnl import __version__
 from jrnl.time import __get_pdt_calendar
 
-from pytest_bdd import given
-from pytest_bdd.parsers import parse
 from .fixtures import FailedKeyring
 from .fixtures import TestKeyring
 

tests/step_defs/helpers.py

@@ -4,7 +4,6 @@
 import os
 
 
-
 def does_directory_contain_files(file_list, directory_path):
     if not os.path.isdir(directory_path):
         return False

tests/step_defs/then_steps.py

@@ -4,17 +4,17 @@
 import json
 import os
 import re
-import yaml
 from xml.etree import ElementTree
 
 from pytest_bdd import then
 from pytest_bdd.parsers import parse
+import yaml
 
 from jrnl.config import scope_config
 
-from .helpers import parse_should_or_should_not
-from .helpers import does_directory_contain_files
 from .helpers import assert_equal_tags_ignoring_order
+from .helpers import does_directory_contain_files
+from .helpers import parse_should_or_should_not
 
 
 @then("we should get no error")

tests/step_defs/when_steps.py

@@ -1,13 +1,13 @@
 # Copyright (C) 2012-2021 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html
 
-import os
 from contextlib import ExitStack
+import os
 from unittest.mock import patch
 
+from pytest_bdd import parsers
 from pytest_bdd import when
 from pytest_bdd.parsers import parse
-from pytest_bdd import parsers
 
 from jrnl.cli import cli
 from jrnl.os_compat import split_args

tests/unit/test_color.py

@@ -1,7 +1,8 @@
+from colorama import Fore
+from colorama import Style
 import pytest
 
 from jrnl.color import colorize
-from colorama import Fore, Style
 
 
 @pytest.fixture()

tests/unit/test_display.py

@@ -1,7 +1,9 @@
 import argparse
-import jrnl
-import pytest
 from unittest import mock
+
+import pytest
+
+import jrnl
 from jrnl.jrnl import _display_search_results
 
 

tests/unit/test_export.py

@@ -1,8 +1,8 @@
+import pytest
+
 from jrnl.exception import JrnlError
 from jrnl.plugins.fancy_exporter import check_provided_linewrap_viability
 
-import pytest
-
 
 @pytest.fixture()
 def datestr():

tests/unit/test_install.py

@@ -1,6 +1,7 @@
-from unittest import mock
-import pytest
 import sys
+from unittest import mock
+
+import pytest
 
 
 @pytest.mark.filterwarnings(

tests/unit/test_os_compat.py

@@ -1,8 +1,9 @@
 from unittest import mock
+
 import pytest
 
-from jrnl.os_compat import on_windows
 from jrnl.os_compat import on_posix
+from jrnl.os_compat import on_windows
 from jrnl.os_compat import split_args
 
 

tests/unit/test_override.py

@@ -1,12 +1,10 @@
 import pytest
 
-from jrnl.override import (
-    apply_overrides,
-    _recursively_apply,
-    _get_config_node,
-    _get_key_and_value_from_pair,
-    _convert_dots_to_list,
-)
+from jrnl.override import _convert_dots_to_list
+from jrnl.override import _get_config_node
+from jrnl.override import _get_key_and_value_from_pair
+from jrnl.override import _recursively_apply
+from jrnl.override import apply_overrides
 
 
 @pytest.fixture()
@@ -56,7 +54,7 @@ def test_recursively_apply():
 def test_get_config_node(minimal_config):
     assert len(minimal_config.keys()) == 4
     assert _get_config_node(minimal_config, "editor") == "vim"
-    assert _get_config_node(minimal_config, "display_format") == None
+    assert _get_config_node(minimal_config, "display_format") is None
 
 
 def test_get_kv_from_pair():

tests/unit/test_parse_args.py

@@ -283,10 +283,10 @@ class TestDeserialization:
         assert cfg["linewrap"] == 23
 
         cfg = make_yaml_valid_dict(["encrypt", "false"])
-        assert cfg["encrypt"] == False
+        assert cfg["encrypt"] is False
 
         cfg = make_yaml_valid_dict(["editor", "vi -c startinsert"])
         assert cfg["editor"] == "vi -c startinsert"
 
         cfg = make_yaml_valid_dict(["highlight", "true"])
-        assert cfg["highlight"] == True
+        assert cfg["highlight"] is True