utils: tuple-or-list = tuplist + function to detect it

Also apply/substitute the verbatim detection where suitable.

Signed-off-by: Jan Pokorný <jpokorny@redhat.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/filter_manager.py b/filter_manager.py
index 8263e7e..e3dd8a0 100644
--- a/filter_manager.py
+++ b/filter_manager.py
@@ -13,7 +13,8 @@ from .format import CompositeFormat, Format
 from .plugin_registry import PluginManager
 from .utils import apply_preserving_depth, \
                    apply_aggregation_preserving_depth, \
-                   apply_intercalate
+                   apply_intercalate, \
+                   tuplist
 
 log = logging.getLogger(__name__)
 
@@ -51,7 +52,7 @@ class FilterManager(PluginManager):
                     (lambda formats:
                         lambda protocol, *args:
                             CompositeFormat(protocol, formats=formats, *args)
-                    )(res_output[i]) if isinstance(o, (tuple, list)) else o
+                    )(res_output[i]) if tuplist(o) else o
                     for i, o in enumerate(res_output)
                 )
                 filters[flt_name] = flt_cls(*res_output)