1 files changed, 14 insertions, 28 deletions
diff --git a/module/plugins/internal/SevenZip.py b/module/plugins/internal/SevenZip.py
index 5811c28de..f73e935e8 100644
--- a/module/plugins/internal/SevenZip.py
+++ b/module/plugins/internal/SevenZip.py
@@ -5,18 +5,18 @@ import re
 import subprocess
 
 from module.plugins.internal.UnRar import ArchiveError, CRCError, PasswordError, UnRar, renice
-from module.utils import fs_encode, save_join as fs_join
+from module.utils import save_join as fs_join
 
 
 class SevenZip(UnRar):
     __name__    = "SevenZip"
-    __version__ = "0.14"
+    __version__ = "0.16"
     __status__  = "testing"
 
     __description__ = """7-Zip extractor plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("Michael Nowak" , ""                 ),
-                       ("Walter Purcaro", "vuolter@gmail.com")]
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com"),
+                       ("Michael Nowak" , None               )]
 
 
     CMD        = "7z"
@@ -38,7 +38,7 @@ class SevenZip(UnRar):
     @classmethod
     def find(cls):
         try:
-            if os.name == "nt":
+            if os.name is "nt":
                 cls.CMD = os.path.join(pypath, "7z.exe")
 
             p = subprocess.Popen([cls.CMD], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -55,42 +55,28 @@ class SevenZip(UnRar):
             return True
 
 
-    def verify(self, password):
+    def verify(self, password=None):
         #: 7z can't distinguish crc and pw error in test
-        p = self.call_cmd("l", "-slt", fs_encode(self.filename))
+        p = self.call_cmd("l", "-slt", self.target)
         out, err = p.communicate()
 
         if self.re_wrongpwd.search(out):
             raise PasswordError
 
-        if self.re_wrongpwd.search(err):
+        elif self.re_wrongpwd.search(err):
             raise PasswordError
 
-        if self.re_wrongcrc.search(err):
-            raise CRCError(err)
-
-
-
-    def check(self, password):
-        p = self.call_cmd("l", "-slt", fs_encode(self.filename))
-        out, err = p.communicate()
-
-        #: Check if output or error macthes the 'wrong password'-Regexp
-        if self.re_wrongpwd.search(out):
-            raise PasswordError
-
-        if self.re_wrongcrc.search(out):
+        elif self.re_wrongcrc.search(out):
             raise CRCError(_("Header protected"))
 
-
-    def repair(self):
-        return False
+        elif self.re_wrongcrc.search(err):
+            raise CRCError(err)
 
 
     def extract(self, password=None):
         command = "x" if self.fullpath else "e"
 
-        p = self.call_cmd(command, '-o' + self.out, fs_encode(self.filename), password=password)
+        p = self.call_cmd(command, '-o' + self.out, self.target, password=password)
 
         renice(p.pid, self.renice)
 
@@ -117,7 +103,7 @@ class SevenZip(UnRar):
     def list(self, password=None):
         command = "l" if self.fullpath else "l"
 
-        p = self.call_cmd(command, fs_encode(self.filename), password=password)
+        p = self.call_cmd(command, self.target, password=password)
         out, err = p.communicate()
 
         if "Can not open" in err:
@@ -142,7 +128,7 @@ class SevenZip(UnRar):
             args.append("-y")
 
         #: Set a password
-        if "password" in kwargs and kwargs['password']:
+        if kwargs.get('password'):
             args.append("-p%s" % kwargs['password'])
         else:
             args.append("-p-")