deskbar-applet r2539 - in trunk: . deskbar/handlers

[sebp svn gnome org]

Author: sebp
Date: Fri Jan 30 09:53:08 2009
New Revision: 2539
URL: http://svn.gnome.org/viewvc/deskbar-applet?rev=2539&view=rev

Log:
Fixed bug #569260: Catch EOFError
(based on patch by Tom Parker)

Modified:
   trunk/ChangeLog
   trunk/deskbar/handlers/desklicious.py
   trunk/deskbar/handlers/googlecodesearch.py
   trunk/deskbar/handlers/googlesearch.py
   trunk/deskbar/handlers/wikipedia-suggest.py
   trunk/deskbar/handlers/yahoo.py

Modified: trunk/deskbar/handlers/desklicious.py
==============================================================================
--- trunk/deskbar/handlers/desklicious.py	(original)
+++ trunk/deskbar/handlers/desklicious.py	Fri Jan 30 09:53:08 2009
@@ -139,7 +139,7 @@
         stream = None
         try:
             stream = urllib.urlopen(url, proxies=deskbar.core.Utils.get_proxy())
-        except IOError, msg:
+        except (IOError, EOFError), msg:
             LOGGER.error("Could not open URL %s: %s, %s", url, msg[0], msg[1])
             return []
                 

Modified: trunk/deskbar/handlers/googlecodesearch.py
==============================================================================
--- trunk/deskbar/handlers/googlecodesearch.py	(original)
+++ trunk/deskbar/handlers/googlecodesearch.py	Fri Jan 30 09:53:08 2009
@@ -62,7 +62,7 @@
         
         try:
             stream = urllib.urlopen(url, proxies=get_proxy())
-        except IOError, msg:
+        except (IOError, EOFError), msg:
             LOGGER.error("Could not open URL %s: %s, %s", url, msg[0], msg[1])
             return
         

Modified: trunk/deskbar/handlers/googlesearch.py
==============================================================================
--- trunk/deskbar/handlers/googlesearch.py	(original)
+++ trunk/deskbar/handlers/googlesearch.py	Fri Jan 30 09:53:08 2009
@@ -150,7 +150,7 @@
         
         try:
             stream = urllib.urlopen(url, proxies=get_proxy())
-        except IOError, msg:
+        except (IOError, EOFError), msg:
             LOGGER.error("Could not open URL %s: %s, %s", url, msg[0], msg[1])
             return
             

Modified: trunk/deskbar/handlers/wikipedia-suggest.py
==============================================================================
--- trunk/deskbar/handlers/wikipedia-suggest.py	(original)
+++ trunk/deskbar/handlers/wikipedia-suggest.py	Fri Jan 30 09:53:08 2009
@@ -109,7 +109,7 @@
         
         try:
             result = urllib.urlopen(url, proxies=get_proxy())
-        except IOError, msg:
+        except (IOError, EOFError), msg:
             # Print error for debugging purposes and end querying
             LOGGER.error("Could not open URL %s: %s, %s" % (url, msg[0], msg[1]))
             return

Modified: trunk/deskbar/handlers/yahoo.py
==============================================================================
--- trunk/deskbar/handlers/yahoo.py	(original)
+++ trunk/deskbar/handlers/yahoo.py	Fri Jan 30 09:53:08 2009
@@ -179,7 +179,7 @@
         
         try:
             stream = urllib.urlopen(url, proxies=get_proxy())
-        except IOError, msg:
+        except (IOError, EOFError), msg:
             LOGGER.error("Could not open URL %s: %s, %s", url, msg[0], msg[1])
             return
     
@@ -344,7 +344,7 @@
         
         try:
             stream = urllib.urlopen(url, proxies=get_proxy())
-        except IOError, msg:
+        except (IOError, EOFError), msg:
             LOGGER.error("Could not open URL %s: %s, %s", url, msg[0], msg[1])
             return