--- a/eric6/Utilities/PasswordChecker.py Mon Sep 23 19:10:42 2019 +0200
+++ b/eric6/Utilities/PasswordChecker.py Mon Sep 23 19:22:12 2019 +0200
@@ -388,17 +388,20 @@
self.mirroredSequences["count"] += 1
# Initial score based on length
- self.score["count"] = self.passwordLength["count"] * \
- self.passwordLength["factor"]
+ self.score["count"] = (
+ self.passwordLength["count"] * self.passwordLength["factor"]
+ )
# passwordLength
# credit additional length or punish "under" length
if self.passwordLength["count"] >= self.passwordLength["minimum"]:
# credit additional characters over minimum
- self.passwordLength["rating"] = self.passwordLength["bonus"] + \
+ self.passwordLength["rating"] = (
+ self.passwordLength["bonus"] +
(self.passwordLength["count"] -
- self.passwordLength["minimum"]) * \
+ self.passwordLength["minimum"]) *
self.passwordLength["factor"]
+ )
else:
self.passwordLength["rating"] = self.passwordLength["penalty"]
self.score["count"] += self.passwordLength["rating"]
@@ -406,25 +409,30 @@
# recommendedPasswordLength
# Credit reaching the recommended password length or put a
# penalty on it
- if self.passwordLength["count"] >= \
- self.recommendedPasswordLength["minimum"]:
- self.recommendedPasswordLength["rating"] = \
- self.recommendedPasswordLength["bonus"] + \
+ if (
+ self.passwordLength["count"] >=
+ self.recommendedPasswordLength["minimum"]
+ ):
+ self.recommendedPasswordLength["rating"] = (
+ self.recommendedPasswordLength["bonus"] +
(self.passwordLength["count"] -
- self.recommendedPasswordLength["minimum"]) * \
+ self.recommendedPasswordLength["minimum"]) *
self.recommendedPasswordLength["factor"]
+ )
else:
- self.recommendedPasswordLength["rating"] = \
+ self.recommendedPasswordLength["rating"] = (
self.recommendedPasswordLength["penalty"]
+ )
self.score["count"] += self.recommendedPasswordLength["rating"]
# lowercaseLetters
# Honor or punish the lowercase letter use
if self.lowercaseLetters["count"] > 0:
- self.lowercaseLetters["rating"] = \
- self.lowercaseLetters["bonus"] + \
- self.lowercaseLetters["count"] * \
+ self.lowercaseLetters["rating"] = (
+ self.lowercaseLetters["bonus"] +
+ self.lowercaseLetters["count"] *
self.lowercaseLetters["factor"]
+ )
else:
self.lowercaseLetters["rating"] = self.lowercaseLetters["penalty"]
self.score["count"] += self.lowercaseLetters["rating"]
@@ -432,10 +440,11 @@
# uppercaseLetters
# Honor or punish the lowercase letter use
if self.uppercaseLetters["count"] > 0:
- self.uppercaseLetters["rating"] = \
- self.uppercaseLetters["bonus"] + \
- self.uppercaseLetters["count"] * \
+ self.uppercaseLetters["rating"] = (
+ self.uppercaseLetters["bonus"] +
+ self.uppercaseLetters["count"] *
self.uppercaseLetters["factor"]
+ )
else:
self.uppercaseLetters["rating"] = self.uppercaseLetters["penalty"]
self.score["count"] += self.uppercaseLetters["rating"]
@@ -443,8 +452,10 @@
# numerics
# Honor or punish the numerics use
if self.numerics["count"] > 0:
- self.numerics["rating"] = self.numerics["bonus"] + \
+ self.numerics["rating"] = (
+ self.numerics["bonus"] +
self.numerics["count"] * self.numerics["factor"]
+ )
else:
self.numerics["rating"] = self.numerics["penalty"]
self.score["count"] += self.numerics["rating"]
@@ -452,8 +463,10 @@
# symbols
# Honor or punish the symbols use
if self.symbols["count"] > 0:
- self.symbols["rating"] = self.symbols["bonus"] + \
+ self.symbols["rating"] = (
+ self.symbols["bonus"] +
self.symbols["count"] * self.symbols["factor"]
+ )
else:
self.symbols["rating"] = self.symbols["penalty"]
self.score["count"] += self.symbols["rating"]
@@ -461,8 +474,10 @@
# middleSymbols
# Honor or punish the middle symbols use
if self.middleSymbols["count"] > 0:
- self.middleSymbols["rating"] = self.middleSymbols["bonus"] + \
+ self.middleSymbols["rating"] = (
+ self.middleSymbols["bonus"] +
self.middleSymbols["count"] * self.middleSymbols["factor"]
+ )
else:
self.middleSymbols["rating"] = self.middleSymbols["penalty"]
self.score["count"] += self.middleSymbols["rating"]
@@ -470,8 +485,10 @@
# middleNumerics
# Honor or punish the middle numerics use
if self.middleNumerics["count"] > 0:
- self.middleNumerics["rating"] = self.middleNumerics["bonus"] + \
+ self.middleNumerics["rating"] = (
+ self.middleNumerics["bonus"] +
self.middleNumerics["count"] * self.middleNumerics["factor"]
+ )
else:
self.middleNumerics["rating"] = self.middleNumerics["penalty"]
self.score["count"] += self.middleNumerics["rating"]
@@ -479,34 +496,39 @@
# sequentialLetters
# Honor or punish the sequential letter use
if self.sequentialLetters["count"] == 0:
- self.sequentialLetters["rating"] = \
- self.sequentialLetters["bonus"] + \
- self.sequentialLetters["count"] * \
+ self.sequentialLetters["rating"] = (
+ self.sequentialLetters["bonus"] +
+ self.sequentialLetters["count"] *
self.sequentialLetters["factor"]
+ )
else:
- self.sequentialLetters["rating"] = \
+ self.sequentialLetters["rating"] = (
self.sequentialLetters["penalty"]
+ )
self.score["count"] += self.sequentialLetters["rating"]
# sequentialNumerics
# Honor or punish the sequential numerics use
if self.sequentialNumerics["count"] == 0:
- self.sequentialNumerics["rating"] = \
- self.sequentialNumerics["bonus"] + \
- self.sequentialNumerics["count"] * \
+ self.sequentialNumerics["rating"] = (
+ self.sequentialNumerics["bonus"] +
+ self.sequentialNumerics["count"] *
self.sequentialNumerics["factor"]
+ )
else:
- self.sequentialNumerics["rating"] = \
+ self.sequentialNumerics["rating"] = (
self.sequentialNumerics["penalty"]
+ )
self.score["count"] += self.sequentialNumerics["rating"]
# keyboardPatterns
# Honor or punish the keyboard patterns use
if self.keyboardPatterns["count"] == 0:
- self.keyboardPatterns["rating"] = \
- self.keyboardPatterns["bonus"] + \
- self.keyboardPatterns["count"] * \
+ self.keyboardPatterns["rating"] = (
+ self.keyboardPatterns["bonus"] +
+ self.keyboardPatterns["count"] *
self.keyboardPatterns["factor"]
+ )
else:
self.keyboardPatterns["rating"] = self.keyboardPatterns["penalty"]
self.score["count"] += self.keyboardPatterns["rating"]
@@ -554,13 +576,15 @@
self.basicRequirements["count"] -
self.basicRequirements["minimum"])
if self.basicRequirements["status"] != self.Status_Failed:
- self.basicRequirements["rating"] = \
- self.basicRequirements["bonus"] + \
- self.basicRequirements["factor"] * \
+ self.basicRequirements["rating"] = (
+ self.basicRequirements["bonus"] +
+ self.basicRequirements["factor"] *
self.basicRequirements["count"]
+ )
else:
- self.basicRequirements["rating"] = \
+ self.basicRequirements["rating"] = (
self.basicRequirements["penalty"]
+ )
self.score["count"] += self.basicRequirements["rating"]
# beyond basic requirements
@@ -589,24 +613,28 @@
# repeatedSequences
# Honor or punish the use of repeated sequences
if self.repeatedSequences["count"] == 0:
- self.repeatedSequences["rating"] = \
+ self.repeatedSequences["rating"] = (
self.repeatedSequences["bonus"]
+ )
else:
- self.repeatedSequences["rating"] = \
- self.repeatedSequences["penalty"] + \
- self.repeatedSequences["count"] * \
+ self.repeatedSequences["rating"] = (
+ self.repeatedSequences["penalty"] +
+ self.repeatedSequences["count"] *
self.repeatedSequences["factor"]
+ )
# mirroredSequences
# Honor or punish the use of mirrored sequences
if self.mirroredSequences["count"] == 0:
- self.mirroredSequences["rating"] = \
+ self.mirroredSequences["rating"] = (
self.mirroredSequences["bonus"]
+ )
else:
- self.mirroredSequences["rating"] = \
- self.mirroredSequences["penalty"] + \
- self.mirroredSequences["count"] * \
+ self.mirroredSequences["rating"] = (
+ self.mirroredSequences["penalty"] +
+ self.mirroredSequences["count"] *
self.mirroredSequences["factor"]
+ )
# save value before redundancy
self.score["beforeRedundancy"] = self.score["count"]
