Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/container/LinkList.py
	module/plugins/container/TXT.py
	module/plugins/hoster/HundredEightyUploadCom.py
	pyload/plugin/Extractor.py
	pyload/plugin/addon/ClickAndLoad.py
	pyload/plugin/addon/ExtractArchive.py
	pyload/plugin/addon/HotFolder.py
	pyload/plugin/container/TXT.py
	pyload/plugin/extractor/SevenZip.py
	pyload/plugin/extractor/UnRar.py
	pyload/plugin/extractor/UnZip.py
	pyload/plugin/hook/XFileSharingPro.py
	pyload/plugin/hoster/ZippyshareCom.py

1 files changed, 17 insertions, 14 deletions

diff --git a/pyload/plugin/Extractor.py b/pyload/plugin/Extractor.py
index 2582e4ad2..b1188fe13 100644
--- a/pyload/plugin/Extractor.py
+++ b/pyload/plugin/Extractor.py
@@ -20,7 +20,8 @@ class PasswordError(Exception):
 
 class Extractor(Base):
     __name    = "Extractor"
-    __version = "0.20"
+    __type    = "extractor"
+    __version = "0.21"
 
     __description = """Base extractor plugin"""
     __license     = "GPLv3"
@@ -31,6 +32,7 @@ class Extractor(Base):
 
     EXTENSIONS = []
     VERSION    = ""
+    REPAIR     = False
 
 
     @classmethod
@@ -91,23 +93,24 @@ class Extractor(Base):
 
 
     def check(self):
-        """Check if password if needed. Raise ArchiveError if integrity is
-        questionable.
+        """Quick Check by listing content of archive.
+        Raises error if password is needed, integrity is questionable or else.
 
-        :return: boolean
+        :raises PasswordError
+        :raises CRCError
         :raises ArchiveError
         """
-        raise PasswordError
-
-
-    def isPassword(self, password):
-        """ Check if the given password is/might be correct.
-        If it can not be decided at this point return true.
-
-        :param password:
-        :return: boolean
+        raise NotImplementedError
+        
+    def test(self):
+        """Testing with Extractors buildt-in method
+        Raises error if password is needed, integrity is questionable or else.
+        
+        :raises PasswordError
+        :raises CRCError
+        :raises ArchiveError
         """
-        return None
+        raise NotImplementedError
 
 
     def repair(self):