summaryrefslogtreecommitdiffstats
path: root/pyload/manager/thread/Download.py
diff options
context:
space:
mode:
Diffstat (limited to 'pyload/manager/thread/Download.py')
-rw-r--r--pyload/manager/thread/Download.py22
1 files changed, 11 insertions, 11 deletions
diff --git a/pyload/manager/thread/Download.py b/pyload/manager/thread/Download.py
index 293014a2e..04f73b2ed 100644
--- a/pyload/manager/thread/Download.py
+++ b/pyload/manager/thread/Download.py
@@ -1,19 +1,19 @@
# -*- coding: utf-8 -*-
# @author: RaNaN
+import traceback
+
+import pycurl
+
from Queue import Queue
-from threading import Thread
+from copy import copy
from os import listdir, stat
from os.path import join
-from time import sleep, time, strftime, gmtime
-from traceback import print_exc, format_exc
from pprint import pformat
from sys import exc_info, exc_clear
-from copy import copy
+from time import sleep, time, strftime, gmtime
from types import MethodType
-from pycurl import error
-
from pyload.manager.thread.Plugin import PluginThread
from pyload.plugin.Plugin import Abort, Fail, Reconnect, Retry, SkipDownload
@@ -81,7 +81,7 @@ class DownloadThread(PluginThread):
pyfile.setStatus("aborted")
if self.m.core.debug:
- print_exc()
+ traceback.print_exc()
self.clean(pyfile)
continue
@@ -116,13 +116,13 @@ class DownloadThread(PluginThread):
pyfile.error = msg
if self.m.core.debug:
- print_exc()
+ traceback.print_exc()
self.m.core.addonManager.downloadFailed(pyfile)
self.clean(pyfile)
continue
- except error, e:
+ except pycurl.error, e:
if len(e.args) == 2:
code, msg = e.args
else:
@@ -156,7 +156,7 @@ class DownloadThread(PluginThread):
pyfile.setStatus("failed")
self.m.core.log.error("pycurl error %s: %s" % (code, msg))
if self.m.core.debug:
- print_exc()
+ traceback.print_exc()
self.writeDebugReport(pyfile)
self.m.core.addonManager.downloadFailed(pyfile)
@@ -184,7 +184,7 @@ class DownloadThread(PluginThread):
pyfile.error = str(e)
if self.m.core.debug:
- print_exc()
+ traceback.print_exc()
self.writeDebugReport(pyfile)
self.m.core.addonManager.downloadFailed(pyfile)