diff options
Diffstat (limited to 'odoo/service/server.py')
| -rw-r--r-- | odoo/service/server.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/odoo/service/server.py b/odoo/service/server.py index 5de54d8188e..fa6ed422f81 100644 --- a/odoo/service/server.py +++ b/odoo/service/server.py @@ -40,7 +40,7 @@ from odoo.modules.module import run_unit_tests, runs_post_install from odoo.modules.registry import Registry from odoo.release import nt_service_name import odoo.tools.config as config -from odoo.tools import stripped_sys_argv, dumpstacks, log_ormcache_stats +from odoo.tools import stripped_sys_argv, dumpstacks, log_ormcache_stats, pycompat _logger = logging.getLogger(__name__) @@ -216,7 +216,7 @@ class ThreadedServer(CommonServer): time.sleep(SLEEP_INTERVAL + number) # Steve Reich timing style registries = odoo.modules.registry.Registry.registries _logger.debug('cron%d polling for jobs', number) - for db_name, registry in registries.iteritems(): + for db_name, registry in pycompat.items(registries): while registry.ready: try: acquired = odoo.addons.base.ir.ir_cron.ir_cron._acquire_job(db_name) @@ -513,7 +513,7 @@ class PreforkServer(CommonServer): def process_timeout(self): now = time.time() - for (pid, worker) in self.workers.items(): + for (pid, worker) in pycompat.items(self.workers): if worker.watchdog_timeout is not None and \ (now - worker.watchdog_time) >= worker.watchdog_timeout: _logger.error("%s (%s) timeout after %ss", @@ -534,8 +534,8 @@ class PreforkServer(CommonServer): def sleep(self): try: # map of fd -> worker - fds = dict([(w.watchdog_pipe[0], w) for k, w in self.workers.items()]) - fd_in = fds.keys() + [self.pipe[0]] + fds = {w.watchdog_pipe[0]: w for k, w in pycompat.items(self.workers)} + fd_in = list(pycompat.keys(fds)) + [self.pipe[0]] # check for ping or internal wakeups ready = select.select(fd_in, [], [], self.beat) # update worker watchdogs @@ -584,7 +584,7 @@ class PreforkServer(CommonServer): if graceful: _logger.info("Stopping gracefully") limit = time.time() + self.timeout - for pid in self.workers.keys(): + for pid in self.workers: self.worker_kill(pid, signal.SIGINT) while self.workers and time.time() < limit: try: @@ -596,7 +596,7 @@ class PreforkServer(CommonServer): time.sleep(0.1) else: _logger.info("Stopping forcefully") - for pid in self.workers.keys(): + for pid in self.workers: self.worker_kill(pid, signal.SIGTERM) if self.socket: self.socket.close() @@ -874,7 +874,7 @@ def load_test_file_yml(registry, test_file): def load_test_file_py(registry, test_file): # Locate python module based on its filename and run the tests test_path, _ = os.path.splitext(os.path.abspath(test_file)) - for mod_name, mod_mod in sys.modules.items(): + for mod_name, mod_mod in pycompat.items(sys.modules): if mod_mod: mod_path, _ = os.path.splitext(getattr(mod_mod, '__file__', '')) if test_path == mod_path: |