formatting and cosmetic updates to 2020.

2020/days/02/day2.py

@@ -1,40 +1,52 @@
 #! /usr/bin/env python3
 
 import pathlib
-import sys
 import re
+import sys
 from dataclasses import dataclass
 
+
 @dataclass
 class PasswordSpec:
-    first:int
-    second:int
-    letter:str
-    password:str
+    first: int
+    second: int
+    letter: str
+    password: str
+
 
 def parse(puzzle_input: str):
     """Parse input"""
-    regex = re.compile(r'^(\d+)-(\d+) (\w): (\w+)$')
-    toInt = lambda x: PasswordSpec(int(x[0]), int(x[1]), x[2], x[3])
+    regex = re.compile(r"^(\d+)-(\d+) (\w): (\w+)$")
+
+    def toInt(x):
+        return PasswordSpec(int(x[0]), int(x[1]), x[2], x[3])
+
     return [toInt(regex.match(i).groups()) for i in puzzle_input.splitlines()]
 
+
 def part1(data):
     """Solve part 1"""
-    test = lambda x: x.first<=x.password.count(x.letter)<=x.second
+
+    def test(x):
+        return x.first <= x.password.count(x.letter) <= x.second
+
     # these two lines are equivilant.
     # return sum(1 for p in data if test(p))
     return len([1 for p in data if test(p)])
 
+
 def test_password(passwordSpec: PasswordSpec):
-    if passwordSpec.password[passwordSpec.first-1]==passwordSpec.letter:
-        return passwordSpec.password[passwordSpec.second-1]!=passwordSpec.letter
+    if passwordSpec.password[passwordSpec.first - 1] == passwordSpec.letter:
+        return passwordSpec.password[passwordSpec.second - 1] != passwordSpec.letter
     else:
-        return passwordSpec.password[passwordSpec.second-1]==passwordSpec.letter
+        return passwordSpec.password[passwordSpec.second - 1] == passwordSpec.letter
+
 
 def part2(data):
     """Solve part 2"""
     return sum(1 for p in data if test_password(p))
 
+
 def solve(puzzle_input):
     """Solve the puzzle for the given input"""
     data = parse(puzzle_input)
@@ -43,6 +55,7 @@ def solve(puzzle_input):
 
     return solution1, solution2
 
+
 if __name__ == "__main__":
     for path in sys.argv[1:]:
         print(f"{path}:")

2020/days/02/test_day2.py

@@ -6,32 +6,28 @@ import day2 as aoc
 
 PUZZLE_DIR = pathlib.Path(__file__).parent
 
-#these test fixtures setup the test, mainly by reading the filename into a string in this simple case.
+
+# these test fixtures setup the test, mainly by reading the filename into a string in this simple case.
 @pytest.fixture
-def example1():
-    puzzle_input = (PUZZLE_DIR / "example1").read_text().strip()
+def example():
+    puzzle_input = (PUZZLE_DIR / "example").read_text().strip()
     return aoc.parse(puzzle_input)
 
-@pytest.fixture
-def example2():
-    puzzle_input = (PUZZLE_DIR / "example2").read_text().strip()
-    return aoc.parse(puzzle_input)
 
-# @pytest.mark.skip(reason="Not implemented")
-def test_parse_example1(example1):
+def test_parse(example):
     """Test that input is parsed properly"""
-    assert example1 == [
-            aoc.PasswordSpec(first=1, second=3, letter='a', password='abcde'),
-            aoc.PasswordSpec(first=1, second=3, letter='b', password='cdefg'),
-            aoc.PasswordSpec(first=2, second=9, letter='c', password='ccccccccc')
-            ]
+    assert example == [
+        aoc.PasswordSpec(first=1, second=3, letter="a", password="abcde"),
+        aoc.PasswordSpec(first=1, second=3, letter="b", password="cdefg"),
+        aoc.PasswordSpec(first=2, second=9, letter="c", password="ccccccccc"),
+    ]
 
-# @pytest.mark.skip(reason="Not implemented")
-def test_part1_example1(example1):
+
+def test_part1(example):
     """Test part 1 on example input"""
-    assert aoc.part1(example1) == 2
+    assert aoc.part1(example) == 2
 
-# @pytest.mark.skip(reason="Not implemented")
-def test_part2_example2(example1):
+
+def test_part2(example):
     """Test part 2 on example input"""
-    assert aoc.part2(example1) == 1
+    assert aoc.part2(example) == 1