opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-11-03 21:34:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reverted the refactoring of flatten; generator wasn't unpacking (of

Browse Source 
course), and caused an infinite loop.
This commit is contained in:
Dannon Baker
2016-07-20 13:39:12 -04:00
parent 5ba7e5adae
commit a5f9e5b9ef
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/web/framework/base.py
+6 -5
View File
@@ -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 )