Fixed imports from the variables modules.

master
Иванов Денис 3 years ago
parent 1e2755bd9b
commit bfd822e3d4

@ -64,7 +64,7 @@ class KDEFormat(Format):
'''Метод для инициализации парсеров.''' '''Метод для инициализации парсеров.'''
action_symbols = (Literal('!') | Literal('-')) action_symbols = (Literal('!') | Literal('-'))
section_name_part_content = originalTextFor((OneOrMore( section_name_part_content = originalTextFor((OneOrMore(
Word(alphanums+':')))) Word(alphanums+':-'))))
section_name_part = (Literal('[').suppress() section_name_part = (Literal('[').suppress()
+ section_name_part_content + section_name_part_content

@ -516,8 +516,11 @@ class VariableLoader:
self.logger = datavars.logger self.logger = datavars.logger
self.ini_filler = NamespaceIniFiller() self.ini_filler = NamespaceIniFiller()
self.variables_path = os.path.normpath(variables_path) self.variables_path = os.path.join(
self.variables_package = '.'.join(self.variables_path.split("/")) __file__[:-len("calculate/variables/loader.py")],
variables_path)
self.variables_package = '.'.join(os.path.normpath(
variables_path).split("/"))
self.repository_map = repository_map self.repository_map = repository_map
def load_variables_package(self, package_name: str) -> None: def load_variables_package(self, package_name: str) -> None:
@ -773,11 +776,14 @@ class Datavars:
def _get_available_packages(self) -> dict: def _get_available_packages(self) -> dict:
'''Метод для получения словаря с имеющимися пакетами переменных '''Метод для получения словаря с имеющимися пакетами переменных
и путями к ним.''' и путями к ним.'''
variables_path = os.path.join(
__file__[:-len("calculate/variables/loader.py")],
self._variables_path)
available_packages = dict() available_packages = dict()
for file_name in os.listdir(self._variables_path): for file_name in os.listdir(variables_path):
if file_name.startswith('__'): if file_name.startswith('__'):
continue 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): if os.path.isdir(file_path):
available_packages.update({file_name: file_path}) available_packages.update({file_name: file_path})
return available_packages return available_packages

@ -4,5 +4,5 @@ from calculate.utils.package import PackageAtomParser
Variable('build', type=TableType, source=[], Variable('build', type=TableType, source=[],
fields=PackageAtomParser.atom_dict_fields) fields=PackageAtomParser.atom_dict_fields)
Variable('unistall', type=TableType, source=[], Variable('uninstall', type=TableType, source=[],
fields=PackageAtomParser.atom_dict_fields) fields=PackageAtomParser.atom_dict_fields)

Loading…
Cancel
Save