diff --git a/calculate/templates/format/kde_format.py b/calculate/templates/format/kde_format.py index 3452147..a3513e0 100644 --- a/calculate/templates/format/kde_format.py +++ b/calculate/templates/format/kde_format.py @@ -64,7 +64,7 @@ class KDEFormat(Format): '''Метод для инициализации парсеров.''' action_symbols = (Literal('!') | Literal('-')) section_name_part_content = originalTextFor((OneOrMore( - Word(alphanums+':')))) + Word(alphanums+':-')))) section_name_part = (Literal('[').suppress() + section_name_part_content diff --git a/calculate/variables/loader.py b/calculate/variables/loader.py index 140202c..18da850 100644 --- a/calculate/variables/loader.py +++ b/calculate/variables/loader.py @@ -516,8 +516,11 @@ class VariableLoader: self.logger = datavars.logger self.ini_filler = NamespaceIniFiller() - self.variables_path = os.path.normpath(variables_path) - self.variables_package = '.'.join(self.variables_path.split("/")) + self.variables_path = os.path.join( + __file__[:-len("calculate/variables/loader.py")], + variables_path) + self.variables_package = '.'.join(os.path.normpath( + variables_path).split("/")) self.repository_map = repository_map def load_variables_package(self, package_name: str) -> None: @@ -773,11 +776,14 @@ class Datavars: def _get_available_packages(self) -> dict: '''Метод для получения словаря с имеющимися пакетами переменных и путями к ним.''' + variables_path = os.path.join( + __file__[:-len("calculate/variables/loader.py")], + self._variables_path) available_packages = dict() - for file_name in os.listdir(self._variables_path): + for file_name in os.listdir(variables_path): if file_name.startswith('__'): continue - file_path = os.path.join(self._variables_path, file_name) + file_path = os.path.join(variables_path, file_name) if os.path.isdir(file_path): available_packages.update({file_name: file_path}) return available_packages diff --git a/calculate/vars/main/cl/groups/__init__.py b/calculate/vars/main/cl/groups/__init__.py index e9ea365..9df086e 100644 --- a/calculate/vars/main/cl/groups/__init__.py +++ b/calculate/vars/main/cl/groups/__init__.py @@ -4,5 +4,5 @@ from calculate.utils.package import PackageAtomParser Variable('build', type=TableType, source=[], fields=PackageAtomParser.atom_dict_fields) -Variable('unistall', type=TableType, source=[], +Variable('uninstall', type=TableType, source=[], fields=PackageAtomParser.atom_dict_fields)