PEP-8, Python Zen, refactor and reduce code (thx FedeG)

41 files changed, 58 insertions, 58 deletions

diff --git a/pyload/plugins/Plugin.py b/pyload/plugins/Plugin.py
index cf4debd37..279986746 100644
--- a/pyload/plugins/Plugin.py
+++ b/pyload/plugins/Plugin.py
@@ -493,7 +493,7 @@ class Plugin(Base):
         if not self.core.debug:
             try:
                 remove(tmpCaptcha.name)
-            except:
+            except Exception:
                 pass
 
         return result
diff --git a/pyload/plugins/account/AlldebridCom.py b/pyload/plugins/account/AlldebridCom.py
index d4770426b..4f9164468 100644
--- a/pyload/plugins/account/AlldebridCom.py
+++ b/pyload/plugins/account/AlldebridCom.py
@@ -34,7 +34,7 @@ class AlldebridCom(Account):
             exp_time = time() + int(exp_data[0]) * 24 * 60 * 60 + int(
                 exp_data[1]) * 60 * 60 + (int(exp_data[2]) - 1) * 60
         #Get expiration date from API
-        except:
+        except Exception:
             data = self.getAccountData(user)
             page = req.load("http://www.alldebrid.com/api.php?action=info_user&login=%s&pw=%s" % (user,
                                                                                                   data['password']))
diff --git a/pyload/plugins/account/CatShareNet.py b/pyload/plugins/account/CatShareNet.py
index 30a2691da..e172d6aee 100644
--- a/pyload/plugins/account/CatShareNet.py
+++ b/pyload/plugins/account/CatShareNet.py
@@ -31,7 +31,7 @@ class CatShareNet(Account):
             m = re.search(self.PREMIUM_PATTERN, html)
             if "Premium" in m.group(1):
                 premium = True
-        except:
+        except Exception:
             pass
 
         try:
@@ -39,7 +39,7 @@ class CatShareNet(Account):
             expiredate = m.group(1)
             if "-" not in expiredate:
                 validuntil = mktime(strptime(expiredate, "%d.%m.%Y"))
-        except:
+        except Exception:
             pass
 
         return {'premium': premium, 'trafficleft': -1, 'validuntil': validuntil}
diff --git a/pyload/plugins/addon/ExternalScripts.py b/pyload/plugins/addon/ExternalScripts.py
index 5aff0f11f..05aeecff6 100644
--- a/pyload/plugins/addon/ExternalScripts.py
+++ b/pyload/plugins/addon/ExternalScripts.py
@@ -54,7 +54,7 @@ class ExternalScripts(Addon):
         if not exists(path):
             try:
                 makedirs(path)
-            except:
+            except Exception:
                 self.logDebug("Script folder %s not created" % folder)
                 return
 
diff --git a/pyload/plugins/addon/IRCInterface.py b/pyload/plugins/addon/IRCInterface.py
index a89efcd0c..5b3178852 100644
--- a/pyload/plugins/addon/IRCInterface.py
+++ b/pyload/plugins/addon/IRCInterface.py
@@ -57,7 +57,7 @@ class IRCInterface(Thread, Addon):
         try:
             if self.getConfig("info_pack"):
                 self.response(_("Package finished: %s") % pypack.name)
-        except:
+        except Exception:
             pass
 
 
@@ -66,7 +66,7 @@ class IRCInterface(Thread, Addon):
             if self.getConfig("info_file"):
                 self.response(
                     _("Download finished: %(name)s @ %(plugin)s ") % {"name": pyfile.name, "plugin": pyfile.pluginname})
-        except:
+        except Exception:
             pass
 
 
@@ -179,7 +179,7 @@ class IRCInterface(Thread, Addon):
             trigger = temp[0]
             if len(temp) > 1:
                 args = temp[1:]
-        except:
+        except Exception:
             pass
 
         handler = getattr(self, "event_%s" % trigger, self.event_pass)
@@ -343,7 +343,7 @@ class IRCInterface(Thread, Addon):
 
             return ["INFO: Added %d links to Package %s [#%d]" % (len(links), pack['name'], id)]
 
-        except:
+        except Exception:
             # create new package
             id = self.core.api.addPackage(pack, links, 1)
             return ["INFO: Created new Package %s [#%d] with %d links." % (pack, id, len(links))]
