diff options
| author | Thibault Ravera <ravera.thibault+github@gmail.com> | 2020-06-03 16:08:09 -0700 |
|---|---|---|
| committer | Thibault Ravera <ravera.thibault+github@gmail.com> | 2020-06-03 16:12:09 -0700 |
| commit | 13b3034d5f180fb34706871ec74ddf841c34992d (patch) | |
| tree | 052532712e86dd9559e242fdc5d843a4043b268c /src | |
| parent | 0a9d1403bd20c28ca3fb336bd65e2899de356bbb (diff) | |
| download | pyramid-13b3034d5f180fb34706871ec74ddf841c34992d.tar.gz pyramid-13b3034d5f180fb34706871ec74ddf841c34992d.tar.bz2 pyramid-13b3034d5f180fb34706871ec74ddf841c34992d.zip | |
Handle non string object passed to aslist method
Diffstat (limited to 'src')
| -rw-r--r-- | src/pyramid/settings.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/pyramid/settings.py b/src/pyramid/settings.py index d1eb4ff14..fbfa1a57d 100644 --- a/src/pyramid/settings.py +++ b/src/pyramid/settings.py @@ -21,14 +21,17 @@ def aslist_cronly(value): def aslist(value, flatten=True): - """ Return a list of strings, separating the input based on newlines + """ Return a list. Separating the input based on newlines and, if flatten=True (the default), also split on spaces within - each line.""" + each line when value is a string.""" values = aslist_cronly(value) if not flatten: return values result = [] for value in values: - subvalues = value.split() - result.extend(subvalues) + if isinstance(value, str): + value = value.split() + result.extend(value) + else: + result.append(value) return result |
