completed Day 2 part 2

Author: matthew-js-porter

day2/README.txt

@@ -16,4 +16,18 @@ Each line gives the password policy and then the password. The password policy i
 
 In the above example, 2 passwords are valid. The middle password, cdefg, is not; it contains no instances of b, but needs at least 1. The first and third passwords are valid: they contain one a or nine c, both within the limits of their respective policies.
 
-How many passwords are valid according to their policies?
+How many passwords are valid according to their policies?
+
+--- Part Two ---
+While it appears you validated the passwords correctly, they don't seem to be what the Official Toboggan Corporate Authentication System is expecting.
+
+The shopkeeper suddenly realizes that he just accidentally explained the password policy rules from his old job at the sled rental place down the street! The Official Toboggan Corporate Policy actually works a little differently.
+
+Each policy actually describes two positions in the password, where 1 means the first character, 2 means the second character, and so on. (Be careful; Toboggan Corporate Policies have no concept of "index zero"!) Exactly one of these positions must contain the given letter. Other occurrences of the letter are irrelevant for the purposes of policy enforcement.
+
+Given the same example list from above:
+
+1-3 a: abcde is valid: position 1 contains a and position 3 does not.
+1-3 b: cdefg is invalid: neither position 1 nor position 3 contains b.
+2-9 c: ccccccccc is invalid: both position 2 and position 9 contain c.
+How many passwords are valid according to the new interpretation of the policies?

day2/password.py

@@ -1,16 +1,17 @@
 import re
 
 
-def is_valid(password: str, policy_character, min: int, max: int) -> bool:
-    return min <= len(re.findall(policy_character, password)) <= max
+def is_valid(password: str, policy_character, first: int, second: int) -> bool:
+    return (password[first-1] == policy_character) != (password[second-1] == policy_character)
+
 
 def is_valid_policy(password_policy: str) -> bool:
     policy_attributes = password_policy.split()
-    min = int(policy_attributes[0].split("-")[0])
-    max = int(policy_attributes[0].split("-")[1])
+    first = int(policy_attributes[0].split("-")[0])
+    second = int(policy_attributes[0].split("-")[1])
     policy_character = policy_attributes[1].replace(":", "")
     password = policy_attributes[2]
-    return is_valid(password, policy_character, min, max)
+    return is_valid(password, policy_character, first, second)
 
 
 if __name__ == '__main__':

day2/test_password.py

@@ -7,23 +7,23 @@ class MyTestCase(unittest.TestCase):
     def test_valid_password(self):
         policy_character = 'a'
         user_password = 'abcde'
-        min = 1
-        max = 3
-        self.assertTrue(password.is_valid(user_password, policy_character, min, max))
+        first = 1
+        second = 3
+        self.assertTrue(password.is_valid(user_password, policy_character, first, second))
 
     def test_invalid_password(self):
         policy_character = 'b'
         user_password = 'cdefg'
-        min = 1
-        max = 3
-        self.assertFalse(password.is_valid(user_password, policy_character, min, max))
+        first = 1
+        second = 3
+        self.assertFalse(password.is_valid(user_password, policy_character, first, second))
 
     def test_valid_same_char(self):
         policy_character = 'c'
         user_password = 'ccccccccc'
-        min = 2
-        max = 9
-        self.assertTrue(password.is_valid(user_password, policy_character, min, max))
+        first = 2
+        second = 9
+        self.assertFalse(password.is_valid(user_password, policy_character, first, second))
 
     def test_valid_policy(self):
         policy = '1-3 a: abcde'