improve exception handling #619

E2OpenPlugins · Aug 5, 2017 · 8ba393c · 8ba393c
1 parent 651b189
commit 8ba393c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/plugin/controllers/AT.py b/plugin/controllers/AT.py
@@ -20,7 +20,7 @@ def __init__(self, session, path = ""):
 			AutoTimerRemoveAutoTimerResource, AutoTimerSettingsResource, \
 			AutoTimerSimulateResource
 		except ImportError:
-			print "AT plugin not found"
+			#print "AT plugin not found"
 			return
 		self.putChild('parse', AutoTimerDoParseResource())
 		self.putChild('remove', AutoTimerRemoveAutoTimerResource())
@@ -32,6 +32,7 @@ def __init__(self, session, path = ""):
 			from Plugins.Extensions.AutoTimer.AutoTimerResource import AutoTimerTestResource
 			self.putChild('test', AutoTimerTestResource())
 		except ImportError:
+			# this is not an error
 			pass
 
 	def render(self, request):
@@ -45,7 +46,6 @@ def render(self, request):
 					autotimer.readXml()
 					return ''.join(autotimer.getXml())
 			except Exception:
-				pass
-			return '<?xml version="1.0" encoding="UTF-8" ?><e2simplexmlresult><e2state>false</e2state><e2statetext>AutoTimer Config not found</e2statetext></e2simplexmlresult>'
+				return '<?xml version="1.0" encoding="UTF-8" ?><e2simplexmlresult><e2state>false</e2state><e2statetext>AutoTimer Config not found</e2statetext></e2simplexmlresult>'
 		except ImportError:
 			return '<?xml version="1.0" encoding="UTF-8" ?><e2simplexmlresult><e2state>false</e2state><e2statetext>AutoTimer Plugin not found</e2statetext></e2simplexmlresult>'
diff --git a/plugin/controllers/ajax.py b/plugin/controllers/ajax.py
@@ -249,21 +249,21 @@ def P_multiepg(self, request):
 			try:
 				week = int(request.args["week"][0])
 				wadd = week * 7
-			except Exception, e:
+			except ValueError:
 				pass
 		if "day" in request.args.keys():
 			try:
 				day = int(request.args["day"][0])
 				if day > 0 or wadd > 0:
 					now = localtime()
 					begintime = mktime( (now.tm_year, now.tm_mon, now.tm_mday+day + wadd, 0, 0, 0, -1, -1, -1) )
-			except Exception, e:
+			except ValueError:
 				pass
 		mode = 1
 		if config.OpenWebif.webcache.mepgmode.value:
 			try:
 				mode = int(config.OpenWebif.webcache.mepgmode.value)
-			except Exception, e:
+			except ValueError:
 				pass
 		epg = getMultiEpg(self, bref, begintime, endtime, mode)
 		epg['bouquets'] = bouq['bouquets']