Merge pull request #3018 from dsedivec/devel

Plug-ins loaded from top-level plug-in directory
This commit is contained in:
Michael DeHaan 2013-05-24 18:58:00 -07:00
commit 5fdca267ac
5 changed files with 46 additions and 3 deletions

View file

@ -100,11 +100,10 @@ class PluginLoader(object):
files = glob.glob("%s/*" % fullpath)
for file in files:
if os.path.isdir(file) and file not in ret:
ret.append(file)
else:
ret.append(file)
if fullpath not in ret:
ret.append(fullpath)
# look in any configured plugin paths, allow one level deep for subcategories
configured_paths = self.config.split(os.pathsep)
for path in configured_paths: