Ensure parse_uri accepts readPreference option

craigahobbs · behackett · commit e2ec7bd09c29 · 2013-01-23T11:03:38.000-08:00
diff --git a/pymongo/common.py b/pymongo/common.py
@@ -170,6 +170,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,
@@ -266,7 +267,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)
diff --git a/test/test_uri_parser.py b/test/test_uri_parser.py
@@ -270,9 +270,9 @@ def test_parse_uri(self):
                                    "test.yield_historical.in?slaveok=true"))
 
         res = copy.deepcopy(orig)
-        res['options'] = {'read_preference': ReadPreference.SECONDARY}
+        res['options'] = {'readpreference': ReadPreference.SECONDARY}
         self.assertEqual(res,
-                         parse_uri("mongodb://localhost/?read_preference=secondary"))
+                         parse_uri("mongodb://localhost/?readPreference=secondary"))
 
 if __name__ == "__main__":
     unittest.main()
