Changes Connection.paired to accept kwargs that are passed on to the connection constructor. Changes the deprecation warnings to Connection.paired to match those for the Connection constructor. Adds tests for those changes.

Author: mcfunley

pymongo/connection.py

@@ -276,8 +276,7 @@ def __pair_with(self, host, port):
         self.__find_master()
 
     @classmethod
-    def paired(cls, left, right=None,
-               pool_size=None, auto_start_request=None):
+    def paired(cls, left, right=None, **connection_args):
         """Open a new paired connection to Mongo.
 
         Raises :class:`TypeError` if either `left` or `right` is not a tuple of
@@ -288,20 +287,21 @@ def paired(cls, left, right=None,
           - `left`: ``(host, port)`` pair for the left MongoDB instance
           - `right` (optional): ``(host, port)`` pair for the right MongoDB
             instance
-          - `pool_size` (optional): DEPRECATED
-          - `auto_start_request` (optional): DEPRECATED
+
+        The remaining keyword arguments are the same as those accepted by 
+        the Connection class constructor. 
         """
         if right is None:
             right = (cls.HOST, cls.PORT)
-        if pool_size is not None:
-            warnings.warn("The pool_size parameter to Connection.paired is "
-                          "deprecated", DeprecationWarning)
-        if auto_start_request is not None:
-            warnings.warn("The auto_start_request parameter to "
-                          "Connection.paired is deprecated",
-                          DeprecationWarning)
 
-        connection = cls(left[0], left[1], _connect=False)
+        for param in ('pool_size', 'auto_start_request', 'timeout'):
+            if param in connection_args:
+                warnings.warn("The %s parameter to Connection.paired is "
+                              "deprecated" % param, DeprecationWarning)
+
+        connection_args['_connect'] = False
+
+        connection = cls(left[0], left[1], **connection_args)
         connection.__pair_with(*right)
         return connection
 

test/test_paired.py

@@ -25,6 +25,7 @@
 import logging
 import os
 import sys
+import warnings
 sys.path[0:0] = [""]
 
 from pymongo.errors import ConnectionFailure, ConfigurationError
@@ -120,6 +121,27 @@ def test_end_request(self):
             self.assert_(db.test.find_one())
             connection.end_request()
 
+
+    def test_deprecation_warnings_paired_connections(self):
+        warnings.simplefilter("error")
+        try:
+            self.assertRaises(DeprecationWarning, Connection.paired, 
+                              self.left, self.right, timeout=3)
+            self.assertRaises(DeprecationWarning, Connection.paired, 
+                              self.left, self.right, auto_start_request=True)
+            self.assertRaises(DeprecationWarning, Connection.paired, 
+                              self.left, self.right, pool_size=20)
+        finally:
+            warnings.resetwarnings()
+            warnings.simplefilter('ignore')
+
+
+    def test_paired_connections_pass_individual_connargs(self):
+        c = Connection.paired(self.left, self.right, slave_okay=True)
+        self.assertTrue(c.__slave_okay)
+
+
+
 if __name__ == "__main__":
     skip_tests = False
     unittest.main()