diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-07-30 14:52:01 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-07-30 14:52:01 +0200 |
| commit | 3b6e1b55a0ab527af98c901cf2d855359500b14e (patch) | |
| tree | 1c710fbf4d0ca273e6972943b42a3e295ed635c6 /module | |
| parent | Merge pull request #1615 from zapp-brannigan/patch-3 (diff) | |
| download | pyload-3b6e1b55a0ab527af98c901cf2d855359500b14e.tar.xz | |
[AntiStandby] Fix max_mtime method
Diffstat (limited to 'module')
| -rw-r--r-- | module/plugins/crypter/FilecryptCc.py | 5 | ||||
| -rw-r--r-- | module/plugins/hooks/AntiStandby.py | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/module/plugins/crypter/FilecryptCc.py b/module/plugins/crypter/FilecryptCc.py index ff2620b53..62b6c9ee2 100644 --- a/module/plugins/crypter/FilecryptCc.py +++ b/module/plugins/crypter/FilecryptCc.py @@ -68,10 +68,7 @@ class FilecryptCc(Crypter): self.log_info(_("Found %d mirrors") % len(mirror)) for i in mirror[1:]: - try: - self.site_with_links = self.site_with_links + self.load(i).decode("utf-8", "replace") - except: - self.site_with_links = self.site_with_links + self.load(i) + self.site_with_links = self.site_with_links + self.load(i) def handle_password_protection(self): diff --git a/module/plugins/hooks/AntiStandby.py b/module/plugins/hooks/AntiStandby.py index 93eca09cc..ba462e002 100644 --- a/module/plugins/hooks/AntiStandby.py +++ b/module/plugins/hooks/AntiStandby.py @@ -13,6 +13,7 @@ except ImportError: pass from module.plugins.internal.Addon import Addon, Expose +from module.utils import fs_join class Kernel32(object): @@ -26,7 +27,7 @@ class Kernel32(object): class AntiStandby(Addon): __name__ = "AntiStandby" __type__ = "hook" - __version__ = "0.06" + __version__ = "0.07" __status__ = "testing" __config__ = [("activated", "bool", "Activated" , True ), @@ -149,7 +150,7 @@ class AntiStandby(Addon): @Expose def max_mtime(self, path): return max(0, 0, - *(os.path.getmtime(os.path.join(root, file)) + *(os.path.getmtime(fs_join(root, file)) for root, dirs, files in os.walk(path, topdown=False) for file in files)) |