Handle unicode connection URIs in Python 2.4

Unicode MongoDB connection URIs, if they have options like "/?fsync=true", raised a TypeError in old Pythons.

Author: A. Jesse Jiryu Davis

pymongo/uri_parser.py

@@ -150,7 +150,10 @@ def validate_options(opts):
  normalized = {}
  for option, value in opts.iteritems():
  option, value = validate(option, value)
- normalized[option] = value
+ # str(option) to ensure that a unicode URI results in plain 'str'
+ # option names. 'normalized' is then suitable to be passed as kwargs
+ # in all Python versions.
+ normalized[str(option)] = value
  return normalized
 
 

test/test_uri_parser.py

@@ -335,6 +335,14 @@ def test_parse_uri(self):
  parse_uri("mongodb://user%40domain.com"
  "@localhost/foo?authMechanism=GSSAPI"))
 
+ def test_parse_uri_unicode(self):
+ # Ensure parsing a unicode returns option names that can be passed
+ # as kwargs. In Python 2.4, keyword argument names must be ASCII.
+ # In all Pythons, str is the type of valid keyword arg names.
+ res = parse_uri(unicode("mongodb://localhost/?fsync=true"))
+ for key in res['options']:
+ self.assertTrue(isinstance(key, str))
+
 
 if __name__ == "__main__":
  unittest.main()