Sourcery refactored master branch

.update/do.py

@@ -34,31 +34,25 @@ def flatten_tree(tree):
     ])
     if 'contents' in tree:
         for x in tree['contents']:
-            for y in flatten_tree(x):
-                yield y
+            yield from flatten_tree(x)
 
 def first_leaf(tree):
     """Find the first leaf node (Page) in the tree."""
-    if 'contents' in tree:
-        x = tree['contents'][0]
-        return first_leaf(x)
-    else:
+    if 'contents' not in tree:
         return tree
+    x = tree['contents'][0]
+    return first_leaf(x)
 
 def rex_uri(book, page):
-    if page is None:
-        uri = f'/books/{book}'
-    else:
-        uri = f'/books/{book}/pages/{page}'
-    return uri
+    return f'/books/{book}' if page is None else f'/books/{book}/pages/{page}'
 
 
 def cnx_uri_regex(book, page):
-    if page is None:
-        uri_regex = f"/contents/({book['id']}|{book['short_id']})(@[.\d]+)?(/[-%\w\d]+)?$"
-    else:
-        uri_regex = f"/contents/({book['id']}|{book['short_id']})(@[.\d]+)?:({page['id']}|{page['short_id']})(@[.\d]+)?(/[-%\w\d]+)?$"
-    return uri_regex
+    return (
+        f"/contents/({book['id']}|{book['short_id']})(@[.\d]+)?(/[-%\w\d]+)?$"
+        if page is None
+        else f"/contents/({book['id']}|{book['short_id']})(@[.\d]+)?:({page['id']}|{page['short_id']})(@[.\d]+)?(/[-%\w\d]+)?$"
+    )
 
 
 def expand_tree_node(node):

files/homes/administrator/ez_setup.py

@@ -41,7 +41,7 @@ def _check_call_py24(cmd, *args, **kwargs):
     res = subprocess.call(cmd, *args, **kwargs)
     class CalledProcessError(Exception):
         pass
-    if not res == 0:
+    if res != 0:
         msg = "Command '%s' return non-zero exit status %d" % (cmd, res)
         raise CalledProcessError(msg)
 vars(subprocess).setdefault('check_call', _check_call_py24)
@@ -183,10 +183,9 @@ def has_powershell():
     cmd = ['powershell', '-Command', 'echo test']
     devnull = open(os.path.devnull, 'wb')
     try:
-        try:
-            subprocess.check_call(cmd, stdout=devnull, stderr=devnull)
-        except:
-            return False
+        subprocess.check_call(cmd, stdout=devnull, stderr=devnull)
+    except:
+        return False
     finally:
         devnull.close()
     return True
@@ -201,10 +200,9 @@ def has_curl():
     cmd = ['curl', '--version']
     devnull = open(os.path.devnull, 'wb')
     try:
-        try:
-            subprocess.check_call(cmd, stdout=devnull, stderr=devnull)
-        except:
-            return False
+        subprocess.check_call(cmd, stdout=devnull, stderr=devnull)
+    except:
+        return False
     finally:
         devnull.close()
     return True
@@ -219,10 +217,9 @@ def has_wget():
     cmd = ['wget', '--version']
     devnull = open(os.path.devnull, 'wb')
     try:
-        try:
-            subprocess.check_call(cmd, stdout=devnull, stderr=devnull)
-        except:
-            return False
+        subprocess.check_call(cmd, stdout=devnull, stderr=devnull)
+    except:
+        return False
     finally:
         devnull.close()
     return True