Unintended side-effects; undoing last commits
svn: r16132
This commit is contained in:
parent
5ec8c5ddf0
commit
cf21d0f42a
@ -37,18 +37,6 @@ import sys
|
|||||||
from Filters._FilterParser import FilterParser
|
from Filters._FilterParser import FilterParser
|
||||||
from gen.plug import BasePluginManager
|
from gen.plug import BasePluginManager
|
||||||
|
|
||||||
def flatten(mylist):
|
|
||||||
"""
|
|
||||||
Flattens a nested list into a single list.
|
|
||||||
"""
|
|
||||||
retval = []
|
|
||||||
for item in mylist:
|
|
||||||
if isinstance(item, (list, tuple)):
|
|
||||||
retval.extend(flatten(item))
|
|
||||||
else:
|
|
||||||
retval.append(item)
|
|
||||||
return retval
|
|
||||||
|
|
||||||
PLUGMAN = BasePluginManager.get_instance()
|
PLUGMAN = BasePluginManager.get_instance()
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
#
|
#
|
||||||
@ -97,7 +85,7 @@ class FilterList(object):
|
|||||||
import traceback
|
import traceback
|
||||||
traceback.print_exc()
|
traceback.print_exc()
|
||||||
filters += plugin_filters
|
filters += plugin_filters
|
||||||
return flatten(filters)
|
return filters
|
||||||
|
|
||||||
def add(self, namespace, filt):
|
def add(self, namespace, filt):
|
||||||
assert(isinstance(namespace, basestring))
|
assert(isinstance(namespace, basestring))
|
||||||
|
Loading…
Reference in New Issue
Block a user