From 29a4ff040e79d19e908ee6bda5e0e5ceabe81621 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Tue, 2 Apr 2013 19:19:24 +0200 Subject: [PATCH] config: Make list return tuples so we get imuttable data. --- mopidy/utils/config.py | 2 +- tests/utils/config_test.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mopidy/utils/config.py b/mopidy/utils/config.py index 6358796b..7bc5ebe1 100644 --- a/mopidy/utils/config.py +++ b/mopidy/utils/config.py @@ -154,7 +154,7 @@ class List(ConfigValue): values = re.split(r'\s*\n\s*', value.strip()) else: values = re.split(r'\s*,\s*', value.strip()) - return [v for v in values if v] + return tuple([v for v in values if v]) def serialize(self, value): return '\n '.join(v.encode('utf-8') for v in value) diff --git a/tests/utils/config_test.py b/tests/utils/config_test.py index 43bb1679..9db2922e 100644 --- a/tests/utils/config_test.py +++ b/tests/utils/config_test.py @@ -199,10 +199,10 @@ class ListTest(unittest.TestCase): def test_deserialize_conversion_success(self): value = config.List() - expected = ['foo', 'bar', 'baz'] + expected = ('foo', 'bar', 'baz') self.assertEqual(expected, value.deserialize('foo, bar ,baz ')) - expected = ['foo,bar', 'bar', 'baz'] + expected = ('foo,bar', 'bar', 'baz') self.assertEqual(expected, value.deserialize(' foo,bar\nbar\nbaz')) def test_deserialize_enforces_required(self): @@ -212,12 +212,12 @@ class ListTest(unittest.TestCase): def test_deserialize_respects_optional(self): value = config.List(optional=True) - self.assertEqual([], value.deserialize('')) - self.assertEqual([], value.deserialize(' ')) + self.assertEqual(tuple(), value.deserialize('')) + self.assertEqual(tuple(), value.deserialize(' ')) def test_serialize(self): value = config.List() - result = value.serialize(['foo', 'bar', 'baz']) + result = value.serialize(('foo', 'bar', 'baz')) self.assertRegexpMatches(result, r'foo\n\s*bar\n\s*baz')