Refactor conditionals

Author: craig-dsilva

implement-shell-tools/cat/cat.py

@@ -10,7 +10,7 @@
 show_lines = args.number
 non_blank = args.nonblank
 
-if show_lines == True and non_blank == True:
+if show_lines and non_blank:
     print("Error: Cannot use -n and -b together. Please use only one flag at a time.")
     exit()
 
@@ -24,15 +24,15 @@
 text_list = text.split("\n")
 text_list.pop(len(text_list) - 1)
 
-if (show_lines == False and non_blank == False):
+if not show_lines and not non_blank:
     print("\n".join(text_list))
     exit()
 
 for line in text_list:
-    if non_blank == True and line != "":
+    if non_blank and line != "":
         print("     " + str(i) + " " + line)
         i += 1
-    elif non_blank == False:
+    elif not non_blank:
         print("     " + str(i) + " " + line)
         i += 1
     else:

implement-shell-tools/ls/ls.py

@@ -16,14 +16,14 @@
 contents = []
 
 for f in listdir(path):
-    if show_hidden == False and f[0] != ".":
+    if not show_hidden and f[0] != ".":
         contents.append(f)
-    if show_hidden == True:
+    if show_hidden:
         contents.append(f)
 
 contents.sort()
 
-if one_per_line == True:
+if one_per_line:
     print("\n".join(contents))
 else:
     print("  ".join(contents))

implement-shell-tools/wc/wc.py

@@ -16,7 +16,7 @@
 w = True
 c = True
 
-if args.words == True or args.line == True or args.bytes == True:
+if args.words or args.line or args.bytes:
     l = args.line
     w = args.words
     c = args.bytes
@@ -33,18 +33,15 @@
     file_data_with_newline[file] = f.read()
 
 def print_helper(line, word, byte, file_name):
-    text = [" "]
-    if l == True:
-        text.append(str(line))
-        text.append(" ")
-    if w == True:
-        text.append(str(word))
-        text.append(" ")
-    if c == True:
-        text.append(str(byte))
-        text.append(" ")
-    text.append(file_name)
-    print("".join(text))
+    parts = []
+    if l:
+        parts.append(str(line))
+    if w:
+        parts.append(str(word))
+    if c:
+        parts.append(str(byte))
+    parts.append(file_name)
+    print(" ".join(parts))
 
 for f in file_data:
     word_per_line = 0