Andrew McFague avatar Andrew McFague committed 2981916 Draft

Will retry commands when a BadStatusLine is encountered; also set a socket
timeout.

Comments (0)

Files changed (1)

pep381client/__init__.py

 from xml.etree import ElementTree
 import xml.parsers.expat
 import sqlite
+import socket
+
+
+# Set global socket timeout
+socket.setdefaulttimeout(30)
 
 # library config
 pypi = 'pypi.python.org'
 BASE = 'http://'+pypi
 SIMPLE = BASE + '/simple/'
-version = '1.5'
+version = '1.5.1'
 UA = 'pep381client/'+version
 
 # Helpers
 def now():
     return int(time.time())
 
+
 # Main class
 
 class Synchronization:
         if etag:
             h.putheader("If-none-match", etag)
         h.endheaders()
-        r = h.getresponse()
+
+        # If this returns a BadStatusLine, continue to retry, or skip it.
+        for i in range(4):
+            try:
+                r = h.getresponse()
+                break
+            except httplib.BadStatusLine:
+                print "BadStatusLine received; retrying", project
+        else:
+            print project, "could not be retrieved; skipping."
+            return
+
         if r.status == 304:
             # not modified, discard data
             r.read()
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.