diff --git a/pyload/plugins/addon/UpdateManager.py b/pyload/plugins/addon/UpdateManager.py
index 082721e2f..622374136 100644
--- a/pyload/plugins/addon/UpdateManager.py
+++ b/pyload/plugins/addon/UpdateManager.py
@@ -115,7 +115,7 @@ class UpdateManager(Addon):
     def server_request(self):
         try:
             return getURL(self.SERVER_URL, get={'v': self.core.api.getServerVersion()}).splitlines()
-        except:
+        except Exception:
             self.logWarning(_("Unable to contact server to get updates"))
 
 
diff --git a/pyload/plugins/addon/XMPPInterface.py b/pyload/plugins/addon/XMPPInterface.py
index 7b11bd4dd..5bbff8915 100644
--- a/pyload/plugins/addon/XMPPInterface.py
+++ b/pyload/plugins/addon/XMPPInterface.py
@@ -70,7 +70,7 @@ class XMPPInterface(IRCInterface, JabberClient):
         try:
             if self.getConfig("info_pack"):
                 self.announce(_("Package finished: %s") % pypack.name)
-        except:
+        except Exception:
             pass
 
 
@@ -79,7 +79,7 @@ class XMPPInterface(IRCInterface, JabberClient):
             if self.getConfig("info_file"):
                 self.announce(
                     _("Download finished: %(name)s @ %(plugin)s") % {"name": pyfile.name, "plugin": pyfile.pluginname})
-        except:
+        except Exception:
             pass
 
 
@@ -153,7 +153,7 @@ class XMPPInterface(IRCInterface, JabberClient):
                 trigger = temp[0]
                 if len(temp) > 1:
                     args = temp[1:]
-            except:
+            except Exception:
                 pass
 
             handler = getattr(self, "event_%s" % trigger, self.event_pass)
diff --git a/pyload/plugins/captcha/AdsCaptcha.py b/pyload/plugins/captcha/AdsCaptcha.py
index d804d9942..fe8fec29b 100644
--- a/pyload/plugins/captcha/AdsCaptcha.py
+++ b/pyload/plugins/captcha/AdsCaptcha.py
@@ -56,7 +56,7 @@ class AdsCaptcha(Captcha):
         try:
             challenge = re.search("challenge: '(.+?)',", js).group(1)
             server = re.search("server: '(.+?)',", js).group(1)
-        except:
+        except Exception:
             self.plugin.error(_("AdsCaptcha challenge pattern not found"))
 
         result = self.result(server, challenge)
diff --git a/pyload/plugins/captcha/ReCaptcha.py b/pyload/plugins/captcha/ReCaptcha.py
index c4054c29b..8e4d8c27c 100644
--- a/pyload/plugins/captcha/ReCaptcha.py
+++ b/pyload/plugins/captcha/ReCaptcha.py
@@ -51,7 +51,7 @@ class ReCaptcha(Captcha):
         try:
             challenge = re.search("challenge : '(.+?)',", js).group(1)
             server = re.search("server : '(.+?)',", js).group(1)
-        except:
+        except Exception:
             self.plugin.error(_("ReCaptcha challenge pattern not found"))
 
         result = self.result(server, challenge)
diff --git a/pyload/plugins/captcha/SolveMedia.py b/pyload/plugins/captcha/SolveMedia.py
index 6420fc326..5d5f6ea9a 100644
--- a/pyload/plugins/captcha/SolveMedia.py
+++ b/pyload/plugins/captcha/SolveMedia.py
@@ -32,7 +32,7 @@ class SolveMedia(Captcha):
             challenge = re.search(r'<input type=hidden name="adcopy_challenge" id="adcopy_challenge" value="([^"]+)">',
                                   html).group(1)
             server = "http://api.solvemedia.com/papi/media"
-        except:
+        except Exception:
             self.plugin.error(_("SolveMedia challenge pattern not found"))
 
         result = self.result(server, challenge)
diff --git a/pyload/plugins/container/LinkList.py b/pyload/plugins/container/LinkList.py
index b66e44558..9e6396cab 100644
--- a/pyload/plugins/container/LinkList.py
+++ b/pyload/plugins/container/LinkList.py
@@ -23,7 +23,7 @@ class LinkList(Container):
     def decrypt(self, pyfile):
         try:
             file_enc = codecs.lookup(self.getConfig("encoding")).name
-        except:
+        except Exception:
             file_enc = "utf-8"
 
         file_name = fs_encode(pyfile.url)
