diff --git a/PASSWORD RELATED/password-validator/PASSWORD_VALIDATOR.py b/PASSWORD RELATED/password-validator/PASSWORD_VALIDATOR.py index 76dfbef5..924c7670 100644 --- a/PASSWORD RELATED/password-validator/PASSWORD_VALIDATOR.py +++ b/PASSWORD RELATED/password-validator/PASSWORD_VALIDATOR.py @@ -9,7 +9,8 @@ def passwordValidator(): print('\nYour password should: ') print('\t- Have a minimum length of 6;') print('\t- Have a maximum length of 12;') - print('\t- Contain at least an uppercase letter or a lowercase letter') + print('\t- Contain at least an uppercase letter;') + print('\t-Contain at least a lowercase letter;') print('\t- Contain at least a number;') print('\t- Contain at least a special character (such as @,+,£,$,%,*^,etc);') print('\t- Not contain space(s).') @@ -24,9 +25,13 @@ def passwordValidator(): if ' ' in userPassword: message = 'Invalid Password..your password shouldn\'t contain space(s)' return message - if not any(i in string.ascii_letters for i in userPassword): + if not any(i in string.ascii_uppercase for i in userPassword): message = 'Invalid Password..your password should contain at least ' - message += 'an uppercase letter and a lowercase letter' + message += 'an uppercase letter' + return message + if not any(i in string.ascii_lowercase for i in userPassword): + message = 'Invalid Password..your password should contain at least ' + message += 'a lowercase letter' return message if not any(i in string.digits for i in userPassword): message = 'Invalid Password..your password should contain at least a number' @@ -38,4 +43,4 @@ def passwordValidator(): return 'Valid Password!' my_password = passwordValidator() -print(my_password) \ No newline at end of file +print(my_password) diff --git a/PASSWORD RELATED/password-validator/README.md b/PASSWORD RELATED/password-validator/README.md index 8ce2d6f7..feb673c5 100644 --- a/PASSWORD RELATED/password-validator/README.md +++ b/PASSWORD RELATED/password-validator/README.md @@ -3,7 +3,8 @@ This program validates passwords to match specific rules. A valid password is one that conforms to the following rules: - Minimum length is 6; - Maximum length is 12; -- Contains at least an uppercase letter or a lowercase letter +- Contains at least an uppercase letter +- contains at least a lowercase letter - Contains at least a number; - Contains at least a special character (such as @,+,£,$,%,*^,etc); - Doesn't contain space(s).