# HG changeset patch
# User Pascal Volk <neverseen@users.sourceforge.net>
# Date 1271360813 0
# Node ID bb7d9906c52953a2442b195117d5b9ed8fba9b45
# Parent  da241eacad4da104ae2d25ed0fe2e988349995b1
VMM/Relocated: implemented Relocated.__nonzero__() for truth value testing.
Use EmailAddress' __str__() method when raising RelocatedErrors.

diff -r da241eacad4d -r bb7d9906c529 VirtualMailManager/Relocated.py
--- a/VirtualMailManager/Relocated.py	Thu Apr 15 17:10:02 2010 +0000
+++ b/VirtualMailManager/Relocated.py	Thu Apr 15 19:46:53 2010 +0000
@@ -41,6 +41,10 @@
 
         self.__load()
 
+    def __nonzero__(self):
+        """Returns `True` if the Relocated is known, `False` if it's new."""
+        return self._dest is not None
+
     def __load(self):
         """Loads the destination address from the database into the
         `_dest` attribute.
@@ -64,7 +68,7 @@
                        RELOCATED_ADDR_DEST_IDENTICAL)
         if self._dest:
             if self._dest == destination:
-                raise RErr(_(u'The relocated user %r already exists.') %
+                raise RErr(_(u"The relocated user '%s' already exists.") %
                            self._addr, RELOCATED_EXISTS)
             else:
                 self._dest = destination
@@ -86,15 +90,15 @@
     def get_info(self):
         """Returns the address to which mails should be sent."""
         if not self._dest:
-            raise RErr(_(u"The relocated user %r doesn't exist.") %
+            raise RErr(_(u"The relocated user '%s' doesn't exist.") %
                        self._addr, NO_SUCH_RELOCATED)
         return self._dest
 
     def delete(self):
         """Deletes the relocated entry from the database."""
         if not self._dest:
-            raise RErr(_(u"The relocated user %r doesn't exist.") % self._addr,
-                       NO_SUCH_RELOCATED)
+            raise RErr(_(u"The relocated user '%s' doesn't exist.") %
+                       self._addr, NO_SUCH_RELOCATED)
         dbc = self._dbh.cursor()
         dbc.execute("DELETE FROM relocated WHERE gid = %s AND address = %s",
                     self._gid, self._addr.localpart)