From c0b1ab9024ba67addfb83648ea5c14780a7330b5 Mon Sep 17 00:00:00 2001
From: Huang Huang <huanghuang@douban.com>
Date: Fri, 1 Nov 2013 14:32:49 +0800
Subject: [PATCH] add len(diff) instead of diff.size

---
 src/diff.c        | 11 +++++------
 test/test_diff.py |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/diff.c b/src/diff.c
index 0728d7d..2f946e7 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -249,11 +249,11 @@ PyTypeObject DiffIterType = {
     (iternextfunc) DiffIter_iternext,          /* tp_iternext       */
 };
 
-PyDoc_STRVAR(Diff_size__doc__, "Returns the number of deltas/patches in this diff.");
-PyObject *
-Diff_size__get__(Diff *self)
+Py_ssize_t
+Diff_len(Diff *self)
 {
-    return PyLong_FromSize_t(git_diff_num_deltas(self->list));
+    assert(self->list);
+    return (Py_ssize_t)git_diff_num_deltas(self->list);
 }
 
 PyDoc_STRVAR(Diff_patch__doc__, "Patch diff string.");
@@ -446,12 +446,11 @@ Diff_dealloc(Diff *self)
 
 PyGetSetDef Diff_getseters[] = {
     GETTER(Diff, patch),
-    GETTER(Diff, size),
     {NULL}
 };
 
 PyMappingMethods Diff_as_mapping = {
-    0,                               /* mp_length */
+    (lenfunc)Diff_len,               /* mp_length */
     (binaryfunc)Diff_getitem,        /* mp_subscript */
     0,                               /* mp_ass_subscript */
 };
diff --git a/test/test_diff.py b/test/test_diff.py
index a2564c0..a42fdf3 100644
--- a/test/test_diff.py
+++ b/test/test_diff.py
@@ -254,7 +254,7 @@ class DiffTest(utils.BareRepoTestCase):
 
         diff = commit_a.tree.diff_to_tree(commit_b.tree)
         self.assertEqual(diff.patch, PATCH)
-        self.assertEqual(diff.size, len([patch for patch in diff]))
+        self.assertEqual(len(diff), len([patch for patch in diff]))
 
     def test_diff_oids(self):
         commit_a = self.repo[COMMIT_SHA1_1]