Review changes:

- drop .blob & .tree in favour of .obj
- use getitem implementation for truediv: allows `T / 'a' / 0` to correspond to `T['a'][0]`

Author: rcoup

docs/objects.rst

@@ -191,8 +191,7 @@ Tree entries
 .. autoattribute:: pygit2.TreeEntry.hex
 .. autoattribute:: pygit2.TreeEntry.filemode
 .. autoattribute:: pygit2.TreeEntry.type
-.. autoattribute:: pygit2.TreeEntry.blob
-.. autoattribute:: pygit2.TreeEntry.tree
+.. autoattribute:: pygit2.TreeEntry.obj
 
 .. method:: TreeEntry.__cmp__(TreeEntry)
 
@@ -218,8 +217,8 @@ Example::
     >>> entry
     <pygit2.TreeEntry object at 0xcc10f0>
 
-    >>> blob = entry.blob                 # Get the object the entry points to
-    >>> blob
+    >>> obj = entry.obj                   # Get the blob the entry points to
+    >>> obj
     <pygit2.Blob object at 0xcc12d0>
 
 Creating trees

src/tree.c

@@ -225,29 +225,20 @@ treeentry_to_object(TreeEntry* self)
 
     return wrap_object(obj, py_repo);
 }
-PyDoc_STRVAR(TreeEntry_tree__doc__, "Subtree. (for type=tree entries)");
+PyDoc_STRVAR(TreeEntry_obj__doc__, "Object (subtree/blob)");
 
 PyObject *
-TreeEntry_tree__get__(TreeEntry *self)
+TreeEntry_obj__get__(TreeEntry *self)
 {
-    git_tree* subtree = treeentry_to_subtree(self);
-    if (subtree == NULL)
-        return NULL;
-
-    return wrap_object((git_object*)subtree, self->repo);
-}
-
-PyDoc_STRVAR(TreeEntry_blob__doc__, "Blob. (for type=blob entries)");
+    if (git_tree_entry_type(self->entry) == GIT_OBJ_TREE) {
+        git_tree* subtree = treeentry_to_subtree(self);
+        if (subtree == NULL)
+            return NULL;
 
-PyObject *
-TreeEntry_blob__get__(TreeEntry *self)
-{
-    if (git_tree_entry_type(self->entry) != GIT_OBJ_BLOB) {
-        PyErr_SetString(PyExc_TypeError, "Only for blobs");
-        return NULL;
+        return wrap_object((git_object*)subtree, self->repo);
+    } else {
+        return treeentry_to_object(self);
     }
-
-    return treeentry_to_object(self);
 }
 
 PyObject *
@@ -318,21 +309,6 @@ TreeEntry_getitem(TreeEntry *self, PyObject *value)
     return r;
 }
 
-TreeEntry *
-TreeEntry_truediv(TreeEntry *self, PyObject *value)
-{
-    TreeEntry *r;
-    git_tree *subtree;
-
-    subtree = treeentry_to_subtree(self);
-    if (subtree == NULL)
-        return NULL;
-
-    r = tree_getitem_by_path(subtree, self->repo, value);
-    git_tree_free(subtree);
-    return r;
-}
-
 
 PyGetSetDef TreeEntry_getseters[] = {
     GETTER(TreeEntry, filemode),
@@ -342,8 +318,7 @@ PyGetSetDef TreeEntry_getseters[] = {
     GETTER(TreeEntry, id),
     GETTER(TreeEntry, hex),
     GETTER(TreeEntry, type),
-    GETTER(TreeEntry, blob),
-    GETTER(TreeEntry, tree),
+    GETTER(TreeEntry, obj),
     {NULL}
 };
 
@@ -371,7 +346,7 @@ PyNumberMethods TreeEntry_as_number = {
     0,                          /* nb_subtract */
     0,                          /* nb_multiply */
 #if PY_MAJOR_VERSION < 3
-    (binaryfunc)TreeEntry_truediv,  /* Py2: nb_divide */
+    (binaryfunc)TreeEntry_getitem,  /* Py2: nb_divide */
 #endif
     0,                          /* nb_remainder */
     0,                          /* nb_divmod */
@@ -407,7 +382,7 @@ PyNumberMethods TreeEntry_as_number = {
     0,                          /* nb_inplace_xor */
     0,                          /* nb_inplace_or */
     0,                          /* nb_floor_divide */
-    TreeEntry_truediv,          /* nb_true_divide */
+    TreeEntry_getitem,          /* nb_true_divide */
     0,                          /* nb_inplace_floor_divide */
     0,                          /* nb_inplace_true_divide */
     0,                          /* nb_index */
@@ -618,13 +593,6 @@ Tree_getitem(Tree *self, PyObject *value)
     return tree_getitem_by_path(self->tree, self->repo, value);
 }
 
-TreeEntry *
-Tree_truediv(Tree *self, PyObject *value)
-{
-    /* Case 2: byte or text string */
-    return tree_getitem_by_path(self->tree, self->repo, value);
-}
-
 
 PyDoc_STRVAR(Tree_diff_to_workdir__doc__,
   "diff_to_workdir([flags, context_lines, interhunk_lines]) -> Diff\n"
@@ -829,7 +797,7 @@ PyNumberMethods Tree_as_number = {
     0,                          /* nb_subtract */
     0,                          /* nb_multiply */
 #if PY_MAJOR_VERSION < 3
-    (binaryfunc)Tree_truediv,   /* Py2: nb_divide */
+    (binaryfunc)Tree_getitem,   /* Py2: nb_divide */
 #endif
     0,                          /* nb_remainder */
     0,                          /* nb_divmod */
@@ -865,7 +833,7 @@ PyNumberMethods Tree_as_number = {
     0,                          /* nb_inplace_xor */
     0,                          /* nb_inplace_or */
     0,                          /* nb_floor_divide */
-    Tree_truediv,               /* nb_true_divide */
+    Tree_getitem,               /* nb_true_divide */
     0,                          /* nb_inplace_floor_divide */
     0,                          /* nb_inplace_true_divide */
     0,                          /* nb_index */

src/tree.h

@@ -38,8 +38,7 @@ PyObject* TreeEntry_get_filemode(TreeEntry *self);
 PyObject* TreeEntry_get_name(TreeEntry *self);
 PyObject* TreeEntry_get_oid(TreeEntry *self);
 PyObject* TreeEntry_get_hex(TreeEntry *self);
-PyObject* TreeEntry_get_blob(TreeEntry *self);
-PyObject* TreeEntry_get_tree(TreeEntry *self);
+PyObject* TreeEntry_get_obj(TreeEntry *self);
 
 TreeEntry* tree_getitem_by_index(const git_tree *tree, Repository *repo, PyObject *py_index);
 TreeEntry* tree_getitem_by_path(const git_tree *tree, Repository *repo, PyObject *py_path);

test/test_tree.py

@@ -53,7 +53,8 @@ def assertTreeEntryEqual(self, entry, sha, name, filemode):
     def test_read_tree(self):
         tree = self.repo[TREE_SHA]
         with pytest.raises(TypeError): tree[()]
-        with pytest.raises(TypeError): tree / 123
+        with pytest.raises(IndexError):
+            tree / 123
         self.assertRaisesWithArg(KeyError, 'abcd', lambda: tree['abcd'])
         self.assertRaisesWithArg(IndexError, -4, lambda: tree[-4])
         self.assertRaisesWithArg(IndexError, 3, lambda: tree[3])
@@ -66,13 +67,15 @@ def test_read_tree(self):
         self.assertTreeEntryEqual(tree[-3], sha, 'a', 0o0100644)
         self.assertTreeEntryEqual(tree['a'], sha, 'a', 0o0100644)
         self.assertTreeEntryEqual(tree / 'a', sha, 'a', 0o0100644)
+        self.assertTreeEntryEqual(tree / 0, sha, 'a', 0o0100644)
 
         sha = '85f120ee4dac60d0719fd51731e4199aa5a37df6'
         assert 'b' in tree
         self.assertTreeEntryEqual(tree[1], sha, 'b', 0o0100644)
         self.assertTreeEntryEqual(tree[-2], sha, 'b', 0o0100644)
         self.assertTreeEntryEqual(tree['b'], sha, 'b', 0o0100644)
         self.assertTreeEntryEqual(tree / 'b', sha, 'b', 0o0100644)
+        self.assertTreeEntryEqual(tree / 1, sha, 'b', 0o0100644)
 
         sha = '297efb891a47de80be0cfe9c639e4b8c9b450989'
         self.assertTreeEntryEqual(tree['c/d'], sha, 'd', 0o0100644)
@@ -85,9 +88,6 @@ def test_read_tree(self):
         self.assertRaisesWithArg(KeyError, 'ab', lambda: tree / 'c' / 'ab')
         self.assertRaisesWithArg(TypeError, 'Only for trees', lambda: tree / 'a' / 'cd')
 
-        self.assertRaisesWithArg(TypeError, 'Only for trees', lambda: (tree / 'c' / 'd').tree)
-        self.assertRaisesWithArg(TypeError, 'Only for blobs', lambda: (tree / 'c').blob)
-
     def test_equality(self):
         tree_a = self.repo['18e2d2e9db075f9eb43bcb2daa65a2867d29a15e']
         tree_b = self.repo['2ad1d3456c5c4a1c9e40aeeddb9cd20b409623c8']
@@ -117,7 +117,7 @@ def test_read_subtree(self):
         self.assertTreeEntryEqual(subtree[0], sha, 'd', 0o0100644)
 
         subtree_entry = (tree / 'c')
-        assert subtree_entry.tree == self.repo[subtree_entry.id]
+        assert subtree_entry.obj == self.repo[subtree_entry.id]
 
     def test_new_tree(self):
         repo = self.repo
@@ -159,9 +159,9 @@ def test_new_tree(self):
         assert y.type == 'blob'
         assert z.type == 'tree'
 
-        assert x.blob == repo[x.id]
-        assert y.blob == repo[y.id]
-        assert z.tree == repo[z.id]
+        assert x.obj == repo[x.id]
+        assert y.obj == repo[y.id]
+        assert z.obj == repo[z.id]
 
 
     def test_modify_tree(self):