# timeout is available since Python 2.6
Index: python-couchdb-0.6/couchdb/client.py
===================================================================
--- python-couchdb-0.6.orig/couchdb/client.py
+++ python-couchdb-0.6/couchdb/client.py
@@ -31,6 +31,7 @@ from inspect import getsource
 from textwrap import dedent
 import re
 import socket
+import sys
 
 from couchdb import json
 
@@ -105,7 +106,10 @@ class Server(object):
         :param timeout: socket timeout in number of seconds, or `None` for no
                         timeout
         """
-        http = httplib2.Http(cache=cache, timeout=timeout)
+        if sys.version_info < (2, 6):
+            http = httplib2.Http(cache=cache)
+        else:
+            http = httplib2.Http(cache=cache, timeout=timeout)
         http.force_exception_to_status_code = False
         self.resource = Resource(http, uri)