sweep: #6958 fix: py2/3 remnants : removed selectors2

Author: fstagni

src/DIRAC/Core/DISET/ServiceReactor.py

@@ -16,17 +16,12 @@
 """
 import time
 import datetime
-import socket
+import selectors
 import signal
 import os
 import sys
 import multiprocessing
 
-try:
-    import selectors
-except ImportError:
-    import selectors2 as selectors
-
 from DIRAC import gLogger, S_OK, S_ERROR
 from DIRAC.Core.DISET.private.Service import Service
 from DIRAC.Core.DISET.private.GatewayService import GatewayService

src/DIRAC/Core/DISET/private/MessageBroker.py

@@ -2,16 +2,10 @@
 """
 import threading
 import time
-import select
-import socket
+import selectors
 
 from concurrent.futures import ThreadPoolExecutor
 
-try:
-    import selectors
-except ImportError:
-    import selectors2 as selectors
-
 from DIRAC import gLogger, S_OK, S_ERROR
 from DIRAC.Core.DISET.private.TransportPool import getGlobalTransportPool
 from DIRAC.Core.Utilities.ReturnValues import isReturnStructure

src/DIRAC/Core/DISET/private/Transports/PlainTransport.py

@@ -1,12 +1,8 @@
+import selectors
 import socket
 import time
 import os
 
-try:
-    import selectors
-except ImportError:
-    import selectors2 as selectors
-
 from DIRAC.Core.DISET.private.Transports.BaseTransport import BaseTransport
 from DIRAC.FrameworkSystem.Client.Logger import gLogger
 from DIRAC.Core.Utilities.ReturnValues import S_ERROR, S_OK

src/DIRAC/Core/DISET/private/Transports/test/Test_SSLTransport.py

@@ -1,13 +1,8 @@
 """ Test the SSLTransport mechanism """
 import os
-import socket
+import selectors
 import threading
 
-try:
-    import selectors
-except ImportError:
-    import selectors2 as selectors
-
 from pytest import fixture
 
 from diraccfg import CFG