Fix if else

git/cmd.py

@@ -375,7 +375,6 @@ def __del__(self):
                 proc.wait()    # ensure process goes away
             except OSError as ex:
                 log.info("Ignored error after process had died: %r", ex)
-                pass  # ignore error when process already died
             except AttributeError:
                 # try windows
                 # for some reason, providing None for stdout/stderr still prints something. This is why

git/compat.py

@@ -145,14 +145,12 @@ def __str__(self):
 def u(text):
     if PY3:
         return text
-    else:
-        return text.decode('unicode_escape')
+    return text.decode('unicode_escape')
 
 def b(data):
     if PY3:
         return data.encode('latin1')
-    else:
-        return data
+    return data
 
 if PY3:
     _unichr = chr
@@ -282,8 +280,7 @@ def encodefilename(fn):
                 ch_utf8 = ch.encode('utf-8')
                 encoded.append(ch_utf8)
         return bytes().join(encoded)
-    else:
-        return fn.encode(FS_ENCODING, FS_ERRORS)
+    return fn.encode(FS_ENCODING, FS_ERRORS)
 
 def decodefilename(fn):
     return fn.decode(FS_ENCODING, FS_ERRORS)

git/config.py

@@ -339,8 +339,7 @@ def string_decode(v):
 
             if PY3:
                 return v.encode(defenc).decode('unicode_escape')
-            else:
-                return v.decode('string_escape')
+            return v.decode('string_escape')
             # end
         # end
 

git/index/fun.py

@@ -173,8 +173,7 @@ def entry_key(*entry):
     :param entry: One instance of type BaseIndexEntry or the path and the stage"""
     if len(entry) == 1:
         return (entry[0].path, entry[0].stage)
-    else:
-        return tuple(entry)
+    return tuple(entry)
     # END handle entry
 
 

git/objects/commit.py

@@ -174,8 +174,7 @@ def count(self, paths='', **kwargs):
         # as the empty paths version will ignore merge commits for some reason.
         if paths:
             return len(self.repo.git.rev_list(self.hexsha, '--', paths, **kwargs).splitlines())
-        else:
-            return len(self.repo.git.rev_list(self.hexsha, **kwargs).splitlines())
+        return len(self.repo.git.rev_list(self.hexsha, **kwargs).splitlines())
 
     @property
     def name_rev(self):

git/objects/submodule/base.py

@@ -233,8 +233,7 @@ def _config_parser_constrained(self, read_only):
     def _module_abspath(cls, parent_repo, path, name):
         if cls._need_gitfile_submodules(parent_repo.git):
             return osp.join(parent_repo.git_dir, 'modules', name)
-        else:
-            return osp.join(parent_repo.working_tree_dir, path)
+        return osp.join(parent_repo.working_tree_dir, path)
         # end
 
     @classmethod

git/refs/head.py

@@ -219,8 +219,7 @@ def checkout(self, force=False, **kwargs):
         self.repo.git.checkout(self, **kwargs)
         if self.repo.head.is_detached:
             return self.repo.head
-        else:
-            return self.repo.active_branch
+        return self.repo.active_branch
 
     #{ Configuration
     def _config_parser(self, read_only):

git/refs/log.py

@@ -39,10 +39,9 @@ def __repr__(self):
         res = self.format()
         if PY3:
             return res
-        else:
-            # repr must return a string, which it will auto-encode from unicode using the default encoding.
-            # This usually fails, so we encode ourselves
-            return res.encode(defenc)
+        # repr must return a string, which it will auto-encode from unicode using the default encoding.
+        # This usually fails, so we encode ourselves
+        return res.encode(defenc)
 
     def format(self):
         """:return: a string suitable to be placed in a reflog file"""

git/remote.py

@@ -75,8 +75,7 @@ def to_progress_instance(progress):
         return RemoteProgress()
 
     # assume its the old API with an instance of RemoteProgress.
-    else:
-        return progress
+    return progress
 
 
 class PushInfo(object):

git/repo/base.py

@@ -478,8 +478,7 @@ def commit(self, rev=None):
         :return: ``git.Commit``"""
         if rev is None:
             return self.head.commit
-        else:
-            return self.rev_parse(text_type(rev) + "^0")
+        return self.rev_parse(text_type(rev) + "^0")
 
     def iter_trees(self, *args, **kwargs):
         """:return: Iterator yielding Tree objects
@@ -501,8 +500,7 @@ def tree(self, rev=None):
             operations might have unexpected results."""
         if rev is None:
             return self.head.commit.tree
-        else:
-            return self.rev_parse(text_type(rev) + "^{tree}")
+        return self.rev_parse(text_type(rev) + "^{tree}")
 
     def iter_commits(self, rev=None, paths='', **kwargs):
         """A list of Commit objects representing the history of a given ref/commit
@@ -601,8 +599,7 @@ def _get_alternates(self):
             with open(alternates_path, 'rb') as f:
                 alts = f.read().decode(defenc)
             return alts.strip().splitlines()
-        else:
-            return []
+        return []
 
     def _set_alternates(self, alts):
         """Sets the alternates

git/util.py

@@ -577,9 +577,8 @@ def _from_string(cls, string):
             m = cls.name_only_regex.search(string)
             if m:
                 return Actor(m.group(1), None)
-            else:
-                # assume best and use the whole string as name
-                return Actor(string, None)
+            # assume best and use the whole string as name
+            return Actor(string, None)
             # END special case name
         # END handle name/email matching