NPO-Accounting/import2ledger Changeset - 21f6d078a285

Changeset - 21f6d078a285

Parent rev.

Child rev.

[Not reviewed]

2018-02-config-refactor

0 3 2

Brett Smith - 6 years ago 2018-04-03 21:32:54
brettcsmith@brettcsmith.org

outfile: New module to take over functionality from config.

With the concept of the general "output path" going away, it doesn't make
sense for Config to have an open_output_file method.

5 files changed with 38 insertions and 28 deletions:

import2ledger/config.py

import2ledger/hooks/ledger_entry.py

import2ledger/outfile.py

tests/test_config.py

tests/test_outfile.py

0 comments (0 inline, 0 general)

import2ledger/config.py

➞

Show inline comments

@@ ... / @@ -176,14 +176,6 @@ class Configuration: @@
             default_section['output_path'] = self.args.output_path
         self._read_dates_args()
     @contextlib.contextmanager
     def _open_path(self, path, fallback_file, *args, **kwargs):
         if path is None:
             yield fallback_file
         else:
             with path.open(*args, **kwargs) as open_file:
                 yield open_file
     def get_section(self, section_name):
         if section_name is None:
             section_name = self.args.use_config
@@ ... / @@ -215,14 +207,6 @@ class Configuration: @@
         except AttributeError:
             raise errors.UserInputConfigurationError("not a valid loglevel", level_name)
     def get_output_path(self, section_name=None):
         section_config = self.get_section(section_name)
         return self._s_to_path(section_config['output_path'])
     def open_output_file(self, section_name=None):
         path = self.get_output_path(section_name)
         return self._open_path(path, self.stdout, 'a')
     def setup_logger(self, logger, section_name=None):
         logger.setLevel(self.get_loglevel(section_name))

import2ledger/hooks/ledger_entry.py

➞

Show inline comments

@@ ... / @@ -11,7 +11,7 @@ import tokenize @@
 import babel.numbers
 from . import HOOK_KINDS
 from .. import errors, strparse
+from .. import errors, outfile, strparse
 logger = logging.getLogger('import2ledger.hooks.ledger_entry')
@@ ... / @@ -324,5 +324,8 @@ class LedgerEntryHook: @@
         if template.is_empty():
             logger.warning("no Ledger template defined as %r", template_name)
         else:
             with self.config.open_output_file() as out_file:
             with outfile.open(
                     self.config_section.get('output_path', '-'),
                     self.config.stdout,
             ) as out_file:
                 print(template.render(entry_data), file=out_file, end='')

import2ledger/outfile.py

➞

Show inline comments

 new file 100644
 import contextlib
 import pathlib
 @contextlib.contextmanager
 def open(path, stdpipe, mode='a', **kwargs):
     if path == '-':
         yield stdpipe
     else:
         with pathlib.Path(path).open(mode, **kwargs) as retval:
             yield retval

tests/test_config.py

➞

Show inline comments

@@ ... / @@ -34,16 +34,6 @@ def test_get_section_falls_back_to_default(): @@
     assert section.get('output_path') != 'Template.output'
     assert section['signed_currencies'] == 'EUR'
 @pytest.mark.parametrize('arg_s', [None, '-', 'output.ledger'])
 def test_output_path(arg_s):
     arglist = [] if arg_s is None else ['-O', arg_s]
     config = config_from_file(os.devnull, arglist)
     output_path = config.get_output_path()
     if (arg_s is None) or (arg_s == '-'):
         assert output_path is None
     else:
         assert output_path == pathlib.Path(arg_s)
 def _fix_date_s(date_s, new_sep, old_sep='/'):
     return date_s.replace(old_sep, new_sep)

tests/test_outfile.py

➞

Show inline comments

 new file 100644
 import pathlib
 import tempfile
 import pytest
 from import2ledger import outfile
 @pytest.mark.parametrize('to_path', [
     lambda s: s,
     pathlib.Path,
 ])
 def test_output_path(to_path):
     with tempfile.NamedTemporaryFile() as source_file:
         path_arg = to_path(source_file.name)
         with outfile.open(path_arg, None) as actual:
             assert actual.name == source_file.name
             assert 'a' in actual.mode
 def test_fallback():
     with tempfile.NamedTemporaryFile() as source_file:
         with outfile.open('-', source_file) as actual:
             assert actual is source_file
         assert not source_file.closed

0 comments (0 inline, 0 general)