| Index: rietveld.py
 | 
| diff --git a/rietveld.py b/rietveld.py
 | 
| index 5528c551a6af1278fb83b9c3413547da2cfa6709..39cb19a9d7876c692bfdb41be9a798fc270d7510 100644
 | 
| --- a/rietveld.py
 | 
| +++ b/rietveld.py
 | 
| @@ -367,6 +367,9 @@ class Rietveld(object):
 | 
|  
 | 
|    def _send(self, request_path, **kwargs):
 | 
|      """Sends a POST/GET to Rietveld.  Returns the response body."""
 | 
| +    # rpc_server.Send() assumes timeout=None by default; make sure it's set
 | 
| +    # to something reasonable.
 | 
| +    kwargs.setdefault('timeout', 15)
 | 
|      logging.debug('POSTing to %s, args %s.', request_path, kwargs)
 | 
|      try:
 | 
|        # Sadly, upload.py calls ErrorExit() which does a sys.exit(1) on HTTP
 | 
| 
 |