From: Daira Hopwood <daira@jacaranda.org>
Date: Thu, 5 Sep 2013 18:10:39 +0000 (+0100)
Subject: Sun Oct  9 05:50:23 BST 2011  david-sarah@jacaranda.org
X-Git-Url: https://git.rkrishnan.org/Site/Content/Exhibitors/nxhtml.html?a=commitdiff_plain;h=77d5cc96857d8689ec2a8b2bf82ca4035f075967;p=tahoe-lafs%2Ftahoe-lafs.git

Sun Oct  9 05:50:23 BST 2011  david-sarah@jacaranda.org
  * check-miscaptures.py: handle corner cases around default arguments correctly. Also make a minor optimization when there are no assigned variables to consider. refs #1555
---

diff --git a/misc/coding_tools/check-miscaptures.py b/misc/coding_tools/check-miscaptures.py
index 498d8bc9..39d12a9e 100644
--- a/misc/coding_tools/check-miscaptures.py
+++ b/misc/coding_tools/check-miscaptures.py
@@ -40,7 +40,7 @@ def check_for(ast, results):
     for funcnode in nested:
         # Check for captured variables in this function.
         captured = set()
-        collect_captured(funcnode, declared, captured)
+        collect_captured(funcnode, declared, captured, False)
         for name in captured:
             # We want to report the outermost capturing function
             # (since that is where the workaround will need to be
@@ -76,7 +76,7 @@ def collect_declared_and_nested(ast, declared, nested):
             if isinstance(ast, Node):
                 collect_declared_and_nested(child, declared, nested)
 
-def collect_captured(ast, declared, captured):
+def collect_captured(ast, declared, captured, in_function_yet):
     """Collect any captured variables that are also in declared."""
     if isinstance(ast, Name):
         if ast.name in declared:
@@ -92,17 +92,20 @@ def collect_captured(ast, declared, captured):
                 if argname in declared:
                     del declared[argname]
 
-            for child in childnodes[len(ast.defaults):]:
-                collect_captured(child, declared, captured)
+            if len(new_declared) > 0:
+                for child in childnodes[len(ast.defaults):]:
+                    collect_captured(child, new_declared, captured, True)
 
-            # The default argument expressions are "outside" the
-            # function, even though they are children of the
-            # Lambda or Function node.
+            # The default argument expressions are "outside" *this*
+            # function, even though they are children of the Lambda or
+            # Function node.
+            if not in_function_yet:
+                return
             childnodes = childnodes[:len(ast.defaults)]
 
         for child in childnodes:
             if isinstance(ast, Node):
-                collect_captured(child, declared, captured)
+                collect_captured(child, declared, captured, True)
 
 
 def make_result(funcnode, var_name, var_lineno):