merge

trytond/config.py

@@ -72,7 +72,6 @@ class ConfigManager(object):
             'data_path': '/var/lib/trytond',
             'multi_server': False,
             'session_timeout': 600,
-            'psyco': False,
             'auto_reload': True,
             'prevent_dblist': False,
             'init': {},

trytond/server.py

@@ -93,10 +93,6 @@ class TrytonServer(object):
             with open(CONFIG['pidfile'], 'w') as fd_pid:
                 fd_pid.write("%d" % (os.getpid()))
 
-        if CONFIG['psyco']:
-            import psyco
-            psyco.full()
-
         if not CONFIG["db_name"] \
                 and bool(CONFIG['init'] or CONFIG['update']):
             raise Exception('Missing database option!')