From 4d5371ef74e0e329b06af3c8ab770690254c7646 Mon Sep 17 00:00:00 2001 From: vimalsheoran Date: Fri, 20 Jul 2018 21:59:49 +0530 Subject: [PATCH 1/4] Fixing bad whitespaces and indents, making it more lint perfect. --- encryptor.py | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/encryptor.py b/encryptor.py index 2fe1fdf..ba04733 100644 --- a/encryptor.py +++ b/encryptor.py @@ -10,37 +10,33 @@ import passwordmeter import re - class Encrypto: def __password(self, str): while True: - if 6 <= len(str): break print('The password must be between 6 and 12 characters.\n') - password_scores = {0: 'Horrible', 1: 'Weak', 2: 'Medium', 3: 'Strong'} - password_strength = dict.fromkeys(['has_upper', 'has_lower', 'has_num'], False) + password_strength = dict.fromkeys(['has_upper', 'has_lower', 'has_num'], + False) + if re.search(r'[A-Z]', str): - password_strength['has_upper'] = True + password_strength['has_upper'] = True if re.search(r'[a-z]', str): - password_strength['has_lower'] = True + password_strength['has_lower'] = True if re.search(r'[0-9]', str): - password_strength['has_num'] = True + password_strength['has_num'] = True score = len([b for b in password_strength.values() if b]) print('Password is %s' % password_scores[score]) - - def _input_(self): user_id = input('\nEnter the account name/User id for which you want the password to be made:\n') user_pass = getpass.getpass('\nEnter the password you wish to test:\n') print('Password entered:', user_pass) - Encrypto.__password(Encrypto,user_pass) - + Encrypto.__password(Encrypto, user_pass) Encrypto._input_(Encrypto) From 00a3384413522f5b9a5e2bcdf449a256fd9c8f75 Mon Sep 17 00:00:00 2001 From: vimalsheoran Date: Fri, 20 Jul 2018 22:02:20 +0530 Subject: [PATCH 2/4] More indents and spaces fixed --- encryptor.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/encryptor.py b/encryptor.py index ba04733..848c9bb 100644 --- a/encryptor.py +++ b/encryptor.py @@ -14,13 +14,15 @@ class Encrypto: def __password(self, str): while True: - if 6 <= len(str): + if 6 <= len(str): break print('The password must be between 6 and 12 characters.\n') password_scores = {0: 'Horrible', 1: 'Weak', 2: 'Medium', 3: 'Strong'} - password_strength = dict.fromkeys(['has_upper', 'has_lower', 'has_num'], - False) + password_strength = dict.fromkeys(['has_upper', + 'has_lower', + 'has_num'], + False) if re.search(r'[A-Z]', str): password_strength['has_upper'] = True From fb2f1e234b94d138341a0cc1026194c421a962dd Mon Sep 17 00:00:00 2001 From: vimalsheoran Date: Fri, 20 Jul 2018 22:06:43 +0530 Subject: [PATCH 3/4] Changing variable name to something else, 'str' is interpreted as the builting being overriden. Ignore this if it is done on purpose. --- encryptor.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/encryptor.py b/encryptor.py index 848c9bb..75605e8 100644 --- a/encryptor.py +++ b/encryptor.py @@ -12,11 +12,11 @@ class Encrypto: - def __password(self, str): + def __password(self, password_str): while True: - if 6 <= len(str): - break + if 6 <= len(password_str): print('The password must be between 6 and 12 characters.\n') + break password_scores = {0: 'Horrible', 1: 'Weak', 2: 'Medium', 3: 'Strong'} password_strength = dict.fromkeys(['has_upper', @@ -24,11 +24,11 @@ def __password(self, str): 'has_num'], False) - if re.search(r'[A-Z]', str): + if re.search(r'[A-Z]', password_str): password_strength['has_upper'] = True - if re.search(r'[a-z]', str): + if re.search(r'[a-z]', password_str): password_strength['has_lower'] = True - if re.search(r'[0-9]', str): + if re.search(r'[0-9]', password_str): password_strength['has_num'] = True score = len([b for b in password_strength.values() if b]) From 184fa1e0e49398bcfcf6068462473c63fea36d71 Mon Sep 17 00:00:00 2001 From: vimalsheoran Date: Fri, 20 Jul 2018 22:11:22 +0530 Subject: [PATCH 4/4] Fixing bad import orders and comparison orders. --- encryptor.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/encryptor.py b/encryptor.py index 75605e8..346b945 100644 --- a/encryptor.py +++ b/encryptor.py @@ -7,14 +7,14 @@ 6) Feature to store it in cloud-- Dropbox or google Drive ''' import getpass -import passwordmeter import re +import passwordmeter class Encrypto: def __password(self, password_str): while True: - if 6 <= len(password_str): + if len(password_str) <= 6: print('The password must be between 6 and 12 characters.\n') break password_scores = {0: 'Horrible', 1: 'Weak', 2: 'Medium', 3: 'Strong'}