diff options
| author | Dennis Fink | 2018-04-07 11:28:13 +0200 |
|---|---|---|
| committer | Dennis Fink | 2018-04-07 11:28:13 +0200 |
| commit | b64e4766ca9cf3db2acef5ce78f5f376b9364e25 (patch) | |
| tree | de3baf13c09aaab348dcfeed31b9ed94225ead51 | |
| parent | 91459e815de26e98e84b37e842295b332f10425f (diff) | |
| download | patternutils-b64e4766ca9cf3db2acef5ce78f5f376b9364e25.tar.gz patternutils-b64e4766ca9cf3db2acef5ce78f5f376b9364e25.zip | |
Update patterncfg
Diffstat (limited to '')
| -rw-r--r-- | patternutils/commands/patterncfg.py | 37 | ||||
| -rw-r--r-- | patternutils/utils.py | 12 |
2 files changed, 13 insertions, 36 deletions
diff --git a/patternutils/commands/patterncfg.py b/patternutils/commands/patterncfg.py index e92ce7d..fe34aff 100644 --- a/patternutils/commands/patterncfg.py +++ b/patternutils/commands/patterncfg.py @@ -4,7 +4,6 @@ import os.path import click from .. import config -from .. import utils @click.group(context_settings={'help_option_names': ('-h', '--help', '-?')}) @@ -58,31 +57,21 @@ def remove(command: str, name: str) -> None: @click.argument('name') def view(name: str, program: str) -> None: - if program is not None: - files = config.find_templates(name, program) - try: - filename = files[0] - except IndexError: - click.secho('File not found!', fg='red', err=True) - raise SystemExit - else: - with utils.chdir(config.CONFIG_PATH): - files = config.find_templates(name) - - if not files: - click.secho('No files found!', fg='red', err=True) - raise SystemExit - elif len(files) != 1: - click.secho('Multiple files found!', fg='red', err=True) - for f in files: - click.secho(f, fg='red', err=True) - raise SystemExit - else: - filename = os.path.join(config.CONFIG_PATH, files[0]) + files = config.find_templates(name, program) + if not files: + click.secho('No files found!', fg='red', err=True) + raise SystemExit + elif len(files) != 1: + click.secho('Multiple files found!', fg='red', err=True) + for f in files: + click.secho(f, fg='red', err=True) + raise SystemExit + else: + filename = files[0] try: - with open(filename, encoding='utf-8') as f: - text = f.read() + with open(filename, encoding='utf-8') as fd: + text = fd.read() except FileNotFoundError: click.secho('File not found!', fg='red', err=True) raise SystemExit diff --git a/patternutils/utils.py b/patternutils/utils.py index 30b05ac..da64edb 100644 --- a/patternutils/utils.py +++ b/patternutils/utils.py @@ -1,17 +1,5 @@ import os -from contextlib import contextmanager - - -@contextmanager -def chdir(dir): - curdir = os.getcwd() - try: - os.chdir(dir) - yield - finally: - os.chdir(curdir) - def max_procs() -> int: cpu_count = os.cpu_count() |
