Merge pull request #34 from IceTheDev2/change-oxford-comma

Update password_strength_logic.py
IceTheCoder · Feb 24, 2023 · 854b9fc · 854b9fc
2 parents bbc1f50 + 4d8cc80
commit 854b9fc
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/code/password_strength_logic.py b/code/password_strength_logic.py
@@ -115,11 +115,19 @@ def check_password_complexity() -> None:
             for missing_feature in missing_security_features_list:
                 if len(missing_security_features_list) == 1:
                     output = str(missing_feature)
-                elif missing_feature != missing_security_features_list[-1]:
-                    output = output + str(missing_feature) + ', '
+                elif len(missing_security_features_list) == 2:
+                    if missing_feature != missing_security_features_list[-1]:
+                        output = output + str(missing_feature) + ' and '
+                    else:
+                        output = output + str(missing_feature)
                 else:
-                    output = output + 'and ' + str(missing_feature)
-
+                    if missing_feature == missing_security_features_list[-2]:
+                        output = output + str(missing_feature) + ', and '
+                    elif missing_feature == missing_security_features_list[-1]:
+                        output = output + str(missing_feature)
+                    else:
+                        output = output + str(missing_feature) + ', '
+
             return f'Not complex: Your password is missing {output}.'
 
         else: