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

1 files changed, 3 insertions, 3 deletions

diff --git a/pyload/manager/ThreadManager.py b/pyload/manager/ThreadManager.py
index 1e7bf0f92..c1204c632 100644
--- a/pyload/manager/ThreadManager.py
+++ b/pyload/manager/ThreadManager.py
@@ -33,7 +33,7 @@ from pyload.network.RequestFactory import getURL
 from pyload.utils import freeSpace, lock
 
 
-class ThreadManager:
+class ThreadManager(object):
     """manages the download threads, assign jobs, reconnect etc"""
 
 
@@ -190,7 +190,7 @@ class ThreadManager:
 
         try:
             reconn = Popen(self.core.config['reconnect']['method'], bufsize=-1, shell=True)#, stdout=subprocess.PIPE)
-        except:
+        except Exception:
             self.core.log.warning(_("Failed executing reconnect script!"))
             self.core.config["reconnect"]["activated"] = False
             self.reconnecting.clear()
@@ -219,7 +219,7 @@ class ThreadManager:
                 ip = getURL(sv[0])
                 ip = re.match(sv[1], ip).group(1)
                 break
-            except:
+            except Exception:
                 ip = ""
                 sleep(1)