diff options
author | 2015-04-21 06:51:24 +0200 | |
---|---|---|
committer | 2015-04-21 06:51:24 +0200 | |
commit | 2f8433b6a10505d29a1b63ea8bbd9b0bf3f7d9f6 (patch) | |
tree | b82a8b5fc0a309f69733b0a004284f4ef45833d8 /pyload/plugin/extractor | |
parent | added check of classname == filename (diff) | |
parent | Merge branch 'pr/n10_ardi69' into 0.4.10 (diff) | |
download | pyload-2f8433b6a10505d29a1b63ea8bbd9b0bf3f7d9f6.tar.xz |
Merge pull request #4 from vuolter/0.4.10
vuolter HEAD
Diffstat (limited to 'pyload/plugin/extractor')
-rw-r--r-- | pyload/plugin/extractor/SevenZip.py | 4 | ||||
-rw-r--r-- | pyload/plugin/extractor/UnRar.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pyload/plugin/extractor/SevenZip.py b/pyload/plugin/extractor/SevenZip.py index 9d01965e0..3c5e86602 100644 --- a/pyload/plugin/extractor/SevenZip.py +++ b/pyload/plugin/extractor/SevenZip.py @@ -134,11 +134,11 @@ class SevenZip(UnRar): def call_cmd(self, command, *xargs, **kwargs): args = [] - #overwrite flag + # overwrite flag if self.overwrite: args.append("-y") - #set a password + # set a password if "password" in kwargs and kwargs['password']: args.append("-p%s" % kwargs['password']) else: diff --git a/pyload/plugin/extractor/UnRar.py b/pyload/plugin/extractor/UnRar.py index cad58ff4f..38ae4e8f2 100644 --- a/pyload/plugin/extractor/UnRar.py +++ b/pyload/plugin/extractor/UnRar.py @@ -81,7 +81,7 @@ class UnRar(Extractor): @classmethod def isMultipart(cls, filename): - return True if cls.re_multipart.search(filename) else False + return cls.re_multipart.search(filename) is not None def verify(self, password): |