diff options
author | Walter Purcaro <vuolter@gmail.com> | 2015-01-31 23:19:30 +0100 |
---|---|---|
committer | Walter Purcaro <vuolter@gmail.com> | 2015-01-31 23:19:30 +0100 |
commit | 7368881d2ba95cca3f47afbb0f4ef5861f2774df (patch) | |
tree | 9e34209590c03e1bb5c5897840f7250b113d9192 /module/plugins/internal/UnZip.py | |
parent | Spare code cosmetics (diff) | |
download | pyload-7368881d2ba95cca3f47afbb0f4ef5861f2774df.tar.xz |
Extractor final fixup
Diffstat (limited to 'module/plugins/internal/UnZip.py')
-rw-r--r-- | module/plugins/internal/UnZip.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py index 83ed3a233..2ab9597ef 100644 --- a/module/plugins/internal/UnZip.py +++ b/module/plugins/internal/UnZip.py @@ -27,20 +27,18 @@ class UnZip(Extractor): return sys.version_info[:2] >= (2, 6) - @classmethod - def getTargets(cls, files_ids): - return [(fname, id) for fname, id in files_ids if cls.isArchive(fname)] - - def extract(self, password=None): try: with zipfile.ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z: z.setpassword(self.password) - if not z.testzip(): + + badfile = z.testzip(): + + if not badfile: z.extractall(self.out) self.files = z.namelist() else: - raise CRCError + raise CRCError(badfile) except (BadZipfile, LargeZipFile), e: raise ArchiveError(e) |