@@ -64,7 +64,7 @@ class LinkList(Container):
             try:
                 txt = open(file_name, 'wb')
                 txt.close()
-            except:
+            except Exception:
                 self.logWarning(_("LinkList could not be cleared"))
 
         for name, links in packages.iteritems():
diff --git a/pyload/plugins/crypter/ChipDe.py b/pyload/plugins/crypter/ChipDe.py
index 96892bace..d107f34ae 100644
--- a/pyload/plugins/crypter/ChipDe.py
+++ b/pyload/plugins/crypter/ChipDe.py
@@ -22,7 +22,7 @@ class ChipDe(Crypter):
         self.html = self.load(pyfile.url)
         try:
             f = re.search(r'"(http://video\.chip\.de/.+)"', self.html)
-        except:
+        except Exception:
             self.fail(_("Failed to find the URL"))
         else:
             self.urls = [f.group(1)]
diff --git a/pyload/plugins/crypter/LinkCryptWs.py b/pyload/plugins/crypter/LinkCryptWs.py
index f01c42268..144bd7bb2 100644
--- a/pyload/plugins/crypter/LinkCryptWs.py
+++ b/pyload/plugins/crypter/LinkCryptWs.py
@@ -278,7 +278,7 @@ class LinkCryptWs(Crypter):
             (vcrypted, vjk) = self._getCipherParams(cnl_section)
             for (crypted, jk) in zip(vcrypted, vjk):
                 package_links.extend(self._getLinks(crypted, jk))
-        except:
+        except Exception:
             self.logError(_("Unable to decrypt CNL links (JS Error) try to get over links"))
             return self.handleWebLinks()
 
diff --git a/pyload/plugins/crypter/LinkSaveIn.py b/pyload/plugins/crypter/LinkSaveIn.py
index 2e0ac923e..e39d1a13d 100644
--- a/pyload/plugins/crypter/LinkSaveIn.py
+++ b/pyload/plugins/crypter/LinkSaveIn.py
@@ -202,7 +202,7 @@ class LinkSaveIn(SimpleCrypter):
                 (vcrypted, vjk) = self._getCipherParams()
                 for (crypted, jk) in zip(vcrypted, vjk):
                     package_links.extend(self._getLinks(crypted, jk))
-            except:
+            except Exception:
                 self.fail(_("Unable to decrypt CNL2 links"))
         return package_links
 
diff --git a/pyload/plugins/crypter/NCryptIn.py b/pyload/plugins/crypter/NCryptIn.py
index edb664d32..b5b496a3f 100644
--- a/pyload/plugins/crypter/NCryptIn.py
+++ b/pyload/plugins/crypter/NCryptIn.py
@@ -229,7 +229,7 @@ class NCryptIn(Crypter):
                 (vcrypted, vjk) = self._getCipherParams()
                 for (crypted, jk) in zip(vcrypted, vjk):
                     package_links.extend(self._getLinks(crypted, jk))
-            except:
+            except Exception:
                 self.fail(_("Unable to decrypt CNL2 links"))
 
         return package_links
diff --git a/pyload/plugins/crypter/RelinkUs.py b/pyload/plugins/crypter/RelinkUs.py
index c27d790b8..419ce4506 100644
--- a/pyload/plugins/crypter/RelinkUs.py
+++ b/pyload/plugins/crypter/RelinkUs.py
@@ -200,7 +200,7 @@ class RelinkUs(Crypter):
                 (vcrypted, vjk) = self._getCipherParams(cnl2_form)
                 for (crypted, jk) in zip(vcrypted, vjk):
                     package_links.extend(self._getLinks(crypted, jk))
-            except:
+            except Exception:
                 self.logDebug("Unable to decrypt CNL2 links")
         return package_links
 
@@ -219,7 +219,7 @@ class RelinkUs(Crypter):
                 with open(dlc_filepath, "wb") as f:
                     f.write(dlc)
                 package_links.append(dlc_filepath)
-            except:
+            except Exception:
                 self.fail("Unable to download DLC container")
         return package_links
 
diff --git a/pyload/plugins/crypter/ShareLinksBiz.py b/pyload/plugins/crypter/ShareLinksBiz.py
index 7aa5dd17b..64b198100 100644
--- a/pyload/plugins/crypter/ShareLinksBiz.py
+++ b/pyload/plugins/crypter/ShareLinksBiz.py
@@ -235,7 +235,7 @@ class ShareLinksBiz(Crypter):
             try:
                 (crypted, jk) = self._getCipherParams()
                 package_links.extend(self._getLinks(crypted, jk))
-            except:
+            except Exception:
                 self.fail(_("Unable to decrypt CNL2 links"))
         return package_links
 
diff --git a/pyload/plugins/hook/BypassCaptcha.py b/pyload/plugins/hook/BypassCaptcha.py
index 112066353..26e6794c0 100644
--- a/pyload/plugins/hook/BypassCaptcha.py
+++ b/pyload/plugins/hook/BypassCaptcha.py
@@ -50,7 +50,7 @@ class BypassCaptcha(Hook):
     def getCredits(self):
         res = getURL(self.GETCREDITS_URL, post={"key": self.getConfig("passkey")})
 
-        data = dict([x.split(' ', 1) for x in res.splitlines()])
+        data = dict(x.split(' ', 1) for x in res.splitlines())
         return int(data['Left'])
 
 
@@ -70,7 +70,7 @@ class BypassCaptcha(Hook):
         finally:
             req.close()
 
-        data = dict([x.split(' ', 1) for x in res.splitlines()])
+        data = dict(x.split(' ', 1) for x in res.splitlines())
         if not data or "Value" not in data:
             raise BypassCaptchaException(res)
 
diff --git a/pyload/plugins/hook/ImageTyperz.py b/pyload/plugins/hook/ImageTyperz.py
index 57a734884..b7d7cdd21 100644
--- a/pyload/plugins/hook/ImageTyperz.py
+++ b/pyload/plugins/hook/ImageTyperz.py
@@ -60,7 +60,7 @@ class ImageTyperz(Hook):
 
         try:
             balance = float(res)
-        except:
+        except Exception:
             raise ImageTyperzException("Invalid response")
 
         self.logInfo(_("Account balance: $%s left") % res)
diff --git a/pyload/plugins/hoster/DepositfilesCom.py b/pyload/plugins/hoster/DepositfilesCom.py
index ca26ebc47..001fee199 100644
--- a/pyload/plugins/hoster/DepositfilesCom.py
+++ b/pyload/plugins/hoster/DepositfilesCom.py
@@ -97,7 +97,7 @@ class DepositfilesCom(SimpleHoster):
 
         try:
             self.download(link, disposition=True)
-        except:
+        except Exception:
             self.retry(wait_time=60)
 
 
diff --git a/pyload/plugins/hoster/DlFreeFr.py b/pyload/plugins/hoster/DlFreeFr.py
index b06609298..2bfd88c22 100644
--- a/pyload/plugins/hoster/DlFreeFr.py
+++ b/pyload/plugins/hoster/DlFreeFr.py
@@ -33,7 +33,7 @@ class CustomBrowser(Browser):
         return Browser.load(self, *args, **kwargs)
 
 
-class AdYouLike:
+class AdYouLike(object):
     """
     Class to support adyoulike captcha service
     """
diff --git a/pyload/plugins/hoster/FilesMailRu.py b/pyload/plugins/hoster/FilesMailRu.py
index 1c7c8059e..4a5118fda 100644
--- a/pyload/plugins/hoster/FilesMailRu.py
+++ b/pyload/plugins/hoster/FilesMailRu.py
@@ -21,7 +21,7 @@ def getInfo(urls):
                     url_pattern = '<a href="(.+?)" onclick="return Act\(this\, \'dlink\'\, event\)">(.+?)</a>'
                     file_name = re.search(url_pattern, html).group(0).split(', event)">')[1].split('</a>')[0]
                     result.append((file_name, 0, 2, url))
-                except:
+                except Exception:
                     pass
 
         # status 1=OFFLINE, 2=OK, 3=UNKNOWN
diff --git a/pyload/plugins/hoster/FourSharedCom.py b/pyload/plugins/hoster/FourSharedCom.py
index 03500654e..79e99aee4 100644
--- a/pyload/plugins/hoster/FourSharedCom.py
+++ b/pyload/plugins/hoster/FourSharedCom.py
@@ -51,7 +51,7 @@ class FourSharedCom(SimpleHoster):
             m = re.search(self.FID_PATTERN, self.html)
             res = self.load('http://www.4shared.com/web/d2/getFreeDownloadLimitInfo?fileId=%s' % m.group(1))
             self.logDebug(res)
-        except:
+        except Exception:
             pass
 
         self.wait(20)
