From 082b1dc9fc91200d4eeb9a78c05930dbfac510c6 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 10 Sep 2013 01:19:46 +0200 Subject: [PATCH] restore the original gevent detection bzr revid: al@openerp.com-20130909231946-aglho23enxhfwm0i --- openerp-gevent | 2 -- openerp/__init__.py | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openerp-gevent b/openerp-gevent index e1c9fa797e1..55044976492 100755 --- a/openerp-gevent +++ b/openerp-gevent @@ -7,7 +7,5 @@ psycogreen.gevent.patch_psycopg() import openerp -openerp.evented = True - if __name__ == "__main__": openerp.cli.main() diff --git a/openerp/__init__.py b/openerp/__init__.py index fe439838497..a06c85d0c21 100644 --- a/openerp/__init__.py +++ b/openerp/__init__.py @@ -27,6 +27,8 @@ import sys # Is the server running with gevent. evented = False +if sys.modules.get("gevent") is not None: + evented = True # Make sure the OpenERP server runs in UTC. This is especially necessary # under Windows as under Linux it seems the real import of time is