From a5f9e5b9efd287c1bce5d6f3da41f30affd511ad Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Wed, 20 Jul 2016 13:39:12 -0400 Subject: [PATCH] Reverted the refactoring of flatten; generator wasn't unpacking (of course), and caused an infinite loop. --- lib/galaxy/web/framework/base.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/galaxy/web/framework/base.py b/lib/galaxy/web/framework/base.py index ce3e2dbffa8..cb310760418 100644 --- a/lib/galaxy/web/framework/base.py +++ b/lib/galaxy/web/framework/base.py @@ -462,8 +462,9 @@ def flatten( seq ): """ Flatten a possible nested set of iterables """ - if isinstance( seq, ( types.GeneratorType, list, tuple ) ): - for y in flatten( seq ): - yield smart_str(y) - else: - yield smart_str(seq) + for x in seq: + if isinstance( x, ( types.GeneratorType, list, tuple ) ): + for y in flatten( x ): + yield smart_str( y ) + else: + yield smart_str( x )