Change Server initialization to accept a Server instance instead of the various

atomatt · atomatt · commit 0742a78d2118 · 2010-03-31T13:51:32.000+01:00
args that are then used to create a Server.
diff --git a/couchdb/client.py b/couchdb/client.py
@@ -66,21 +66,15 @@ class Server(object):
     >>> del server['python-tests']
     """
 
-    def __init__(self, url=DEFAULT_BASE_URL, cache=None, timeout=None,
-                 full_commit=True):
+    def __init__(self, url=DEFAULT_BASE_URL, full_commit=True, session=None):
         """Initialize the server object.
 
         :param uri: the URI of the server (for example
                     ``http://localhost:5984/``)
-        :param cache: either a cache directory path (as a string) or an object
-                      compatible with the ``httplib2.FileCache`` interface. If
-                      `None` (the default), no caching is performed.
-        :param timeout: socket timeout in number of seconds, or `None` for no
-                        timeout
+        :param session: an http.Session instance or None for a default session
         """
         if isinstance(url, basestring):
-            session = http.Session(cache=cache, timeout=timeout)
-            self.resource = http.Resource(url, session)
+            self.resource = http.Resource(url, session or http.Session())
         else:
             self.resource = url # treat as a Resource object
         if not full_commit:
diff --git a/couchdb/http.py b/couchdb/http.py
@@ -119,6 +119,13 @@ def __iter__(self):
 class Session(object):
 
     def __init__(self, cache=None, timeout=None, max_redirects=5):
+        """Initialize an HTTP client session.
+
+        :param cache: an instance with a dict-like interface or None to allow
+                      Session to create a dict for caching.
+        :param timeout: socket timeout in number of seconds, or `None` for no
+                        timeout
+        """
         from couchdb import __version__ as VERSION
         self.user_agent = 'CouchDB-Python/%s' % VERSION
         if cache is None:
diff --git a/couchdb/tests/client.py b/couchdb/tests/client.py
@@ -42,6 +42,12 @@ def test_init_with_resource(self):
         serv = client.Server(url=res)
         serv.config()
 
+    def test_init_with_session(self):
+        sess = http.Session()
+        serv = client.Server(client.DEFAULT_BASE_URL, session=sess)
+        serv.config()
+        self.assertTrue(serv.resource.session is sess)
+
     def test_exists(self):
         self.assertTrue(client.Server(client.DEFAULT_BASE_URL))
         self.assertFalse(client.Server('http://localhost:9999'))
