diff options
| author | Michael Merickel <michael@merickel.org> | 2011-11-09 17:11:03 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2011-11-17 00:13:45 -0600 |
| commit | a735d65d1d28af75371307c3d9bb52b18ee44ef0 (patch) | |
| tree | 4a94fcb20557c3add239d2a495aabea4e38d7375 | |
| parent | 818f8cab1dff781bbacf94cbabb4bec3825e081e (diff) | |
| download | pyramid-a735d65d1d28af75371307c3d9bb52b18ee44ef0.tar.gz pyramid-a735d65d1d28af75371307c3d9bb52b18ee44ef0.tar.bz2 pyramid-a735d65d1d28af75371307c3d9bb52b18ee44ef0.zip | |
Made pyramid.settings.aslist public.
| -rw-r--r-- | docs/api/settings.rst | 2 | ||||
| -rw-r--r-- | pyramid/settings.py | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/docs/api/settings.rst b/docs/api/settings.rst index ac1cd3f9c..6b12c038c 100644 --- a/docs/api/settings.rst +++ b/docs/api/settings.rst @@ -9,4 +9,6 @@ .. autofunction:: asbool + .. autofunction:: aslist + diff --git a/pyramid/settings.py b/pyramid/settings.py index de91042eb..11587a8be 100644 --- a/pyramid/settings.py +++ b/pyramid/settings.py @@ -44,8 +44,13 @@ def aslist_cronly(value): value = filter(None, [x.strip() for x in value.splitlines()]) return list(value) -def aslist(value): +def aslist(value, flatten=True): + """ Return a list of strings, separating the input based on newlines + and, if flatten=True (the default), also split on spaces within + each line.""" values = aslist_cronly(value) + if not flatten: + return values result = [] for value in values: subvalues = value.split() |