[MRG] merge trunk.

[odoo/odoo.git] / openerp-server

diff --git a/openerp-server b/openerp-server
index d402f35..d76fae3 100755 (executable)
--- a/openerp-server
+++ b/openerp-server
@@ -30,7 +30,6 @@ GNU Public Licence.
 (c) 2003-TODAY, Fabien Pinckaers - OpenERP SA
 """
 
-import imp
 import logging
 import os
 import signal
@@ -198,7 +197,7 @@ def quit_on_signals():
     try:
         while quit_signals_received == 0:
             time.sleep(60)
-    except KeyboardInterrupt, e:
+    except KeyboardInterrupt:
         pass
 
     if config['pidfile']: