Merge pull request #204 from hashar/pep8-linting

Pep8 linting

1 files changed, 25 insertions, 24 deletions

diff --git a/git/test/test_base.py b/git/test/test_base.py
index 5edc9c52..81e785ab 100644
--- a/git/test/test_base.py
+++ b/git/test/test_base.py
@@ -15,18 +15,19 @@ from git.objects.util import get_object_type_by_name
 from gitdb.util import hex_to_bin
 import tempfile
 
+
 class TestBase(TestBase):
-    
-    type_tuples = (  ("blob", "8741fc1d09d61f02ffd8cded15ff603eff1ec070", "blob.py"), 
+
+    type_tuples = (("blob", "8741fc1d09d61f02ffd8cded15ff603eff1ec070", "blob.py"),
                      ("tree", "3a6a5e3eeed3723c09f1ef0399f81ed6b8d82e79", "directory"),
                      ("commit", "4251bd59fb8e11e40c40548cba38180a9536118c", None),
-                     ("tag", "e56a60e8e9cd333cfba0140a77cd12b0d9398f10", None) ) 
-    
-    def test_base_object(self): 
+                     ("tag", "e56a60e8e9cd333cfba0140a77cd12b0d9398f10", None))
+
+    def test_base_object(self):
         # test interface of base object classes
         types = (Blob, Tree, Commit, TagObject)
         assert len(types) == len(self.type_tuples)
-        
+
         s = set()
         num_objs = 0
         num_index_objs = 0
@@ -34,9 +35,9 @@ class TestBase(TestBase):
             binsha = hex_to_bin(hexsha)
             item = None
             if path is None:
-                item = obj_type(self.rorepo,binsha)
+                item = obj_type(self.rorepo, binsha)
             else:
-                item = obj_type(self.rorepo,binsha, 0, path)
+                item = obj_type(self.rorepo, binsha, 0, path)
             # END handle index objects
             num_objs += 1
             assert item.hexsha == hexsha
@@ -47,54 +48,54 @@ class TestBase(TestBase):
             assert str(item) == item.hexsha
             assert repr(item)
             s.add(item)
-            
+
             if isinstance(item, base.IndexObject):
                 num_index_objs += 1
-                if hasattr(item,'path'):                        # never runs here
+                if hasattr(item, 'path'):                        # never runs here
                     assert not item.path.startswith("/")        # must be relative
                     assert isinstance(item.mode, int)
             # END index object check
-            
+
             # read from stream
             data_stream = item.data_stream
             data = data_stream.read()
             assert data
-            
+
             tmpfile = os.tmpfile()
             assert item == item.stream_data(tmpfile)
             tmpfile.seek(0)
             assert tmpfile.read() == data
             # END stream to file directly
         # END for each object type to create
-        
+
         # each has a unique sha
         assert len(s) == num_objs
-        assert len(s|s) == num_objs
+        assert len(s | s) == num_objs
         assert num_index_objs == 2
-        
+
     def test_get_object_type_by_name(self):
         for tname in base.Object.TYPES:
             assert base.Object in get_object_type_by_name(tname).mro()
-        # END for each known type 
-        
-        assert_raises( ValueError, get_object_type_by_name, "doesntexist" )
+        # END for each known type
+
+        assert_raises(ValueError, get_object_type_by_name, "doesntexist")
 
     def test_object_resolution(self):
         # objects must be resolved to shas so they compare equal
         assert self.rorepo.head.reference.object == self.rorepo.active_branch.object
-        
+
     @with_rw_repo('HEAD', bare=True)
     def test_with_bare_rw_repo(self, bare_rw_repo):
         assert bare_rw_repo.config_reader("repository").getboolean("core", "bare")
-        assert os.path.isfile(os.path.join(bare_rw_repo.git_dir,'HEAD'))
-        
+        assert os.path.isfile(os.path.join(bare_rw_repo.git_dir, 'HEAD'))
+
     @with_rw_repo('0.1.6')
     def test_with_rw_repo(self, rw_repo):
         assert not rw_repo.config_reader("repository").getboolean("core", "bare")
-        assert os.path.isdir(os.path.join(rw_repo.working_tree_dir,'lib'))
-        
+        assert os.path.isdir(os.path.join(rw_repo.working_tree_dir, 'lib'))
+
     @with_rw_and_rw_remote_repo('0.1.6')
     def test_with_rw_remote_and_rw_repo(self, rw_repo, rw_remote_repo):
         assert not rw_repo.config_reader("repository").getboolean("core", "bare")
         assert rw_remote_repo.config_reader("repository").getboolean("core", "bare")
-        assert os.path.isdir(os.path.join(rw_repo.working_tree_dir,'lib'))
+        assert os.path.isdir(os.path.join(rw_repo.working_tree_dir, 'lib'))