make subtype a property instead of a regular method

Mike Dirolf · Mike Dirolf · commit 3262cfc21556 · 2009-03-12T11:52:52.000-04:00
diff --git a/examples/custom_type.py b/examples/custom_type.py
@@ -140,7 +140,7 @@ def transform_incoming(self, son, collection):
 
     def transform_outgoing(self, son, collection):
         for (key, value) in son.items():
-            if isinstance(value, Binary) and value.subtype() == 128:
+            if isinstance(value, Binary) and value.subtype == 128:
                 son[key] = from_binary(value)
             elif isinstance(value, dict):
                 son[key] = self.transform_outgoing(value, collection)
diff --git a/pymongo/_cbsonmodule.c b/pymongo/_cbsonmodule.c
@@ -250,7 +250,7 @@ static int write_element_to_buffer(bson_buffer* buffer, int type_byte, PyObject*
         return 1;
     } else if (PyObject_IsInstance(value, Binary)) {
         *(buffer->buffer + type_byte) = 0x05;
-        PyObject* subtype_object = PyObject_CallMethod(value, "subtype", NULL);
+        PyObject* subtype_object = PyObject_GetAttrString(value, "subtype");
         if (!subtype_object) {
             return 0;
         }
diff --git a/pymongo/binary.py b/pymongo/binary.py
@@ -49,6 +49,7 @@ def __new__(cls, data, subtype=2):
         self.__subtype = subtype
         return self
 
+    @property
     def subtype(self):
         """Get the subtype of this binary data.
         """
diff --git a/pymongo/bson.py b/pymongo/bson.py
@@ -296,7 +296,7 @@ def _element_to_bson(key, value):
     if isinstance(value, float):
         return "\x01" + name + struct.pack("<d", value)
     if isinstance(value, Binary):
-        subtype = value.subtype()
+        subtype = value.subtype
         if subtype == 2:
             value = struct.pack("<i", len(value)) + value
         return "\x05" + name + struct.pack("<i", len(value)) + chr(subtype) + value
diff --git a/test/test_binary.py b/test/test_binary.py
@@ -46,9 +46,9 @@ def test_exceptions(self):
 
     def test_subtype(self):
         b = Binary("hello")
-        self.assertEqual(b.subtype(), 2)
+        self.assertEqual(b.subtype, 2)
         c = Binary("hello", 100)
-        self.assertEqual(c.subtype(), 100)
+        self.assertEqual(c.subtype, 100)
 
     def test_equality(self):
         b = Binary("hello")

Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,7 @@ static int write_element_to_buffer(bson_buffer* buffer, int type_byte, PyObject*`
`250`	`250`	`return 1;`
`251`	`251`	`} else if (PyObject_IsInstance(value, Binary)) {`
`252`	`252`	`*(buffer->buffer + type_byte) = 0x05;`
`253`		`- PyObject* subtype_object = PyObject_CallMethod(value, "subtype", NULL);`
	`253`	`+ PyObject* subtype_object = PyObject_GetAttrString(value, "subtype");`
`254`	`254`	`if (!subtype_object) {`
`255`	`255`	`return 0;`
`256`	`256`	`}`