[Pywikipedia-l] SVN: [6586] trunk/pywikipedia/wikipedia.py

[nicdumz at svn.wikimedia.org]

Revision: 6586
Author:   nicdumz
Date:     2009-04-11 06:10:43 +0000 (Sat, 11 Apr 2009)

Log Message:
-----------
getUrl: read() on a socket object can raise socket.error
It has to be included in the try...except block

Modified Paths:
--------------
    trunk/pywikipedia/wikipedia.py

Modified: trunk/pywikipedia/wikipedia.py
===================================================================
--- trunk/pywikipedia/wikipedia.py	2009-04-10 07:27:15 UTC (rev 6585)
+++ trunk/pywikipedia/wikipedia.py	2009-04-11 06:10:43 UTC (rev 6586)
@@ -4718,6 +4718,11 @@
                       f = opener.open(request)
                     else:
                         f = uo.open(url, data)
+
+                    # read & info can raise socket.error
+                    text = f.read()
+                    headers = f.info()
+
                     retrieved = True
                 except KeyboardInterrupt:
                     raise
@@ -4737,10 +4742,7 @@
                             retry_idle_time = 30
                     else:
                         raise
-            text = f.read()
 
-            headers = f.info()
-
         if cookie_only:
             return headers.get('set-cookie', '')
         contentType = headers.get('content-type', '')