summaryrefslogtreecommitdiffstats
path: root/module/plugins/internal/UnZip.py
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2016-06-17 05:50:38 +0200
committerGravatar GitHub <noreply@github.com> 2016-06-17 05:50:38 +0200
commit8f3bc7699d27784dc75fdaa43150a7a70722aea8 (patch)
treef4f0a7a7173b254e56fa0fc57ab2a0c48b566e9e /module/plugins/internal/UnZip.py
parent[UptoboxCom] fix #2506 (diff)
parentUnRar FIX file exclusion not working (diff)
downloadpyload-8f3bc7699d27784dc75fdaa43150a7a70722aea8.tar.xz
Merge pull request #2500 from robbi/fix/#2168
ExtractArchive Fix/#2168
Diffstat (limited to 'module/plugins/internal/UnZip.py')
-rw-r--r--module/plugins/internal/UnZip.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py
index 50ab80da3..4a05ea155 100644
--- a/module/plugins/internal/UnZip.py
+++ b/module/plugins/internal/UnZip.py
@@ -12,7 +12,7 @@ from module.plugins.internal.misc import encode
class UnZip(Extractor):
__name__ = "UnZip"
__type__ = "extractor"
- __version__ = "1.21"
+ __version__ = "1.22"
__status__ = "stable"
__description__ = """ZIP extractor plugin"""
@@ -36,7 +36,8 @@ class UnZip(Extractor):
def list(self, password=None):
with zipfile.ZipFile(self.target, 'r') as z:
z.setpassword(password)
- return z.namelist()
+ self.files = z.namelist()
+ return self.files
def verify(self, password=None):
@@ -63,6 +64,8 @@ class UnZip(Extractor):
with zipfile.ZipFile(self.target, 'r') as z:
z.setpassword(password)
z.extractall(self.dest)
+ self.files = z.namelist()
+ return self.files
except RuntimeError, e:
raise ArchiveError(e)