diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2014-11-09 03:08:19 +0100 |
|---|---|---|
| committer | Walter Purcaro <vuolter@gmail.com>
| 2014-11-09 03:08:19 +0100 |
| commit | bd8259220ab4d56ab419b7b32045b08cc9b0a7c8 (patch) | |
| tree | 92f1c69d4280f8f57021083dbf878e62033eb502 /module/plugins/hoster | |
| parent | Cookie support for getURL method (diff) | |
| download | pyload-bd8259220ab4d56ab419b7b32045b08cc9b0a7c8.tar.xz | |
Use with statement instead open method when accessing fod + handle i/o error
Diffstat (limited to 'module/plugins/hoster')
| -rw-r--r-- | module/plugins/hoster/MegaCoNz.py | 14 | ||||
| -rw-r--r-- | module/plugins/hoster/PremiumTo.py | 5 |
2 files changed, 11 insertions, 8 deletions
diff --git a/module/plugins/hoster/MegaCoNz.py b/module/plugins/hoster/MegaCoNz.py index 70688c26a..9b120827c 100644 --- a/module/plugins/hoster/MegaCoNz.py +++ b/module/plugins/hoster/MegaCoNz.py @@ -48,9 +48,9 @@ class MegaCoNz(Hoster): # generate a session id, no idea where to obtain elsewhere uid = random.randint(10 << 9, 10 ** 10) - resp = self.load(self.API_URL % uid, post=json_dumps([kwargs])) - self.logDebug("Api Response: " + resp) - return json_loads(resp) + res = self.load(self.API_URL % uid, post=json_dumps([kwargs])) + self.logDebug("Api Response: " + res) + return json_loads(res) def decryptAttr(self, data, key): @@ -78,8 +78,12 @@ class MegaCoNz(Hoster): file_crypted = self.lastDownload file_decrypted = file_crypted.rsplit(self.FILE_SUFFIX)[0] - f = open(file_crypted, "rb") - df = open(file_decrypted, "wb") + + try: + f = open(file_crypted, "rb") + df = open(file_decrypted, "wb") + except IOError, e: + self.fail(str(e)) # TODO: calculate CBC-MAC for checksum diff --git a/module/plugins/hoster/PremiumTo.py b/module/plugins/hoster/PremiumTo.py index 183182689..beab4391e 100644 --- a/module/plugins/hoster/PremiumTo.py +++ b/module/plugins/hoster/PremiumTo.py @@ -54,9 +54,8 @@ class PremiumTo(Hoster): lastDownload = fs_encode(self.lastDownload) if exists(lastDownload): - f = open(lastDownload, "rb") - err = f.read(256).strip() - f.close() + with open(lastDownload, "rb") as f: + err = f.read(256).strip() remove(lastDownload) else: err = _('File does not exist') |