# HG changeset patch
# User Martin Bornhold <martin@rhodecode.com>
# Date 2016-08-09 06:52:33
# Node ID d8ead9a913bb9b34de4aa36cbd92be4db71414c1
# Parent  4f5ebd996824bf201cd2bc00548a50d699535fc9

config: Use rhodecode aslist if commas included in list settings otherwise pyramids aslist.

diff --git a/rhodecode/config/middleware.py b/rhodecode/config/middleware.py
--- a/rhodecode/config/middleware.py
+++ b/rhodecode/config/middleware.py
@@ -51,6 +51,7 @@ from rhodecode.lib.middleware.disable_vc
 from rhodecode.lib.middleware.https_fixup import HttpsFixup
 from rhodecode.lib.middleware.vcs import VCSMiddleware
 from rhodecode.lib.plugins.utils import register_rhodecode_plugin
+from rhodecode.lib.utils2 import aslist as rhodecode_aslist
 from rhodecode.subscribers import scan_repositories_if_enabled
 
 
@@ -451,11 +452,13 @@ def _bool_setting(settings, name, defaul
 def _list_setting(settings, name, default):
     raw_value = settings.get(name, default)
 
-    # Check if we get a setting with the old syntax (comma separated).
-    if ',' in raw_value:
-        raw_value = raw_value.replace(',', ' ')
-
-    settings[name] = aslist(raw_value)
+    old_separator = ','
+    if old_separator in raw_value:
+        # If we get a comma separated list, pass it to our own function.
+        settings[name] = rhodecode_aslist(raw_value, sep=old_separator)
+    else:
+        # Otherwise we assume it uses pyramids space/newline separation.
+        settings[name] = aslist(raw_value)
 
 
 def _string_setting(settings, name, default):