Merge branch '2025/x' into inheritance-checks-fixes

Author: rongxin-liu

finance/.cs50.yml

@@ -4,6 +4,7 @@ check50:
   files: &check50_files
     - !exclude "*.pyc"
     - !exclude __pycache__
+    - !exclude venv
     - !require app.py
     - !require finance.db
     - !require helpers.py

finance/__init__.py

@@ -30,7 +30,7 @@ def register_page():
 
 @check50.check(register_page)
 def simple_register():
-    """registering user succeeds and portfolio page is displayed"""
+    """registering user succeeds (and login or portfolio page is displayed)"""
     Finance().register("_cs50", "ohHai28!", "ohHai28!").status(200)
 
 
@@ -247,4 +247,4 @@ def validate_form(self, route, fields, field_tag="input"):
         return self
 
     def page_exists(self, route):
-        return self.get(route).status() == 200
+        return self.get(route).status() == 200

finance/lookup.py

@@ -1,10 +1,10 @@
 def lookup(symbol):
     symbol = symbol.upper()
     if (symbol == "AAAA"):
-        return {"price": 28.00, "symbol": "AAAA"}
+        return {"name": "AAAA stock", "price": 28.00, "symbol": "AAAA"}
     elif (symbol == "BBBB"):
-        return {"price": 14.00, "symbol": "BBBB"}
+        return {"name": "BBBB stock", "price": 14.00, "symbol": "BBBB"}
     elif (symbol == "CCCC"):
-        return {"price": 2000.00, "symbol": "CCCC"}
+        return {"name": "CCCC stock", "price": 2000.00, "symbol": "CCCC"}
     else:
         return None

inheritance/__init__.py

@@ -18,7 +18,7 @@ def compiles():
 def compiles_test():
     """inheritance compiles"""
     check50.c.compile("inheritance.c", lcs50=True)
-    inheritance = re.sub(r"int\s+main", "int distro_main", open("inheritance.c").read())
+    inheritance = re.sub(r"int\s+main\(", "int distro_main(", open("inheritance.c").read())
     testing = open("testing.c").read()
     with open("inheritance_test.c", "w") as f:
         f.write(inheritance)

movies/__init__.py

@@ -125,7 +125,6 @@ def test9():
             "Rupert Grint",
             "Daniel Radcliffe",
             "Emma Watson",
-            "Emma Watson",
         ],
         ordered=True,
     )
@@ -222,6 +221,7 @@ def check_single_col(actual, expected, ordered=False):
     # Get data from column
     try:
         result = [str(list(row.values())[0]) for row in actual]
+        result = result if ordered else set(result)
     except IndexError:
         return None
 
@@ -230,8 +230,7 @@ def check_single_col(actual, expected, ordered=False):
 
     # If unordered, sort both before checking
     if not ordered:
-        result.sort()
-        expected.sort()
+        expected = set(expected)
 
     if result != expected:
         raise check50.Mismatch("\n".join(expected), "\n".join(list(result)))

movies/movies.db

@@ -14,7 +14,7 @@ def exists():
 def compiles():
     """plurality compiles"""
     check50.c.compile("plurality.c", lcs50=True)
-    plurality = re.sub("int\s+main", "int distro_main", open("plurality.c").read())
+    plurality = re.sub(r"int\s+main\(", "int distro_main(", open("plurality.c").read())
     testing = open("testing.c").read()
     with open("plurality_test.c", "w") as f:
         f.write(plurality)
@@ -128,4 +128,4 @@ def check_winner(result, correct):
         else:
             help = "did you forget the newline after the name?"
 
-    raise check50.Mismatch(correct, result, help=help)
+    raise check50.Mismatch(correct, result, help=help)

plurality/__init__.py

@@ -14,7 +14,7 @@ def exists():
 def compiles():
     """runoff compiles"""
     check50.c.compile("runoff.c", lcs50=True)
-    runoff = re.sub("int\s+main", "int distro_main", open("runoff.c").read())
+    runoff = re.sub(r"int\s+main\(", "int distro_main(", open("runoff.c").read())
     testing = open("testing.c").read()
     with open("runoff_test.c", "w") as f:
         f.write(runoff)

runoff/__init__.py

@@ -14,7 +14,7 @@ def exists():
 def compiles():
     """tideman compiles"""
     check50.c.compile("tideman.c", lcs50=True)
-    tideman = re.sub("int\s+main", "int distro_main", open("tideman.c").read())
+    tideman = re.sub(r"int\s+main\(", "int distro_main(", open("tideman.c").read())
     testing = open("testing.c").read()
     with open("tideman_test.c", "w") as f:
         f.write(tideman)

tideman/__init__.py

@@ -19,7 +19,7 @@ def compiles():
     check50.c.compile("wordle.c", lcs50=True)
 
     # Rename main function to "distro_main"
-    wordle = re.sub("int\s+main", "int distro_main", open("wordle.c").read())
+    wordle = re.sub(r"int\s+main\(", "int distro_main(", open("wordle.c").read())
 
     # Read testing file
     testing = open("testing.c").read()
@@ -99,7 +99,7 @@ def partial_match_repeat_letter():
     """wordle recognizes guess with a repeat letter"""
     for word in ["joust", "pines", "links"]:
         check50.c.run(f"./wordle_test check_word grass {word}").stdout(3)
-        
+
 @check50.check(compiles)
 def partial_multiple_matches():
     """wordle recognizes guess with multiple matches"""