Rename a variable for clarity

This commit is contained in:
Richard Gibson 2021-07-27 12:56:42 -04:00 committed by Rick Waldron
parent 247085f9d8
commit 172d75bacd

View File

@ -14,8 +14,8 @@ class Expander:
self.templates = dict() self.templates = dict()
self.case_dir = case_dir self.case_dir = case_dir
def _load_templates(self, template_class, encoding): def _load_templates(self, template_group, encoding):
directory = os.path.join(self.case_dir, template_class) directory = os.path.join(self.case_dir, template_group)
file_names = [] file_names = []
for expanded_directory in glob.glob(directory): for expanded_directory in glob.glob(directory):
@ -29,15 +29,15 @@ class Expander:
except: except:
file_names.append(expanded_directory) file_names.append(expanded_directory)
self.templates[template_class] = [ self.templates[template_group] = [
Template(x, encoding) for x in file_names Template(x, encoding) for x in file_names
] ]
def _get_templates(self, template_class, encoding): def _get_templates(self, template_group, encoding):
if not template_class in self.templates: if not template_group in self.templates:
self._load_templates(template_class, encoding) self._load_templates(template_group, encoding)
return self.templates[template_class] return self.templates[template_group]
def is_template_file(self, filename): def is_template_file(self, filename):
return re.match(templateFilenamePattern, filename) return re.match(templateFilenamePattern, filename)
@ -69,8 +69,8 @@ class Expander:
localtemplates.extend(case.attribs['meta']['templates']) localtemplates.extend(case.attribs['meta']['templates'])
for t in localtemplates: for t in localtemplates:
template_class = t template_group = t
templates = self.templates.get(template_class) templates = self.templates.get(template_group)
for template in self._get_templates(template_class, encoding): for template in self._get_templates(template_group, encoding):
yield template.expand(file_name, os.path.basename(file_name[:-5]), case.attribs, encoding) yield template.expand(file_name, os.path.basename(file_name[:-5]), case.attribs, encoding)