[dak/master] Improve splitting of Uploaders list.

[Torsten Werner <twerner@debian.org>]

Signed-off-by: Torsten Werner <twerner@debian.org>
---
 daklib/dbconn.py              |    3 ++-
 tests/test_split_uploaders.py |    6 ++++++
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index f314b3f..6443756 100755
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -2640,7 +2640,8 @@ def split_uploaders(uploaders_list):
     Split the Uploaders field into the individual uploaders and yield each of
     them. Beware: email addresses might contain commas.
     '''
-    for uploader in uploaders_list.replace(">, ", ">\t").split("\t"):
+    import re
+    for uploader in re.sub(">[ ]*,", ">\t", uploaders_list).split("\t"):
         yield uploader.strip()
 
 @session_wrapper
diff --git a/tests/test_split_uploaders.py b/tests/test_split_uploaders.py
index 062fd35..fe6bd91 100755
--- a/tests/test_split_uploaders.py
+++ b/tests/test_split_uploaders.py
@@ -11,6 +11,12 @@ class SplitUploadersTestCase(DakTestCase):
         expected = ['"A, B" <a@b.c>', 'D E <d@e.f>']
         l = list(split_uploaders('"A, B" <a@b.c>, D E <d@e.f>'))
         self.assertEqual(expected, l)
+        l = list(split_uploaders('"A, B" <a@b.c> , D E <d@e.f>'))
+        self.assertEqual(expected, l)
+        l = list(split_uploaders('"A, B" <a@b.c>,D E <d@e.f>'))
+        self.assertEqual(expected, l)
+        l = list(split_uploaders('"A, B" <a@b.c>   ,D E <d@e.f>'))
+        self.assertEqual(expected, l)
 
 if __name__ == '__main__':
     unittest.main()
-- 
1.7.2.5