Merge pull request #204 from hashar/pep8-linting

Pep8 linting

1 files changed, 34 insertions, 35 deletions

diff --git a/git/test/test_tree.py b/git/test/test_tree.py
index 16d5be59..0f1fb7c3 100644
--- a/git/test/test_tree.py
+++ b/git/test/test_tree.py
@@ -13,8 +13,9 @@ from git.objects.fun import (
                             )
 from cStringIO import StringIO
 
+
 class TestTree(TestBase):
-    
+
     def test_serializable(self):
         # tree at the given commit contains a submodule as well
         roottree = self.rorepo.tree('6c1faef799095f3990e9970bc2cb10aa0221cf9c')
@@ -25,75 +26,74 @@ class TestTree(TestBase):
             tree = item
             # trees have no dict
             self.failUnlessRaises(AttributeError, setattr, tree, 'someattr', 1)
-            
+
             orig_data = tree.data_stream.read()
             orig_cache = tree._cache
-            
+
             stream = StringIO()
             tree._serialize(stream)
             assert stream.getvalue() == orig_data
-            
+
             stream.seek(0)
             testtree = Tree(self.rorepo, Tree.NULL_BIN_SHA, 0, '')
             testtree._deserialize(stream)
             assert testtree._cache == orig_cache
-            
-            
+
             # TEST CACHE MUTATOR
             mod = testtree.cache
             self.failUnlessRaises(ValueError, mod.add, "invalid sha", 0, "name")
             self.failUnlessRaises(ValueError, mod.add, Tree.NULL_HEX_SHA, 0, "invalid mode")
             self.failUnlessRaises(ValueError, mod.add, Tree.NULL_HEX_SHA, tree.mode, "invalid/name")
-            
+
             # add new item
             name = "fake_dir"
             mod.add(testtree.NULL_HEX_SHA, tree.mode, name)
             assert name in testtree
-            
+
             # its available in the tree immediately
             assert isinstance(testtree[name], Tree)
-            
+
             # adding it again will not cause multiple of them to be presents
             cur_count = len(testtree)
             mod.add(testtree.NULL_HEX_SHA, tree.mode, name)
             assert len(testtree) == cur_count
-            
+
             # fails with a different sha - name exists
-            hexsha = "1"*40
+            hexsha = "1" * 40
             self.failUnlessRaises(ValueError, mod.add, hexsha, tree.mode, name)
-            
+
             # force it - replace existing one
             mod.add(hexsha, tree.mode, name, force=True)
             assert testtree[name].hexsha == hexsha
             assert len(testtree) == cur_count
-            
+
             # unchecked addition always works, even with invalid items
             invalid_name = "hi/there"
             mod.add_unchecked(hexsha, 0, invalid_name)
             assert len(testtree) == cur_count + 1
-            
+
             del(mod[invalid_name])
             assert len(testtree) == cur_count
             # del again, its fine
             del(mod[invalid_name])
-            
+
             # have added one item, we are done
             mod.set_done()
             mod.set_done()      # multiple times are okay
-            
+
             # serialize, its different now
             stream = StringIO()
             testtree._serialize(stream)
             stream.seek(0)
             assert stream.getvalue() != orig_data
-            
+
             # replaces cache, but we make sure of it
             del(testtree._cache)
             testtree._deserialize(stream)
             assert name in testtree
             assert invalid_name not in testtree
         # END for each item in tree
-    
+
     def test_traverse(self):
         root = self.rorepo.tree('0.1.6')
         num_recursive = 0
@@ -101,34 +101,34 @@ class TestTree(TestBase):
         for obj in root.traverse():
             if "/" in obj.path:
                 num_recursive += 1
-                
+
             assert isinstance(obj, (Blob, Tree))
             all_items.append(obj)
         # END for each object
         assert all_items == root.list_traverse()
-        
+
         # limit recursion level to 0 - should be same as default iteration
         assert all_items
         assert 'CHANGES' in root
         assert len(list(root)) == len(list(root.traverse(depth=1)))
-        
+
         # only choose trees
-        trees_only = lambda i,d: i.type == "tree"
-        trees = list(root.traverse(predicate = trees_only))
-        assert len(trees) == len(list( i for i in root.traverse() if trees_only(i,0) ))
-        
+        trees_only = lambda i, d: i.type == "tree"
+        trees = list(root.traverse(predicate=trees_only))
+        assert len(trees) == len(list(i for i in root.traverse() if trees_only(i, 0)))
+
         # test prune
-        lib_folder = lambda t,d: t.path == "lib"
-        pruned_trees = list(root.traverse(predicate = trees_only,prune = lib_folder))
+        lib_folder = lambda t, d: t.path == "lib"
+        pruned_trees = list(root.traverse(predicate=trees_only, prune=lib_folder))
         assert len(pruned_trees) < len(trees)
-        
+
         # trees and blobs
-        assert len(set(trees)|set(root.trees)) == len(trees)
-        assert len(set(b for b in root if isinstance(b, Blob)) | set(root.blobs)) == len( root.blobs )
+        assert len(set(trees) | set(root.trees)) == len(trees)
+        assert len(set(b for b in root if isinstance(b, Blob)) | set(root.blobs)) == len(root.blobs)
         subitem = trees[0][0]
         assert "/" in subitem.path
         assert subitem.name == os.path.basename(subitem.path)
-        
+
         # assure that at some point the traversed paths have a slash in them
         found_slash = False
         for item in root.traverse():
@@ -136,9 +136,8 @@ class TestTree(TestBase):
             if '/' in item.path:
                 found_slash = True
             # END check for slash
-            
-            # slashes in paths are supported as well 
-            assert root[item.path] == item == root/item.path
+
+            # slashes in paths are supported as well
+            assert root[item.path] == item == root / item.path
         # END for each item
         assert found_slash
-