add Attribute check to count_calls(); fixes #5

Author: ChrisMayfield

CHANGELOG.md

@@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- leaderboard functionality via function attribute (#1)
+- leaderboard functionality via test function (#1)
 - regex auditing (from `jmu_gradescope_utils`)
 - `count_while_loops()` function in audit.py
 - `REQUIREMENTS_TXT` configuration option (#2)
@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - allow students to submit any type of file (#4)
+- `count_calls()` also counts methods (#5)
 
 ### Changed
 

jmu_pytest_utils/audit.py

@@ -69,7 +69,7 @@ def count_calls(filename, func_id):
 
     Args:
         filename (str): The source file to parse.
-        func_id (str): Function name (Ex: "print").
+        func_id (str): Function/method name (Ex: "print").
 
     Returns:
         int: Number of times the function is called.
@@ -81,8 +81,12 @@ def count_calls(filename, func_id):
     count = 0
     for node in ast.walk(tree):
         if isinstance(node, ast.Call):
+            # plain function calls
             if isinstance(node.func, ast.Name) and node.func.id == func_id:
                 count += 1
+            # method/attribute calls
+            if isinstance(node.func, ast.Attribute) and node.func.attr == func_id:
+                count += 1
     return count