diff --git a/pyload/plugins/hoster/Ftp.py b/pyload/plugins/hoster/Ftp.py
index 2baec064b..c130cc395 100644
--- a/pyload/plugins/hoster/Ftp.py
+++ b/pyload/plugins/hoster/Ftp.py
@@ -35,7 +35,7 @@ class Ftp(Hoster):
         pyfile.name = parsed_url.path.rpartition('/')[2]
         try:
             pyfile.name = unquote(str(pyfile.name)).decode('utf8')
-        except:
+        except Exception:
             pass
 
         if not "@" in netloc:
diff --git a/pyload/plugins/hoster/MediafireCom.py b/pyload/plugins/hoster/MediafireCom.py
index 10d25ab9d..246a5c87e 100644
--- a/pyload/plugins/hoster/MediafireCom.py
+++ b/pyload/plugins/hoster/MediafireCom.py
@@ -28,7 +28,7 @@ def checkHTMLHeader(url):
                     return url, 2
             else:
                 break
-    except:
+    except Exception:
         return url, 3
 
     return url, 0
diff --git a/pyload/plugins/hoster/NetloadIn.py b/pyload/plugins/hoster/NetloadIn.py
index b517fe455..07aeb48ca 100644
--- a/pyload/plugins/hoster/NetloadIn.py
+++ b/pyload/plugins/hoster/NetloadIn.py
@@ -40,10 +40,10 @@ def getInfo(urls):
                 tmp = r.split(";")
                 try:
                     size = int(tmp[2])
-                except:
+                except Exception:
                     size = 0
                 result.append((tmp[1], size, 2 if tmp[3] == "online" else 1, chunk[i]))
-            except:
+            except Exception:
                 self.logDebug("Error while processing response: %s" % r)
 
         yield result
@@ -201,14 +201,14 @@ class NetloadIn(Hoster):
             try:
                 url_captcha_html = "http://netload.in/" + re.search('(index.php\?id=10&amp;.*&amp;captcha=1)',
                                                                     page).group(1).replace("amp;", "")
-            except:
+            except Exception:
                 page = None
                 continue
 
             try:
                 page = self.load(url_captcha_html, cookies=True)
                 captcha_url = "http://netload.in/" + re.search('(share/includes/captcha.php\?t=\d*)', page).group(1)
-            except:
+            except Exception:
                 self.logDebug("Could not find captcha, try again from beginning")
                 captchawaited = False
                 continue
@@ -243,7 +243,7 @@ class NetloadIn(Hoster):
                 file_url_pattern = r'<a href="(.+)" class="Orange_Link">Click here'
                 attempt = re.search(file_url_pattern, page)
                 return "http://netload.in/" + attempt.group(1)
-        except:
+        except Exception:
             self.logDebug("Getting final link failed")
             return None
 
diff --git a/pyload/plugins/hoster/PremiumTo.py b/pyload/plugins/hoster/PremiumTo.py
index 305b6d1d1..03ac37599 100644
--- a/pyload/plugins/hoster/PremiumTo.py
+++ b/pyload/plugins/hoster/PremiumTo.py
@@ -72,6 +72,6 @@ class PremiumTo(Hoster):
             api_r = self.load("http://premium.to/api/straffic.php",
                               get={'username': self.account.username, 'password': self.account.password})
             traffic = sum(map(int, api_r.split(';')))
-        except:
+        except Exception:
             traffic = 0
         return traffic
diff --git a/pyload/plugins/hoster/ShareonlineBiz.py b/pyload/plugins/hoster/ShareonlineBiz.py
index 0769cfe17..59204eb2e 100644
--- a/pyload/plugins/hoster/ShareonlineBiz.py
+++ b/pyload/plugins/hoster/ShareonlineBiz.py
@@ -177,7 +177,7 @@ class ShareonlineBiz(Hoster):
         err = m.group(1)
         try:
             self.logError(err, re.search(self.ERROR_INFO_PATTERN, self.html).group(1))
-        except:
+        except Exception:
             self.logError(err, "Unknown error occurred")
 
         if err == "invalid":
diff --git a/pyload/plugins/hoster/VimeoCom.py b/pyload/plugins/hoster/VimeoCom.py
index bfa2cbb79..a24eedee2 100644
--- a/pyload/plugins/hoster/VimeoCom.py
+++ b/pyload/plugins/hoster/VimeoCom.py
@@ -44,7 +44,7 @@ class VimeoCom(SimpleHoster):
             html = self.load("https://player.vimeo.com/video/" + id, get={'password': password})
             pattern = r'"(?P<QL>\w+)":{"profile".*?"(?P<URL>http://pdl\.vimeocdn\.com.+?)"'
 
