[MERGE]: Merge with latest trunk-server

[odoo/odoo.git] / openerp / exceptions.py

diff --git a/openerp/exceptions.py b/openerp/exceptions.py
index 5057130..fbf52c7 100644 (file)
--- a/openerp/exceptions.py
+++ b/openerp/exceptions.py
@@ -33,8 +33,7 @@ class Warning(Exception):
 class AccessDenied(Exception):
     """ Login/password error. No message, no traceback. """
     def __init__(self):
-        import random
-        super(AccessDenied, self).__init__('Try again. %s out of %s characters are correct.' % (random.randint(0, 30), 30))
+        super(AccessDenied, self).__init__('Access denied.')
         self.traceback = ('', '', '')
 
 class AccessError(Exception):
@@ -53,6 +52,5 @@ class DeferredException(Exception):
     def __init__(self, msg, tb):
         self.message = msg
         self.traceback = tb
-        self.args = (msg, tb)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: