Merge "Changed the 'raise validate_email_address' to 'raise ValueErro…

…r' Closes-Bug:1578643 Change-Id: I15c937cf21829042e0ee725f45bb74b8084d9d41"
openstack-archive · May 18, 2016 · 581e4fb · 581e4fb
2 parents 8199631 + 190fe44
commit 581e4fb
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/poppy/notification/mailgun/driver.py b/poppy/notification/mailgun/driver.py
@@ -68,15 +68,17 @@ def __init__(self, conf):
 
         # validate email addresses
         if not validate_email_address(self.from_address):
-            raise validate_email_address("Notification config error:"
-                                         "%s is not a valid email address"
-                                         % self.from_address)
+            raise ValueError(
+                "Notification config error: "
+                "{0} is not a valid email address".format(self.from_address)
+            )
 
         for address in self.recipients:
             if not validate_email_address(address):
-                raise validate_email_address("Notification config error:"
-                                             "%s is not a valid email address"
-                                             % address)
+                raise ValueError(
+                    "Notification config error: "
+                    "{0} is not a valid email address".format(address)
+                )
 
     @property
     def services_controller(self):