-        link = dict([(l.group('QL').lower(), l.group('URL')) for l in re.finditer(pattern, html)])
+        link = dict((l.group('QL').lower(), l.group('URL')) for l in re.finditer(pattern, html))
 
         if self.getConfig("original"):
             if "original" in link:
diff --git a/pyload/plugins/hoster/YibaishiwuCom.py b/pyload/plugins/hoster/YibaishiwuCom.py
index 883dfa947..82ba9e8dc 100644
--- a/pyload/plugins/hoster/YibaishiwuCom.py
+++ b/pyload/plugins/hoster/YibaishiwuCom.py
@@ -46,7 +46,7 @@ class YibaishiwuCom(SimpleHoster):
                 self.logDebug("Trying URL: " + url)
                 self.download(url)
                 break
-            except:
+            except Exception:
                 continue
         else:
             self.fail(_("No working link found"))
diff --git a/pyload/plugins/hoster/ZippyshareCom.py b/pyload/plugins/hoster/ZippyshareCom.py
index 8f9062cfc..53b93d928 100644
--- a/pyload/plugins/hoster/ZippyshareCom.py
+++ b/pyload/plugins/hoster/ZippyshareCom.py
@@ -56,7 +56,7 @@ class ZippyshareCom(SimpleHoster):
                 c1, c2 = map(int, re.search(r'\(\'downloadB\'\).omg\) \* \((\d+)%(\d+)', self.html).groups())
 
             b = (a1 % a2) * (c1 % c2)
-        except:
+        except Exception:
             self.error(_("Unable to calculate checksum"))
         else:
             return b + 18
diff --git a/pyload/plugins/internal/AbstractExtractor.py b/pyload/plugins/internal/AbstractExtractor.py
index 54ea9b348..717c91c46 100644
--- a/pyload/plugins/internal/AbstractExtractor.py
+++ b/pyload/plugins/internal/AbstractExtractor.py
@@ -12,7 +12,7 @@ class WrongPassword(Exception):
     pass
 
 
-class AbtractExtractor:
+class AbtractExtractor(object):
     __name__    = "AbtractExtractor"
     __version__ = "0.1"
 
diff --git a/pyload/plugins/internal/Account.py b/pyload/plugins/internal/Account.py
index e6895f119..b5125d61c 100644
--- a/pyload/plugins/internal/Account.py
+++ b/pyload/plugins/internal/Account.py
@@ -241,7 +241,7 @@ class Account(Base):
                     start, end = time_data.split("-")
                     if not compare_time(start.split(":"), end.split(":")):
                         continue
-                except:
+                except Exception:
                     self.logWarning(_("Your Time %s has wrong format, use: 1:22-3:44") % time_data)
 
             if user in self.infos:
diff --git a/pyload/plugins/internal/Crypter.py b/pyload/plugins/internal/Crypter.py
index 974ee60a1..8580def61 100644
--- a/pyload/plugins/internal/Crypter.py
+++ b/pyload/plugins/internal/Crypter.py
@@ -68,11 +68,11 @@ class Crypter(Plugin):
         folder_per_package = self.core.config['general']['folder_per_package']
         try:
             use_subfolder = self.getConfig('use_subfolder')
-        except:
+        except Exception:
             use_subfolder = folder_per_package
         try:
             subfolder_per_package = self.getConfig('subfolder_per_package')
-        except:
+        except Exception:
             subfolder_per_package = True
 
         for pack in self.packages:
diff --git a/pyload/plugins/internal/OCR.py b/pyload/plugins/internal/OCR.py
index dec9f28b7..4d435d493 100644
--- a/pyload/plugins/internal/OCR.py
+++ b/pyload/plugins/internal/OCR.py
@@ -99,7 +99,7 @@ class OCR(object):
         try:
             with open(tmpTxt.name, 'r') as f:
                 self.result_captcha = f.read().replace("\n", "")
-        except:
+        except Exception:
             self.result_captcha = ""
 
         self.logger.debug(self.result_captcha)
@@ -108,7 +108,7 @@ class OCR(object):
             os.remove(tmpTxt.name)
             if subset and (digits or lowercase or uppercase):
                 os.remove(tmpSub.name)
