Merge lp:~raj-abhilash1/mailman/bugfix into lp:mailman

[Abhilash Raj]

When creating domain with single owner passed via json, InvalidEmailError was raise. Fixed that.

[lp:~raj-abhilash1/mailman/bugfix]

7317. By Barry Warsaw on 2015-04-15

 * Mailing list subscription policy work flow has been completely rewritten.
   It now properly supports email verification and subscription confirmation
   by the user, and approval by the moderator using unique tokens.
   ``IMailingList`` objects now have a ``subscription_policy`` attribute.

7318. By Barry Warsaw on 2015-04-15

Abhilash's fix for allowing singleton strings in REST interfaces that also
accept lists of strings.

=== modified file 'src/mailman/rest/domains.py'
--- src/mailman/rest/domains.py	2015-04-07 01:39:34 +0000
+++ src/mailman/rest/domains.py	2015-04-14 21:33:34 +0000
@@ -118,7 +118,10 @@
             # but .add() requires an `owners` keyword.  Match impedence.
             owners = values.pop('owner', None)
             if owners is not None:
-                values['owners'] = owners
+                if isinstance(owners, str):
+                    values['owners'] = [owners]
+                else:
+                    values['owners'] = owners
             domain = domain_manager.add(**values)
         except BadDomainSpecificationError as error:
             bad_request(response, str(error))

=== modified file 'src/mailman/rest/tests/test_domains.py'
--- src/mailman/rest/tests/test_domains.py	2015-04-07 02:06:28 +0000
+++ src/mailman/rest/tests/test_domains.py	2015-04-14 21:33:34 +0000
@@ -54,6 +54,14 @@
             'http://localhost:9001/3.0/domains', data, method="POST")
         self.assertEqual(response.status, 201)
 
+    def test_domain_create_with_single_owner(self):
+        # Creating domain with single owner should not raise InvalidEmailError
+        content, response = call_api('http://localhost:9001/3.0/domains',
+                                     dict(mail_host='example.in',
+                                          owner='[e-mail]'),
+                                     method='POST')
+        self.assertEqual(response.status, 201)
+
     def test_bogus_endpoint_extension(self):
         # /domains/<domain>/lists/<anything> is not a valid endpoint.
         with self.assertRaises(HTTPError) as cm:
@@ -102,6 +110,7 @@
         self.assertEqual(cm.exception.code, 404)
 
 
+
 

 class TestDomainOwners(unittest.TestCase):
     layer = RESTLayer