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

Fix bug that prevented --format pretty and --format short from working (#1177)

Browse source
This commit is contained in:
Suhas 2021-03-06 13:47:03 -05:00 • committed by GitHub
parent b9a6d029e2
commit a3f4f6b944
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 79 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
features/steps/core.py
View file

@ -407,6 +407,12 @@ def all_input_was_used(context):
def run(context, command, text=""):
text = text or context.text or ""
if "config_path" in context and context.config_path is not None:
with open(context.config_path) as f:
context.jrnl_config = yaml.load(f, Loader=yaml.FullLoader)
else:
context.jrnl_config = None
if "cache_dir" in context and context.cache_dir is not None:
cache_dir = os.path.join("features", "cache", context.cache_dir)
command = command.format(cache_dir=cache_dir)

2
features/steps/export_steps.py
View file

@ -1,13 +1,13 @@
# Copyright (C) 2012-2021 jrnl contributors
# License: https://www.gnu.org/licenses/gpl-3.0.html
import json
import os
import shutil
import random
import string
from xml.etree import ElementTree
from behave import given
from behave import then