test_tree works

Byron · Byron · commit 95bb489a50f6 · 2015-01-06T14:20:58.000+01:00
diff --git a/doc/source/changes.rst b/doc/source/changes.rst
@@ -7,6 +7,7 @@ Changelog
 * Internally, hexadecimal SHA1 are treated as ascii encoded strings. Binary SHA1 are treated as bytes.
 * Id attribute of Commit objects is now `hexsha`, instead of `binsha`. The latter makes no sense in python 3 and I see no application of it anyway besides its artificial usage in test cases.
 * **IMPORTANT**: If you were using the config_writer(), you implicitly relied on __del__ to work as expected to flush changes. To be sure changes are flushed under PY3, you will have to call the new `release()` method to trigger a flush. For some reason, __del__ is not called necessarily anymore when a symbol goes out of scope.
+* The `Tree` now has a `.join('name')` method which is equivalent to `tree / 'name'`
 
 0.3.3
 =====
diff --git a/git/objects/tree.py b/git/objects/tree.py
@@ -159,7 +159,7 @@ def _iter_convert_to_object(self, iterable):
                 raise TypeError("Unknown mode %o found in tree data for path '%s'" % (mode, path))
         # END for each item
 
-    def __div__(self, file):
+    def join(self, file):
         """Find the named object in this tree's contents
         :return: ``git.Blob`` or ``git.Tree`` or ``git.Submodule``
 
@@ -192,6 +192,14 @@ def __div__(self, file):
             raise KeyError(msg % file)
         # END handle long paths
 
+    def __div__(self, file):
+        """For PY2 only"""
+        return self.join(file)
+
+    def __truediv__(self, file):
+        """For PY3 only"""
+        return self.join(file)
+
     @property
     def trees(self):
         """:return: list(Tree, ...) list of trees directly below this tree"""
@@ -235,7 +243,7 @@ def __getitem__(self, item):
 
         if isinstance(item, string_types):
             # compatability
-            return self.__div__(item)
+            return self.join(item)
         # END index is basestring
 
         raise TypeError("Invalid index type: %r" % item)
diff --git a/git/test/test_tree.py b/git/test/test_tree.py
@@ -138,6 +138,7 @@ def test_traverse(self):
             # END check for slash
 
             # slashes in paths are supported as well
+            # NOTE: on py3, / doesn't work with strings anymore ... 
             assert root[item.path] == item == root / item.path
         # END for each item
         assert found_slash
