diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-05-10 12:47:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-05-10 12:47:06 +0000 |
| commit | e78d45735e31a77d566317e28e6c0ea068fcb3cf (patch) | |
| tree | 69532f86ecbb55070413246d08cbc861f0d6daf8 /openstack/common/rootwrap/wrapper.py | |
| parent | f36c7c966cd66f4c6a534fedc6da096296fc4f7a (diff) | |
| parent | 562cc6844d3dc5cbd35ad404307224959900df30 (diff) | |
| download | oslo-e78d45735e31a77d566317e28e6c0ea068fcb3cf.tar.gz oslo-e78d45735e31a77d566317e28e6c0ea068fcb3cf.tar.xz oslo-e78d45735e31a77d566317e28e6c0ea068fcb3cf.zip | |
Merge "Stylistic improvements from quantum-rootwrap"
Diffstat (limited to 'openstack/common/rootwrap/wrapper.py')
| -rw-r--r-- | openstack/common/rootwrap/wrapper.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/openstack/common/rootwrap/wrapper.py b/openstack/common/rootwrap/wrapper.py index e0ac9df..d488ddd 100644 --- a/openstack/common/rootwrap/wrapper.py +++ b/openstack/common/rootwrap/wrapper.py @@ -93,7 +93,7 @@ def setup_syslog(execname, facility, level): def build_filter(class_name, *args): - """Returns a filter object of class class_name""" + """Returns a filter object of class class_name.""" if not hasattr(filters, class_name): logging.warning("Skipping unknown filter class (%s) specified " "in filter definitions" % class_name) @@ -103,7 +103,7 @@ def build_filter(class_name, *args): def load_filters(filters_path): - """Load filters from a list of directories""" + """Load filters from a list of directories.""" filterlist = [] for filterdir in filters_path: if not os.path.isdir(filterdir): @@ -121,7 +121,7 @@ def load_filters(filters_path): return filterlist -def match_filter(filters, userargs, exec_dirs=[]): +def match_filter(filter_list, userargs, exec_dirs=[]): """ Checks user command and arguments through command filters and returns the first matching filter. @@ -131,7 +131,7 @@ def match_filter(filters, userargs, exec_dirs=[]): """ first_not_executable_filter = None - for f in filters: + for f in filter_list: if f.match(userargs): # Try other filters if executable is absent if not f.get_exec(exec_dirs=exec_dirs): |
