summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--module/plugins/crypter/XFileSharingFolder.py4
-rw-r--r--module/plugins/hoster/XFileSharing.py4
-rw-r--r--module/plugins/internal/MultiHoster.py2
-rw-r--r--module/plugins/internal/utils.py2
4 files changed, 5 insertions, 7 deletions
diff --git a/module/plugins/crypter/XFileSharingFolder.py b/module/plugins/crypter/XFileSharingFolder.py
index 4f08e63df..7c8003705 100644
--- a/module/plugins/crypter/XFileSharingFolder.py
+++ b/module/plugins/crypter/XFileSharingFolder.py
@@ -8,7 +8,7 @@ from module.plugins.internal.XFSCrypter import XFSCrypter, create_getInfo
class XFileSharingFolder(XFSCrypter):
__name__ = "XFileSharingFolder"
__type__ = "crypter"
- __version__ = "0.20"
+ __version__ = "0.21"
__status__ = "testing"
__pattern__ = r'^unmatchable$'
@@ -48,7 +48,7 @@ class XFileSharingFolder(XFSCrypter):
#@TODO: Recheck in 0.4.10
def load_account(self):
class_name = self.classname
- self.__class__.__name__ = self.PLUGIN_NAME
+ self.__class__.__name__ = str(self.PLUGIN_NAME)
super(XFileSharingFolder, self).load_account()
self.__class__.__name__ = class_name
diff --git a/module/plugins/hoster/XFileSharing.py b/module/plugins/hoster/XFileSharing.py
index cc8f5be68..532e1e1e2 100644
--- a/module/plugins/hoster/XFileSharing.py
+++ b/module/plugins/hoster/XFileSharing.py
@@ -8,7 +8,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
class XFileSharing(XFSHoster):
__name__ = "XFileSharing"
__type__ = "hoster"
- __version__ = "0.60"
+ __version__ = "0.61"
__status__ = "testing"
__pattern__ = r'^unmatchable$'
@@ -55,7 +55,7 @@ class XFileSharing(XFSHoster):
#@TODO: Recheck in 0.4.10
def load_account(self):
class_name = self.classname
- self.__class__.__name__ = self.PLUGIN_NAME
+ self.__class__.__name__ = str(self.PLUGIN_NAME)
super(XFileSharing, self).load_account()
self.__class__.__name__ = class_name
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)