summaryrefslogtreecommitdiffstats
path: root/pyload/Thread
diff options
context:
space:
mode:
Diffstat (limited to 'pyload/Thread')
-rw-r--r--pyload/Thread/Addon.py2
-rw-r--r--pyload/Thread/Decrypter.py4
-rw-r--r--pyload/Thread/Download.py4
-rw-r--r--pyload/Thread/Info.py2
-rw-r--r--pyload/Thread/Plugin.py4
5 files changed, 8 insertions, 8 deletions
diff --git a/pyload/Thread/Addon.py b/pyload/Thread/Addon.py
index 0b46345e8..35168f615 100644
--- a/pyload/Thread/Addon.py
+++ b/pyload/Thread/Addon.py
@@ -2,13 +2,13 @@
# @author: RaNaN
import os
+import sys
import time
import traceback
from Queue import Queue
from copy import copy
from pprint import pformat
-from sys import exc_info, exc_clear
from types import MethodType
from pyload.Thread.Plugin import PluginThread
diff --git a/pyload/Thread/Decrypter.py b/pyload/Thread/Decrypter.py
index 83403e8fa..b0c4d44e8 100644
--- a/pyload/Thread/Decrypter.py
+++ b/pyload/Thread/Decrypter.py
@@ -2,13 +2,13 @@
# @author: RaNaN
import os
+import sys
import time
import traceback
from Queue import Queue
from copy import copy
from pprint import pformat
-from sys import exc_info, exc_clear
from types import MethodType
from pyload.Thread.Plugin import PluginThread
@@ -98,7 +98,7 @@ class DecrypterThread(PluginThread):
self.active = False
self.m.core.files.save()
self.m.localThreads.remove(self)
- exc_clear()
+ sys.exc_clear()
if not retry:
pyfile.delete()
diff --git a/pyload/Thread/Download.py b/pyload/Thread/Download.py
index d7a55ad24..c7c2470dd 100644
--- a/pyload/Thread/Download.py
+++ b/pyload/Thread/Download.py
@@ -2,6 +2,7 @@
# @author: RaNaN
import os
+import sys
import time
import traceback
@@ -10,7 +11,6 @@ import pycurl
from Queue import Queue
from copy import copy
from pprint import pformat
-from sys import exc_info, exc_clear
from types import MethodType
from pyload.Thread.Plugin import PluginThread
@@ -193,7 +193,7 @@ class DownloadThread(PluginThread):
finally:
self.m.core.files.save()
pyfile.checkIfProcessed()
- exc_clear()
+ sys.exc_clear()
# pyfile.plugin.req.clean()
diff --git a/pyload/Thread/Info.py b/pyload/Thread/Info.py
index 09b562659..36779a962 100644
--- a/pyload/Thread/Info.py
+++ b/pyload/Thread/Info.py
@@ -2,13 +2,13 @@
# @author: RaNaN
import os
+import sys
import time
import traceback
from Queue import Queue
from copy import copy
from pprint import pformat
-from sys import exc_info, exc_clear
from types import MethodType
from pyload.api import OnlineStatus
diff --git a/pyload/Thread/Plugin.py b/pyload/Thread/Plugin.py
index 9d61c9a12..c7350a735 100644
--- a/pyload/Thread/Plugin.py
+++ b/pyload/Thread/Plugin.py
@@ -4,6 +4,7 @@
from __future__ import with_statement
import os
+import sys
import threading
import time
import traceback
@@ -11,7 +12,6 @@ import traceback
from Queue import Queue
from copy import copy
from pprint import pformat
-from sys import exc_info, exc_clear
from types import MethodType
from pyload.api import OnlineStatus
@@ -74,7 +74,7 @@ class PluginThread(threading.Thread):
dump = "pyLoad %s Debug Report of %s %s \n\nTRACEBACK:\n %s \n\nFRAMESTACK:\n" % (
self.m.core.api.getServerVersion(), pyfile.pluginname, pyfile.plugin.__version, traceback.format_exc())
- tb = exc_info()[2]
+ tb = sys.exc_info()[2]
stack = []
while tb:
stack.append(tb.tb_frame)