Merge lp:~mikemc/ubiquity/tolerate-weird-emails into lp:~mikemc/ubiquity/add-online-debug

[Mike McCracken]

- Make email validator more liberal to handle all possible valid emails.

- Make email validator more liberal to handle all possible valid emails.

[dobey (dobey)]

23 + print("SSO spawning cmd=%r" % cmd)

Is this meant to be here, or was put in for debugging?

review: Needs Information

[lp:~mikemc/ubiquity/tolerate-weird-emails]

5812. By Mike McCracken on 2013-02-20

remove print

[dobey (dobey)]

review: Approve

[Brian Curtin (brian.curtin)]

Looks good.

review: Approve

[Dimitri John Ledkov (xnox)]

Please mark as merged, to clean up merge proposals on ubiquity page.

=== modified file 'tests/test_ubi_ubuntuone.py'
--- tests/test_ubi_ubuntuone.py	2012-12-04 09:59:38 +0000
+++ tests/test_ubi_ubuntuone.py	2013-02-20 21:11:19 +0000
@@ -44,7 +44,9 @@
 
     def test_verify_email_entry(self):
         self.assertFalse(self.page._verify_email_entry("meep"))
-        self.assertTrue(self.page._verify_email_entry("[e-mail]"))
+        self.assertTrue(self.page._verify_email_entry("[e-mail]"))
+        self.assertTrue(self.page._verify_email_entry("mup@example"))
+        self.assertTrue(self.page._verify_email_entry("mup\@foo.com@example"))
 
     def test_verify_password_entry(self):
         self.assertFalse(self.page._verify_password_entry(""))

=== modified file 'ubiquity/plugins/ubi-ubuntuone.py'
--- ubiquity/plugins/ubi-ubuntuone.py	2012-12-04 15:19:26 +0000
+++ ubiquity/plugins/ubi-ubuntuone.py	2013-02-20 21:11:19 +0000
@@ -295,9 +295,7 @@
 
     def _verify_email_entry(self, email):
         """Return True if the email address looks valid"""
-        EMAIL_REGEXP = "[a-zA-Z]+@[a-zA-Z]+\.[a-zA-Z]+"
-        match = re.match(EMAIL_REGEXP, email)
-        return (match is not None)
+        return '@' in email
 
     def _verify_password_entry(self, password):
         """Return True if there is a valid password"""