From 004a80bfaad38f9400e8aebcb8f980353a232295 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Mon, 1 Dec 2014 23:53:07 +0100
Subject: PEP-8, Python Zen, refactor and reduce code (thx FedeG)
---
pyload/datatype/PyFile.py | 10 +++++-----
pyload/datatype/PyPackage.py | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
(limited to 'pyload/datatype')
diff --git a/pyload/datatype/PyFile.py b/pyload/datatype/PyFile.py
index e8916a921..f4f1cb0de 100644
--- a/pyload/datatype/PyFile.py
+++ b/pyload/datatype/PyFile.py
@@ -238,21 +238,21 @@ class PyFile(object):
""" calculates speed """
try:
return self.plugin.req.speed
- except:
+ except Exception:
return 0
def getETA(self):
""" gets established time of arrival"""
try:
return self.getBytesLeft() / self.getSpeed()
- except:
+ except Exception:
return 0
def getBytesLeft(self):
""" gets bytes left """
try:
return self.getSize() - self.plugin.req.arrived
- except:
+ except Exception:
return 0
def getPercent(self):
@@ -260,7 +260,7 @@ class PyFile(object):
if self.status == 12:
try:
return self.plugin.req.percent
- except:
+ except Exception:
return 0
else:
return self.progress
@@ -272,7 +272,7 @@ class PyFile(object):
return self.plugin.req.size
else:
return self.size
- except:
+ except Exception:
return self.size
def notifyChange(self):
diff --git a/pyload/datatype/PyPackage.py b/pyload/datatype/PyPackage.py
index c8d3e6096..8439a769b 100644
--- a/pyload/datatype/PyPackage.py
+++ b/pyload/datatype/PyPackage.py
@@ -19,7 +19,7 @@
from pyload.manager.event.PullEvents import UpdateEvent
from pyload.utils import safe_filename
-class PyPackage:
+class PyPackage(object):
"""
Represents a package object at runtime
"""
--
cgit v1.2.3