From 8862edefa4b020a0d92db68210cedebe9b60835b Mon Sep 17 00:00:00 2001 From: Ravera Thibault Date: Wed, 3 Jun 2020 16:47:10 -0700 Subject: Update src/pyramid/settings.py Co-authored-by: Steve Piercy --- CHANGES.rst | 3 +++ CONTRIBUTORS.txt | 2 ++ src/pyramid/settings.py | 7 ++++--- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 3bd14705d..d7473cec5 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,6 +4,9 @@ unreleased Features -------- +- The ``aslist`` method now handles non-string object when flattening. + See https://github.com/Pylons/pyramid/pull/3594 + - It is now possible to pass multiple values to the ``header`` predicate for route and view configuration. See https://github.com/Pylons/pyramid/pull/3576 diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 550639ae0..d527b1a04 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -352,3 +352,5 @@ Contributors - Andrea Borghi, 2019/11/11 - Sergey Maranchuk, 2020/04/18 + +- Thibault Ravera, 2020/06/03 \ No newline at end of file diff --git a/src/pyramid/settings.py b/src/pyramid/settings.py index fbfa1a57d..d6e4ea9b2 100644 --- a/src/pyramid/settings.py +++ b/src/pyramid/settings.py @@ -21,9 +21,10 @@ def aslist_cronly(value): def aslist(value, flatten=True): - """ Return a list. Separating the input based on newlines - and, if flatten=True (the default), also split on spaces within - each line when value is a string.""" + """ Return a list, separating the input based on newlines. + Also if ``flatten`` is ``True`` (the default), and if the line + is a string, then the line will be split on spaces. + """ values = aslist_cronly(value) if not flatten: return values -- cgit v1.2.3