* ObjectId: changed str and repr to hex

* ObjectId: can now take a hex string in the constructor Signed-off-by: Mike Dirolf <mike@10gen.com>

Author: serbaut

pymongo/_cbsonmodule.c

@@ -374,7 +374,7 @@ static int write_element_to_buffer(bson_buffer* buffer, int type_byte, PyObject*
  *(buffer->buffer + type_byte) = 0x09;
  return buffer_write_bytes(buffer, (const char*)&time_since_epoch, 8);
  } else if (PyObject_IsInstance(value, ObjectId)) {
- PyObject* pystring = PyObject_Str(value);
+ PyObject* pystring = PyObject_GetAttrString(value, "_ObjectId__id");
  if (!pystring) {
  return 0;
  }

pymongo/bson.py

@@ -397,7 +397,7 @@ def _element_to_bson(key, value, check_keys):
  as_dict = SON(zip([str(i) for i in range(len(value))], value))
  return "\x04" + name + _dict_to_bson(as_dict, check_keys)
  if isinstance(value, ObjectId):
- return "\x07" + name + str(value)
+ return "\x07" + name + value.binary
  if value is True:
  return "\x08" + name + "\x01"
  if value is False:

pymongo/objectid.py

@@ -47,7 +47,8 @@ def __init__(self, id=None):
  raised.
 
  :Parameters:
- - `id` (optional): a valid ObjectId
+ - `id` (optional): a valid ObjectId (12 byte binary or 24 character
+ hex string)
  """
  if id is None:
  self.__generate()
@@ -92,6 +93,8 @@ def __validate(self, oid):
  elif isinstance(oid, types.StringType):
  if len(oid) == 12:
  self.__id = oid
+ elif len(oid) == 24:
+ self.__id = oid.decode("hex")
  else:
  raise InvalidId("%s is not a valid ObjectId" % oid)
  else:
@@ -145,13 +148,19 @@ def from_legacy_str(cls, legacy_str):
  return cls(legacy_str[7::-1] + legacy_str[:7:-1])
  from_legacy_str = classmethod(from_legacy_str)
 
- def __str__(self):
+ @property
+ def binary(self):
  return self.__id
 
+ def __str__(self):
+ return self.__id.encode("hex")
+
  def __repr__(self):
- return "ObjectId(%r)" % self.__id
+ return "ObjectId('%s')" % self.__id.encode("hex")
 
  def __cmp__(self, other):
  if isinstance(other, ObjectId):
  return cmp(self.__id, other.__id)
  return NotImplemented
+
+

test/test_dbref.py

@@ -55,19 +55,19 @@ def bar():
  self.assertRaises(AttributeError, bar)
 
  def test_repr(self):
- self.assertEqual(repr(DBRef("coll", ObjectId("123456789012"))),
- "DBRef(u'coll', ObjectId('123456789012'))")
- self.assertEqual(repr(DBRef(u"coll", ObjectId("123456789012"))),
- "DBRef(u'coll', ObjectId('123456789012'))")
+ self.assertEqual(repr(DBRef("coll", ObjectId("1234567890abcdef12345678"))),
+ "DBRef(u'coll', ObjectId('1234567890abcdef12345678'))")
+ self.assertEqual(repr(DBRef(u"coll", ObjectId("1234567890abcdef12345678"))),
+ "DBRef(u'coll', ObjectId('1234567890abcdef12345678'))")
 
  def test_cmp(self):
- self.assertEqual(DBRef("coll", ObjectId("123456789012")),
- DBRef(u"coll", ObjectId("123456789012")))
- self.assertNotEqual(DBRef("coll", ObjectId("123456789012")),
- DBRef("col", ObjectId("123456789012")))
- self.assertNotEqual(DBRef("coll", ObjectId("123456789012")),
+ self.assertEqual(DBRef("coll", ObjectId("1234567890abcdef12345678")),
+ DBRef(u"coll", ObjectId("1234567890abcdef12345678")))
+ self.assertNotEqual(DBRef("coll", ObjectId("1234567890abcdef12345678")),
+ DBRef("col", ObjectId("1234567890abcdef12345678")))
+ self.assertNotEqual(DBRef("coll", ObjectId("1234567890abcdef12345678")),
  DBRef("coll", ObjectId("123456789011")))
- self.assertNotEqual(DBRef("coll", ObjectId("123456789012")), 4)
+ self.assertNotEqual(DBRef("coll", ObjectId("1234567890abcdef12345678")), 4)
 
 if __name__ == "__main__":
  unittest.main()

test/test_objectid.py

@@ -42,9 +42,12 @@ def test_creation(self):
  self.assert_(ObjectId(a))
 
  def test_repr_str(self):
- self.assertEqual(repr(ObjectId("123456789012")),
- "ObjectId('123456789012')")
- self.assertEqual(str(ObjectId("123456789012")), "123456789012")
+ self.assertEqual(repr(ObjectId("1234567890abcdef12345678")),
+ "ObjectId('1234567890abcdef12345678')")
+ self.assertEqual(str(ObjectId("1234567890abcdef12345678")), "1234567890abcdef12345678")
+ self.assertEqual(str(ObjectId("123456789012")), "313233343536373839303132")
+ self.assertEqual(ObjectId("1234567890abcdef12345678").binary, '\x124Vx\x90\xab\xcd\xef\x124Vx')
+ self.assertEqual(str(ObjectId('\x124Vx\x90\xab\xcd\xef\x124Vx')), "1234567890abcdef12345678")
 
  def test_cmp(self):
  a = ObjectId()