gaschz/ansible-qubes
1
0
Fork 0
mirror of https://github.com/Rudd-O/ansible-qubes.git synced 2025-03-01 14:22:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix deprecated Python code.

Browse Source
This commit is contained in:
Manuel Amador (Rudd-O) 2022-06-01 03:22:01 +00:00
parent 03fc7da7de
commit b9f3eca4d9
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bin/bombshell-client
View File

@ -88,7 +88,7 @@ class LoggingEmu():
string = a[0] string = a[0]
else: else:
string = a[0] % a[1:] string = a[0] % a[1:]
syslog.syslog(prio, ("%.3f " % deltat) + threading.currentThread().getName() + ": " + string) syslog.syslog(prio, ("%.3f " % deltat) + threading.current_thread().name + ": " + string)
finally: finally:
debug_lock.release() debug_lock.release()
logging = None logging = None
@ -128,10 +128,10 @@ class MyThread(threading.Thread):
try: try:
self._run() self._run()
except Exception as e: except Exception as e:
logging.error("%s: unexpected exception", threading.currentThread()) logging.error("%s: unexpected exception", threading.current_thread().name)
tb = traceback.format_exc() tb = traceback.format_exc()
logging.error("%s: traceback: %s", threading.currentThread(), tb) logging.error("%s: traceback: %s", threading.current_thread().name, tb)
logging.error("%s: exiting program", threading.currentThread()) logging.error("%s: exiting program", threading.current_thread().name)
os._exit(124) os._exit(124)
@ -140,7 +140,7 @@ class SignalSender(MyThread):
def __init__(self, signals, sigqueue): def __init__(self, signals, sigqueue):
"""Handles signals by pushing them into a file-like object.""" """Handles signals by pushing them into a file-like object."""
threading.Thread.__init__(self) threading.Thread.__init__(self)
self.setDaemon(True) self.daemon = True
self.queue = queue.Queue() self.queue = queue.Queue()
self.sigqueue = sigqueue self.sigqueue = sigqueue
for sig in signals: for sig in signals:
@ -167,7 +167,7 @@ class Signaler(MyThread):
def __init__(self, process, sigqueue): def __init__(self, process, sigqueue):
"""Reads integers from a file-like object and relays that as kill().""" """Reads integers from a file-like object and relays that as kill()."""
threading.Thread.__init__(self) threading.Thread.__init__(self)
self.setDaemon(True) self.daemon = True
self.process = process self.process = process
self.sigqueue = sigqueue self.sigqueue = sigqueue
@ -217,7 +217,7 @@ class DataMultiplexer(MyThread):
def __init__(self, sources, sink): def __init__(self, sources, sink):
threading.Thread.__init__(self) threading.Thread.__init__(self)
self.setDaemon(True) self.daemon = True
self.sources = dict((s,num) for num, s in enumerate(sources)) self.sources = dict((s,num) for num, s in enumerate(sources))
self.sink = sink self.sink = sink
@ -248,7 +248,7 @@ class DataDemultiplexer(MyThread):
def __init__(self, source, sinks): def __init__(self, source, sinks):
threading.Thread.__init__(self) threading.Thread.__init__(self)
self.setDaemon(True) self.daemon = True
self.sinks = dict(enumerate(sinks)) self.sinks = dict(enumerate(sinks))
self.source = source self.source = source
@ -341,15 +341,15 @@ def main_master():
) )
read_signals, write_signals = pairofpipes() read_signals, write_signals = pairofpipes()
signaler = SignalSender(handled_signals, write_signals) signaler = SignalSender(handled_signals, write_signals)
signaler.setName("master signaler") signaler.name = "master signaler"
signaler.start() signaler.start()
muxer = DataMultiplexer([sys.stdin, read_signals], p.stdin) muxer = DataMultiplexer([sys.stdin, read_signals], p.stdin)
muxer.setName("master multiplexer") muxer.name = "master multiplexer"
muxer.start() muxer.start()
demuxer = DataDemultiplexer(p.stdout, [sys.stdout, saved_stderr]) demuxer = DataDemultiplexer(p.stdout, [sys.stdout, saved_stderr])
demuxer.setName("master demultiplexer") demuxer.name = "master demultiplexer"
demuxer.start() demuxer.start()
retval = p.wait() retval = p.wait()
@ -406,15 +406,15 @@ def main_remote():
signals_read, signals_written = pairofpipes() signals_read, signals_written = pairofpipes()
signaler = Signaler(p, signals_read) signaler = Signaler(p, signals_read)
signaler.setName("remote signaler") signaler.name = "remote signaler"
signaler.start() signaler.start()
demuxer = DataDemultiplexer(sys.stdin, [p.stdin, signals_written]) demuxer = DataDemultiplexer(sys.stdin, [p.stdin, signals_written])
demuxer.setName("remote demultiplexer") demuxer.name = "remote demultiplexer"
demuxer.start() demuxer.start()
muxer = DataMultiplexer([p.stdout, p.stderr], sys.stdout) muxer = DataMultiplexer([p.stdout, p.stderr], sys.stdout)
muxer.setName("remote multiplexer") muxer.name = "remote multiplexer"
muxer.start() muxer.start()
logging.info("Started %s", nicecmd) logging.info("Started %s", nicecmd)