saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use six.reraise for py3 compatability

Browse source
This commit is contained in:
Daniel A. Wozniak 2019-04-09 17:58:13 +00:00
parent 6d80789cf1
commit 25f5a90bd6
No known key found for this signature in database
GPG key ID: 166B9D2C06C82D61
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/transport/ipc.py
View file

@ -760,18 +760,12 @@ class IPCMessageSubscriber(object):
if data is None:
break
elif isinstance(data, IPCExceptionProxy):
self.reraise(data.orig_info)
six.reraise(*data.orig_info)
elif callback:
self.service.io_loop.spawn_callback(callback, data)
else:
raise tornado.gen.Return(data)
def reraise(self, exc_info):
if six.PY2:
raise exc_info[0], exc_info[1], exc_info[2] # pylint: disable=W1699
else:
raise exc_info[0].with_traceback(exc_info[1], exc_info[2])
def read_sync(self, timeout=None):
'''
Read a message from an IPC socket