# HG changeset patch
# User Pascal Volk <neverseen@users.sourceforge.net>
# Date 1320450769 0
# Node ID fd4aa073015f2a13d05d9d8127ccb9cccf960b22
# Parent  6826acb9b0a7e0509fdc9a78832505d8899ace34
VMM/{maillocation,quotalimit}: Unified object initialization code.
Simply raise a ValueError for wrong values (unknown IDs).

diff -r 6826acb9b0a7 -r fd4aa073015f VirtualMailManager/maillocation.py
--- a/VirtualMailManager/maillocation.py	Fri Nov 04 22:45:53 2011 +0000
+++ b/VirtualMailManager/maillocation.py	Fri Nov 04 23:52:49 2011 +0000
@@ -10,8 +10,7 @@
 
 """
 
-from VirtualMailManager.constants import \
-     MAILLOCATION_INIT, UNKNOWN_MAILLOCATION_ID
+from VirtualMailManager.constants import MAILLOCATION_INIT
 from VirtualMailManager.errors import MailLocationError as MLErr
 from VirtualMailManager.pycompat import all
 
@@ -120,8 +119,7 @@
         result = dbc.fetchone()
         dbc.close()
         if not result:
-            raise MLErr(_(u'Unknown mail_location id: %u') % mid,
-                        UNKNOWN_MAILLOCATION_ID)
+            raise ValueError('Unknown mail_location id specified: %r' % mid)
         self._mid = mid
         self._mbfmt, self._directory = result
 
diff -r 6826acb9b0a7 -r fd4aa073015f VirtualMailManager/quotalimit.py
--- a/VirtualMailManager/quotalimit.py	Fri Nov 04 22:45:53 2011 +0000
+++ b/VirtualMailManager/quotalimit.py	Fri Nov 04 23:52:49 2011 +0000
@@ -9,8 +9,6 @@
     for domains and accounts.
 """
 
-from VirtualMailManager.constants import VMM_ERROR
-from VirtualMailManager.errors import VMMError
 from VirtualMailManager.pycompat import all
 
 _ = lambda msg: msg
@@ -111,7 +109,7 @@
         res = dbc.fetchone()
         dbc.close()
         if not res:
-            raise VMMError(_(u'Unknown quota limit id specified.'), VMM_ERROR)
+            raise ValueError('Unknown quota limit id specified: %r' % qid)
         self._qid = qid
         self._bytes, self._messages = res