Replace copied code with original code

thomasballinger · thomasballinger · commit c86f222da5bf · 2015-12-14T17:39:19.000-05:00
diff --git a/LICENSE b/LICENSE
@@ -21,8 +21,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 
-Two functions in bpython/simpleeval.py are licensed under the
-Python Software Foundation License version 2: simple_eval and find_attribute_with_name
+One function in bpython/simpleeval.py is licensed under the
+Python Software Foundation License version 2: simple_eval
 
 PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
 --------------------------------------------
diff --git a/bpython/simpleeval.py b/bpython/simpleeval.py
@@ -155,28 +155,14 @@ def safe_getitem(obj, index):
     raise ValueError('unsafe to lookup on object of type %s' % (type(obj), ))
 
 
-# This function is under the Python License, Version 2
-# This license requires modifications to the code be reported.
-# Based on ast.NodeVisitor.generic_visit
-# Modifications:
-# * Now a standalone function instead of method
-# * now hardcoded to look for Attribute node with given attr name
-# * returns values back up the recursive call stack to stop once target found
 def find_attribute_with_name(node, name):
-    """Search depth-first for getitem indexing with name"""
     if isinstance(node, ast.Attribute) and node.attr == name:
         return node
-    for _, value in ast.iter_fields(node):
-        if isinstance(value, list):
-            for item in value:
-               if isinstance(item, ast.AST):
-                    r = find_attribute_with_name(item, name)
-                    if r:
-                        return r
-        elif isinstance(value, ast.AST):
-            r = find_attribute_with_name(value, name)
-            if r:
-                return r
+    for item in ast.iter_child_nodes(node):
+        r = find_attribute_with_name(item, name)
+        if r:
+            return r
+
 
 def evaluate_current_expression(cursor_offset, line, namespace=None):
     """