-        except:
+        except Exception:
             pass
 
 
@@ -163,7 +163,7 @@ class OCR(object):
                         count += 1
                     if pixels[x, y - 1] != 255:
                         count += 1
-                except:
+                except Exception:
                     pass
 
                 # not enough neighbors are dark pixels so mark this pixel
diff --git a/pyload/plugins/internal/SimpleCrypter.py b/pyload/plugins/internal/SimpleCrypter.py
index 090cf2e9f..4287c4d74 100644
--- a/pyload/plugins/internal/SimpleCrypter.py
+++ b/pyload/plugins/internal/SimpleCrypter.py
@@ -144,7 +144,7 @@ class SimpleCrypter(Crypter, SimpleHoster):
         try:
             m = re.search(self.PAGES_PATTERN, self.html)
             pages = int(m.group(1))
-        except:
+        except Exception:
             pages = 1
 
         for p in xrange(2, pages + 1):
diff --git a/pyload/plugins/internal/SimpleHoster.py b/pyload/plugins/internal/SimpleHoster.py
index a33e48bdf..922361b30 100644
--- a/pyload/plugins/internal/SimpleHoster.py
+++ b/pyload/plugins/internal/SimpleHoster.py
@@ -198,7 +198,7 @@ class SimpleHoster(Hoster):
         else:
             try:
                 info.update(re.match(cls.__pattern__, url).groupdict())
-            except:
+            except Exception:
                 pass
 
             for pattern in ("INFO_PATTERN", "NAME_PATTERN", "SIZE_PATTERN"):
diff --git a/pyload/plugins/internal/UnRar.py b/pyload/plugins/internal/UnRar.py
index 31a0d7642..ebfe53829 100644
--- a/pyload/plugins/internal/UnRar.py
+++ b/pyload/plugins/internal/UnRar.py
@@ -16,7 +16,7 @@ def renice(pid, value):
     if os.name != "nt" and value:
         try:
             Popen(["renice", str(value), str(pid)], stdout=PIPE, stderr=PIPE, bufsize=-1)
-        except:
+        except Exception:
             print "Renice failed"
 
 
diff --git a/pyload/plugins/internal/UpdateManager.py b/pyload/plugins/internal/UpdateManager.py
index 082721e2f..622374136 100644
--- a/pyload/plugins/internal/UpdateManager.py
+++ b/pyload/plugins/internal/UpdateManager.py
@@ -115,7 +115,7 @@ class UpdateManager(Addon):
     def server_request(self):
         try:
             return getURL(self.SERVER_URL, get={'v': self.core.api.getServerVersion()}).splitlines()
-        except:
+        except Exception:
             self.logWarning(_("Unable to contact server to get updates"))
 
 
diff --git a/pyload/plugins/internal/XFSHoster.py b/pyload/plugins/internal/XFSHoster.py
index 4d3c848b9..061012059 100644
--- a/pyload/plugins/internal/XFSHoster.py
+++ b/pyload/plugins/internal/XFSHoster.py
@@ -323,7 +323,7 @@ class XFSHoster(SimpleHoster):
         recaptcha = ReCaptcha(self)
         try:
             captcha_key = re.search(self.RECAPTCHA_PATTERN, self.html).group(1)
-        except:
+        except Exception:
             captcha_key = recaptcha.detect_key()
         else:
             self.logDebug("ReCaptcha key: %s" % captcha_key)
@@ -335,7 +335,7 @@ class XFSHoster(SimpleHoster):
         solvemedia = SolveMedia(self)
         try:
             captcha_key = re.search(self.SOLVEMEDIA_PATTERN, self.html).group(1)
-        except:
+        except Exception:
             captcha_key = solvemedia.detect_key()
         else:
             self.logDebug("SolveMedia key: %s" % captcha_key)
diff --git a/pyload/plugins/ocr/LinksaveIn.py b/pyload/plugins/ocr/LinksaveIn.py
index a9171ac7c..754bfc39d 100644
--- a/pyload/plugins/ocr/LinksaveIn.py
+++ b/pyload/plugins/ocr/LinksaveIn.py
@@ -79,7 +79,7 @@ class LinksaveIn(OCR):
                     rgb_c = lut[pix[x, y]]
                     try:
                         cstat[rgb_c] += 1
-                    except:
+                    except Exception:
                         cstat[rgb_c] = 1
                     if rgb_bg == rgb_c:
                         stat[bgpath] += 1