[dak/master] move split_uploaders function to daklib.textutils
This allows the test suite to test split_uploaders again.
---
daklib/archive.py | 6 +-----
daklib/textutils.py | 5 +++++
tests/test_split_uploaders.py | 2 +-
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/daklib/archive.py b/daklib/archive.py
index 08f5988..aeca0a0 100644
--- a/daklib/archive.py
+++ b/daklib/archive.py
@@ -361,11 +361,7 @@ class ArchiveTransaction(object):
# Uploaders are the maintainer and co-maintainers from the Uploaders field
db_source.uploaders.append(maintainer)
if 'Uploaders' in control:
- def split_uploaders(field):
- import re
- for u in re.sub(">[ ]*,", ">\t", field).split("\t"):
- yield u.strip()
-
+ from daklib.textutils import split_uploaders
for u in split_uploaders(control['Uploaders']):
db_source.uploaders.append(get_or_set_maintainer(u, session))
session.flush()
diff --git a/daklib/textutils.py b/daklib/textutils.py
index c9cc4ed..b464675 100644
--- a/daklib/textutils.py
+++ b/daklib/textutils.py
@@ -113,3 +113,8 @@ def fix_maintainer(maintainer):
return (rfc822_maint, rfc2047_maint, name, email)
################################################################################
+
+def split_uploaders(field):
+ import re
+ for u in re.sub(">[ ]*,", ">\t", field).split("\t"):
+ yield u.strip()
diff --git a/tests/test_split_uploaders.py b/tests/test_split_uploaders.py
index fe6bd91..51812da 100755
--- a/tests/test_split_uploaders.py
+++ b/tests/test_split_uploaders.py
@@ -2,7 +2,7 @@
from base_test import DakTestCase
-from daklib.dbconn import split_uploaders
+from daklib.textutils import split_uploaders
import unittest
--
1.7.2.5
Reply to: