From 33b7245ebcd72fe2bba1686008737290068afad1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD=D0=BE=D0=B2=20=D0=94=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=81?= Date: Wed, 27 Jan 2021 15:59:42 +0300 Subject: [PATCH] Fixed templates runner. --- calculate/server/server.py | 2 +- calculate/templates/format/base_format.py | 1 - run_templates.py | 8 ++++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/calculate/server/server.py b/calculate/server/server.py index b2733eb..11a6819 100644 --- a/calculate/server/server.py +++ b/calculate/server/server.py @@ -22,7 +22,7 @@ import os class Server: - def __init__(self, socket_path='./input.sock', + def __init__(self, socket_path: str = './input.sock', datavars_path: str = 'calculate/vars/', commands_path: str = 'calculate/commands'): self._app = FastAPI() diff --git a/calculate/templates/format/base_format.py b/calculate/templates/format/base_format.py index 3630fa7..ba249cc 100644 --- a/calculate/templates/format/base_format.py +++ b/calculate/templates/format/base_format.py @@ -387,7 +387,6 @@ class Format: template_paths.append(template_path) header = self._make_header(template_paths) - print(header) document_text = re.sub(header_pattern, '', input_text) if check_shebang: diff --git a/run_templates.py b/run_templates.py index 186d505..e89d802 100644 --- a/run_templates.py +++ b/run_templates.py @@ -28,11 +28,11 @@ def main(): io_module = IOModule() if args.install is None: - package = NonePackage + install = NonePackage elif args.install.strip().casefold() == 'all': - package = None + install = None else: - package = args.install + install = args.install group_packages = {} if args.build is not None: @@ -43,7 +43,7 @@ def main(): action = list(flat_iterable(args.action)) template_processor = DirectoryProcessor(action, datavars_module=datavars, - package=package, + install=install, output_module=io_module, dbpkg=args.dbpkg, **group_packages)