From 2abc92afe56564b5e376ea5940ac576fef746233 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@odoo.com>
Date: Mon, 23 May 2022 12:53:26 +0000
Subject: [PATCH] [FIX] bus: deprecated threading attribute (and then some)

Python 3.10 formally deprecated the old threading API. This was missed
in #88803.

Also apply a few other fixes and improvements:

- `Thread._daemonic` is a non-public unchecked internal attribute, use
  the corresponding documented property
- remove unused assignment to unused local
- define `Event` attribute in `__init__` where it belongs
- cleanup spawning on thread to do everything in ctor (permissible
  since 3.3)
- fix import to not rely in implicit sub-module imports

closes odoo/odoo#92187

X-original-commit: 87d087ff7d53394dd991099cf7eac37d1ef68423
Signed-off-by: Vincent Schippefilt (vsc) <vsc@odoo.com>
Signed-off-by: Xavier Morel (xmo) <xmo@odoo.com>
---
 addons/bus/models/bus.py | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/addons/bus/models/bus.py b/addons/bus/models/bus.py
index c9f3f919890..5f98a77fd8e 100644
--- a/addons/bus/models/bus.py
+++ b/addons/bus/models/bus.py
@@ -84,8 +84,6 @@ class ImBus(models.Model):
 
     @api.model
     def _poll(self, channels, last=0, options=None):
-        if options is None:
-            options = {}
         # first poll return the notification in the 'buffer'
         if last == 0:
             timeout_ago = datetime.datetime.utcnow()-datetime.timedelta(seconds=TIMEOUT)
@@ -108,10 +106,11 @@ class ImBus(models.Model):
 #----------------------------------------------------------
 # Dispatcher
 #----------------------------------------------------------
-class ImDispatch(object):
+class ImDispatch:
     def __init__(self):
         self.channels = {}
         self.started = False
+        self.Event = None
 
     def poll(self, dbname, channels, last, options=None, timeout=None):
         channels = [channel_with_db(dbname, channel) for channel in channels]
@@ -124,9 +123,9 @@ class ImDispatch(object):
         # it will handle a longpolling request
         if not odoo.evented:
             current = threading.current_thread()
-            current._daemonic = True
+            current.daemon = True
             # rename the thread to avoid tests waiting for a longpolling
-            current.setName("openerp.longpolling.request.%s" % current.ident)
+            current.name = f"openerp.longpolling.request.{current.ident}"
 
         registry = odoo.registry(dbname)
 
@@ -199,22 +198,20 @@ class ImDispatch(object):
         while True:
             try:
                 self.loop()
-            except Exception as e:
+            except Exception:
                 _logger.exception("Bus.loop error, sleep and retry")
                 time.sleep(TIMEOUT)
 
     def start(self):
         if odoo.evented:
             # gevent mode
-            import gevent
+            import gevent.event  # pylint: disable=import-outside-toplevel
             self.Event = gevent.event.Event
             gevent.spawn(self.run)
         else:
             # threaded mode
             self.Event = threading.Event
-            t = threading.Thread(name="%s.Bus" % __name__, target=self.run)
-            t.daemon = True
-            t.start()
+            threading.Thread(name=f"{__name__}.Bus", target=self.run, daemon=True).start()
         self.started = True
         return self