diff --git a/CHANGES.rst b/CHANGES.rst index 15d08f2950..6b6e1ebbb7 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 550639ae0a..d527b1a042 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 d1eb4ff141..d6e4ea9b21 100644 --- a/src/pyramid/settings.py +++ b/src/pyramid/settings.py @@ -21,14 +21,18 @@ def aslist_cronly(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.""" + """ 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 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 diff --git a/tests/test_settings.py b/tests/test_settings.py index e8be490ee8..457835663e 100644 --- a/tests/test_settings.py +++ b/tests/test_settings.py @@ -69,6 +69,14 @@ def test_with_list(self): result = self._callFUT(['abc', 'def']) self.assertEqual(list(result), ['abc', 'def']) + def test_with_integer(self): + result = self._callFUT([1]) + self.assertEqual(result, [1]) + + def test_with_integer_no_flatten(self): + result = self._callFUT([1], flatten=False) + self.assertEqual(result, [1]) + def test_with_string(self): result = self._callFUT('abc def') self.assertEqual(result, ['abc', 'def']) @@ -84,3 +92,7 @@ def test_with_string_crsep_spacesep(self): def test_with_string_crsep_spacesep_no_flatten(self): result = self._callFUT(' abc\n def ghi ', flatten=False) self.assertEqual(result, ['abc', 'def ghi']) + + def test_with_string_crsep_spacesep_and_integer(self): + result = self._callFUT([' abc def ghi ', 1]) + self.assertEqual(result, ['abc', 'def', 'ghi', 1])