Revert http://codereview.chromium.org/6345001/ because it apparently...

third_party/upload.py

 #!/usr/bin/env python
 #
 # Copyright 2007 Google Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
@@ skipping 384 matching lines @@
         req = self._CreateRequest(url=url, data=payload)
         req.add_header("Content-Type", content_type)
         if extra_headers:
           for header, value in extra_headers.items():
             req.add_header(header, value)
         try:
           f = self.opener.open(req)
           response = f.read()
           f.close()
           return response
-        except urllib2.URLError, e:
-          reason = e.reason
-          if isinstance(reason, str) and reason.find("110") != -1:
-            # Connection timeout error.
-            if tries <= 3:
-              # Try again.
-              continue
-          raise
         except urllib2.HTTPError, e:
           if tries > 3:
             raise
           elif e.code == 401 or e.code == 302:
             url_loc = urlparse.urlparse(url)
             self._Authenticate('%s://%s' % (url_loc[0], url_loc[1]))
 ##           elif e.code >= 500 and e.code < 600:
 ##             # Server Error - try again.
 ##             continue
           elif e.code == 301:
@@ skipping 1362 matching lines @@
   try:
     RealMain(sys.argv)
   except KeyboardInterrupt:
     print
     StatusUpdate("Interrupted.")
     sys.exit(1)
 
 
 if __name__ == "__main__":
   main()