Support w=<basestring> for tagging PYTHON-268.

See http://www.mongodb.org/display/DOCS/Data+Center+Awareness
for a full explanation.

Author: behackett

pymongo/common.py

@@ -38,7 +38,7 @@ def validate_boolean(option, value):
 
 
 def validate_integer(option, value):
-    """Validates that 'value' is an integer.
+    """Validates that 'value' is an integer (or basestring representation).
     """
     if isinstance(value, (int, long)):
         return value
@@ -60,13 +60,26 @@ def validate_basestring(option, value):
                     "instance of basestring" % (option,))
 
 
+def validate_int_or_basestring(option, value):
+    """Validates that 'value' is an integer or string.
+    """
+    if isinstance(value, (int, long)):
+        return value
+    elif isinstance(value, basestring):
+        if value.isdigit():
+            return int(value)
+        return value
+    raise TypeError("Wrong type for %s, value just be an "
+                    "integer or a string" % (option,))
+
+
 # jounal is an alias for j,
 # wtimeoutms is an alias for wtimeout
 VALIDATORS = { 
     'replicaset': validate_basestring,
     'slaveok': validate_boolean,
     'safe': validate_boolean,
-    'w': validate_integer,
+    'w': validate_int_or_basestring,
     'wtimeout': validate_integer,
     'wtimeoutms': validate_integer,
     'fsync': validate_boolean,

pymongo/connection.py

@@ -221,8 +221,9 @@ def __init__(self, host=None, port=None, max_pool_size=10,
           - `j` or `journal`: Block until write operations have been commited
             to the journal. Ignored if the server is running without journaling.
             Implies safe=True.
-          - `w`: If this is a replica set the server won't return until
-            write operations have replicated to this many set members.
+          - `w`: (integer or string) If this is a replica set write operations
+            won't return until they have been replicated to the specified
+            number or tagged set of servers.
             Implies safe=True.
           - `wtimeout`: Used in conjunction with `j` and/or `w`. Wait this many
             milliseconds for journal acknowledgement and/or write replication.
@@ -237,6 +238,8 @@ def __init__(self, host=None, port=None, max_pool_size=10,
             attempt to find all members of the set.
 
         .. seealso:: :meth:`end_request`
+        .. versionchanged:: 2.0.1+
+           Support `w` = integer or string.
         .. versionchanged:: 2.0
            `slave_okay` is a pure keyword argument. Added support for safe,
            and getlasterror options as keyword arguments.

test/test_common.py

@@ -41,10 +41,11 @@ def test_baseobject(self):
         cursor = coll.find(slave_okay=True)
         self.assertTrue(cursor._Cursor__slave_okay)
 
-        c = Connection(slaveok=True, w=1, wtimeout=300, fsync=True, j=True)
+        c = Connection(slaveok=True, w='majority',
+                                     wtimeout=300, fsync=True, j=True)
         self.assertTrue(c.slave_okay)
         self.assertTrue(c.safe)
-        d = {'w': 1, 'wtimeout': 300, 'fsync': True, 'j': True}
+        d = {'w': 'majority', 'wtimeout': 300, 'fsync': True, 'j': True}
         self.assertEqual(d, c.get_lasterror_options())
         db = c.test
         self.assertTrue(db.slave_okay)
@@ -112,9 +113,9 @@ def test_baseobject(self):
         self.assertEqual({}, c.get_lasterror_options())
         self.assertFalse(c.safe)
 
-        db.set_lasterror_options(w=1)
+        db.set_lasterror_options(w='majority')
         self.assertEqual({'j': True}, coll.get_lasterror_options())
-        self.assertEqual({'w': 1}, db.get_lasterror_options())
+        self.assertEqual({'w': 'majority'}, db.get_lasterror_options())
         self.assertEqual({}, c.get_lasterror_options())
         self.assertFalse(c.safe)
         db.slave_okay = True

test/test_uri_parser.py

@@ -81,9 +81,10 @@ def test_split_options(self):
         self.assertRaises(ConfigurationError, split_options, 'foo')
         self.assertRaises(ConfigurationError, split_options, 'foo=bar')
         self.assertRaises(ConfigurationError, split_options, 'foo=bar;foo')
-        self.assertRaises(ConfigurationError, split_options, 'w=foo')
-        self.assertRaises(ConfigurationError, split_options, 'w=5.5')
-        self.assert_(split_options, 'w=5')
+        self.assertTrue(isinstance(split_options('w=5')['w'], int))
+        self.assertTrue(isinstance(split_options('w=5.5')['w'], basestring))
+        self.assert_(split_options, 'w=foo')
+        self.assert_(split_options, 'w=majority')
         self.assertRaises(ConfigurationError, split_options, 'wtimeoutms=foo')
         self.assertRaises(ConfigurationError, split_options, 'wtimeoutms=5.5')
         self.assert_(split_options, 'wtimeoutms=500')