Fix uri_parser read_preference validation

pymongo/common.py

@@ -114,9 +114,14 @@ def validate_timeout_or_none(option, value):
 def validate_read_preference(dummy, value):
     """Validate read preference for a ReplicaSetConnection.
     """
-    if value not in read_preferences.modes:
+    if value in read_preferences.modes:
+        return value
+
+    # Also allow string form of enum for uri_parser
+    try:
+        return read_preferences.mongos_enum(value)
+    except ValueError:
         raise ConfigurationError("Not a valid read preference")
-    return value
 
 
 def validate_tag_sets(dummy, value):
@@ -157,6 +162,7 @@ def validate_tag_sets(dummy, value):
     'connecttimeoutms': validate_timeout_or_none,
     'sockettimeoutms': validate_timeout_or_none,
     'ssl': validate_boolean,
+    'readpreference': validate_read_preference,
     'read_preference': validate_read_preference,
     'tag_sets': validate_tag_sets,
     'secondaryacceptablelatencyms': validate_positive_float,
@@ -253,7 +259,7 @@ def __set_options(self, options):
         for option, value in options.iteritems():
             if option in ('slave_okay', 'slaveok'):
                 self.__slave_okay = validate_boolean(option, value)
-            elif option == 'read_preference':
+            elif option in ('read_preference', "readpreference"):
                 self.__read_pref = validate_read_preference(option, value)
             elif option == 'tag_sets':
                 self.__tag_sets = validate_tag_sets(option, value)

pymongo/read_preferences.py

@@ -83,6 +83,9 @@ class ReadPreference:
 def mongos_mode(mode):
     return _mongos_modes[mode]
 
+def mongos_enum(enum):
+    return _mongos_modes.index(enum)
+
 
 def select_primary(members):
     for member in members:

test/test_uri_parser.py

@@ -25,6 +25,7 @@
                                 split_options,
                                 parse_uri)
 from pymongo.errors import ConfigurationError, InvalidURI
+from pymongo import ReadPreference
 
 
 class TestURI(unittest.TestCase):
@@ -268,5 +269,10 @@ def test_parse_uri(self):
                          parse_uri("mongodb://fred:foobar@localhost/"
                                    "test.yield_historical.in?slaveok=true"))
 
+        res = copy.deepcopy(orig)
+        res['options'] = {'readpreference': ReadPreference.SECONDARY}
+        self.assertEqual(res,
+                         parse_uri("mongodb://localhost/?readPreference=secondary"))
+
 if __name__ == "__main__":
     unittest.main()