diff --git a/features/steps/core.py b/features/steps/core.py index ac9c7ca7..b6462fc9 100644 --- a/features/steps/core.py +++ b/features/steps/core.py @@ -5,11 +5,32 @@ from behave import given, when, then from jrnl import cli, install, Journal, util from jrnl import __version__ from dateutil import parser as date_parser +from collections import defaultdict import os import json import yaml import keyring -keyring.set_keyring(keyring.backends.file.PlaintextKeyring()) + + +class TestKeyring(keyring.backend.KeyringBackend): + """A test keyring that just stores its valies in a hash + """ + priority = 1 + keys = defaultdict(dict) + + def set_password(self, servicename, username, password): + self.keys[servicename][username] = password + + def get_password(self, servicename, username): + return self.keys[servicename].get(username) + + def delete_password(self, servicename, username, password): + self.keys[servicename][username] = None + +# set the keyring for keyring lib +keyring.set_keyring(TestKeyring()) + + try: from io import StringIO except ImportError: diff --git a/jrnl/cli.py b/jrnl/cli.py index f7285725..320d869b 100644 --- a/jrnl/cli.py +++ b/jrnl/cli.py @@ -21,6 +21,7 @@ import sys import logging log = logging.getLogger(__name__) +logging.getLogger("keyring.backend").setLevel(logging.ERROR) def parse_args(args=None): diff --git a/jrnl/export.py b/jrnl/export.py index b16d8124..d4873314 100644 --- a/jrnl/export.py +++ b/jrnl/export.py @@ -29,7 +29,6 @@ class Exporter(object): def export_journal(self, journal): """Returns a unicode representation of an entire journal.""" - print("EXPORTING") return self.template.render_block("journal", **self._get_vars(journal)) def write_file(self, journal, path):