summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/api/settings.rst2
-rw-r--r--pyramid/settings.py7
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()