Skip to content

Commit 855ff40

Browse files
committed
Fix python3 raise exception error.
1 parent 29a42a3 commit 855ff40

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

‎telebot/util.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22

33
import threading
44
import sys
5+
import six
56
from six import string_types
67

78
# Python3 queue support.
9+
810
try:
911
import Queue
1012
except ImportError:
@@ -66,7 +68,7 @@ def put(self, task, *args, **kwargs):
6668

6769
def raise_exceptions(self):
6870
if self.exception_event.is_set():
69-
raise self.exc_info[0], self.exc_info[1], self.exc_info[2]
71+
six.reraise(self.exc_info[0], self.exc_info[1], self.exc_info[2])
7072

7173
def clear_exceptions(self):
7274
self.exception_event.clear()
@@ -96,7 +98,7 @@ def on_exception(self, worker_thread, exc_info):
9698

9799
def raise_exceptions(self):
98100
if self.exception_event.is_set():
99-
raise self.exc_info[0], self.exc_info[1], self.exc_info[2]
101+
six.reraise(self.exc_info[0], self.exc_info[1], self.exc_info[2])
100102

101103
def clear_exceptions(self):
102104
self.exception_event.clear()
@@ -129,7 +131,7 @@ def wait(self):
129131
if not self.done:
130132
self.thread.join()
131133
if isinstance(self.result, BaseException):
132-
raise self.result[0], self.result[1], self.result[2]
134+
six.reraise(self.result[0], self.result[1], self.result[2])
133135
else:
134136
return self.result
135137

0 commit comments

Comments
 (0)