summaryrefslogtreecommitdiffstats
path: root/module/plugins/internal
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-10-23 22:53:17 +0200
committerGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-10-23 22:53:17 +0200
commitb47c05a08d0e04a9f81f6ff0fe0c6bea149e72a6 (patch)
tree3204999c1ed6efc58551b605238d082734a214d9 /module/plugins/internal
parentFix https://github.com/pyload/pyload/issues/2099 (diff)
downloadpyload-b47c05a08d0e04a9f81f6ff0fe0c6bea149e72a6.tar.xz
Fix https://github.com/pyload/pyload/issues/2034#issuecomment-150610936
Diffstat (limited to 'module/plugins/internal')
-rw-r--r--module/plugins/internal/MultiHoster.py2
-rw-r--r--module/plugins/internal/utils.py2
2 files changed, 1 insertions, 3 deletions
diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index eb127f57c..5cb3f6ed2 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -25,8 +25,6 @@ class MultiHoster(SimpleHoster):
__authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
- PLUGIN_NAME = None
-
DIRECT_LINK = None
LEECH_HOSTER = False
LOGIN_ACCOUNT = True
diff --git a/module/plugins/internal/utils.py b/module/plugins/internal/utils.py
index 7382ef03f..1fdbaf279 100644
--- a/module/plugins/internal/utils.py
+++ b/module/plugins/internal/utils.py
@@ -115,7 +115,7 @@ def html_unescape(text):
h = HTMLParser.HTMLParser()
return h.unescape(text)
- except Exception: #@TODO: Remove in 0.4.10
+ except NameError: #@TODO: Remove in 0.4.10
return xml.sax.saxutils.unescape(text)