9 files changed, 13 insertions, 13 deletions
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)