From 25193946fff874d168dba56557441385ac4da92c Mon Sep 17 00:00:00 2001
From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Wed, 18 Dec 2019 09:31:30 +0100
Subject: [PATCH] codefactor: fix unnecessary else after return maintainability
 issue

---
 docs/source/_ext/autodoxy.py | 9 +++------
 src/simix/simcalls.py        | 3 +--
 tools/tesh/tesh.py           | 4 ++--
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/docs/source/_ext/autodoxy.py b/docs/source/_ext/autodoxy.py
index ea3d8057bf..c82d0fdaa7 100644
--- a/docs/source/_ext/autodoxy.py
+++ b/docs/source/_ext/autodoxy.py
@@ -333,12 +333,9 @@ class DoxygenClassDocumenter(DoxygenDocumenter):
 
         if want_all:
             return False, ((m.find('name').text, m) for m in all_members)
-        else:
-            if not self.options.members:
-                return False, []
-            else:
-                return False, ((m.find('name').text, m) for m in all_members
-                               if m.find('name').text in self.options.members)
+        if not self.options.members:
+            return False, []
+        return False, ((m.find('name').text, m) for m in all_members if m.find('name').text in self.options.members)
 
     def filter_members(self, members, want_all):
         ret = []
diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py
index 123b4c167e..c982a2421c 100755
--- a/src/simix/simcalls.py
+++ b/src/simix/simcalls.py
@@ -178,8 +178,7 @@ class Simcall(object):
                                                                                     self.name,
                                                                                     ''.join(', %s %s' % (arg.rettype(), arg.name)
                                                                                             for i, arg in enumerate(self.args)))
-        else:
-            return ""
+        return ""
 
 
 def parse(fn):
diff --git a/tools/tesh/tesh.py b/tools/tesh/tesh.py
index 2e0d94a37d..ea8f4857ee 100755
--- a/tools/tesh/tesh.py
+++ b/tools/tesh/tesh.py
@@ -314,8 +314,8 @@ class Cmd(object):
             vdefault = m.group(2)
             if vname in os.environ:
                 return "$" + vname
-            else:
-                return vdefault
+            return vdefault
+
         self.args = re.sub(r"\${(\w+):=([^}]*)}", replace_perl_variables, self.args)
 
         # replace bash environment variables ($THINGS) to their values
-- 
2.20.1