From 95f85ed13c834c82648a9bf787ce9cbd0898e09b Mon Sep 17 00:00:00 2001
From: Nic Wolfe <nic@wolfeden.ca>
Date: Tue, 3 Apr 2012 23:50:13 -0600
Subject: [PATCH] Catch more exceptions when trying to load URLs from flaky
servers (*cough*NZBMatrix*cough*)
---
sickbeard/helpers.py | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/sickbeard/helpers.py b/sickbeard/helpers.py
index 26b5a0aec..518051d75 100644
--- a/sickbeard/helpers.py
+++ b/sickbeard/helpers.py
@@ -23,6 +23,7 @@ import stat
import urllib, urllib2
import re, socket
import shutil
+import traceback
from xml.dom.minidom import Node
@@ -148,6 +149,12 @@ def getURL (url, headers=[]):
except socket.timeout:
logger.log(u"Timed out while loading URL "+url, logger.WARNING)
return None
+ except ValueError:
+ logger.log(u"Unknown error while loading URL "+url, logger.WARNING)
+ return None
+ except Exception:
+ logger.log(u"Unknown exception while loading URL "+url+": "+traceback.format_exc(), logger.WARNING)
+ return None
return result
--
GitLab