Merge pull request #12689 from soarpenguin/bugfix

Remove some warning of undefined name and fix classmethod syntax error.
This commit is contained in:
Brian Coca 2015-10-09 11:09:50 -04:00
commit ec02b255c3
6 changed files with 19 additions and 14 deletions

View file

@ -47,9 +47,9 @@ class InventoryDirectoryParser(InventoryAggregateParser):
if filename in ("host_vars", "group_vars", "vars_plugins"):
continue
fullpath = os.path.join(directory, filename)
new_names.append(fullpath)
filtered_names.append(fullpath)
super(InventoryDirectoryParser, self).__init__(new_names)
super(InventoryDirectoryParser, self).__init__(filtered_names)
def parse(self):
return super(InventoryDirectoryParser, self).parse()

View file

@ -47,9 +47,9 @@ class InventoryIniParser(InventoryAggregateParser):
if filename in ("host_vars", "group_vars", "vars_plugins"):
continue
fullpath = os.path.join(directory, filename)
new_names.append(fullpath)
filtered_names.append(fullpath)
super(InventoryDirectoryParser, self).__init__(new_names)
super(InventoryDirectoryParser, self).__init__(filtered_names)
def parse(self):
return super(InventoryDirectoryParser, self).parse()