Added uuid to json de/serialization

Author: Ken Kurzweil

pymongo/json_util.py

@@ -51,6 +51,7 @@
 import calendar
 import datetime
 import re
+import uuid
 
 from pymongo.dbref import DBRef
 from pymongo.max_key import MaxKey
@@ -89,6 +90,8 @@ def object_hook(dct):
  return MinKey()
  if "$maxKey" in dct:
  return MaxKey()
+ if "$uuid" in dct:
+ return uuid.UUID(dct["$uuid"])
  return dct
 
 
@@ -118,4 +121,6 @@ def default(obj):
  return {"$maxKey": 1}
  if isinstance(obj, Timestamp):
  return {"t": obj.time, "i": obj.inc}
+ if isinstance(obj, uuid.UUID):
+ return {"$uuid": obj.hex}
  raise TypeError("%r is not JSON serializable" % obj)

test/test_json_util.py

@@ -18,6 +18,7 @@
 import datetime
 import re
 import sys
+import uuid
 json_lib = True
 try:
  import json
@@ -88,5 +89,8 @@ def test_timestamp(self):
  self.assertEqual(dct['ts']['t'], 4)
  self.assertEqual(dct['ts']['i'], 13)
 
+ def test_uuid(self):
+ self.round_trip({'uuid' : uuid.UUID('f47ac10b-58cc-4372-a567-0e02b2c3d479')})
+
 if __name__ == "__main__":
  unittest.main()