Add Python license for two functions

thomasballinger · thomasballinger · commit 246a5ee87b13 · 2015-12-14T17:39:19.000-05:00
diff --git a/LICENSE b/LICENSE
@@ -20,3 +20,55 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 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
+
+PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+--------------------------------------------
+
+1. This LICENSE AGREEMENT is between the Python Software Foundation
+("PSF"), and the Individual or Organization ("Licensee") accessing and
+otherwise using this software ("Python") in source or binary form and
+its associated documentation.
+
+2. Subject to the terms and conditions of this License Agreement, PSF
+hereby grants Licensee a nonexclusive, royalty-free, world-wide
+license to reproduce, analyze, test, perform and/or display publicly,
+prepare derivative works, distribute, and otherwise use Python
+alone or in any derivative version, provided, however, that PSF's
+License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
+2001, 2002, 2003, 2004 Python Software Foundation; All Rights Reserved"
+are retained in Python alone or in any derivative version prepared
+by Licensee.
+
+3. In the event Licensee prepares a derivative work that is based on
+or incorporates Python or any part thereof, and wants to make
+the derivative work available to others as provided herein, then
+Licensee hereby agrees to include in any such work a brief summary of
+the changes made to Python.
+
+4. PSF is making Python available to Licensee on an "AS IS"
+basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+7. Nothing in this License Agreement shall be deemed to create any
+relationship of agency, partnership, or joint venture between PSF and
+Licensee.  This License Agreement does not grant permission to use PSF
+trademarks or trade name in a trademark sense to endorse or promote
+products or services of Licensee, or any third party.
+
+8. By copying, installing or otherwise using Python, Licensee
+agrees to be bound by the terms and conditions of this License
+Agreement.
diff --git a/bpython/simpleeval.py b/bpython/simpleeval.py
@@ -1,4 +1,27 @@
 # encoding: utf-8
+
+# The MIT License
+#
+# Copyright (c) 2015 the bpython authors.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
 """simple evaluation of side-effect free code
 
 In order to provide fancy completion, some code can be executed safely.
@@ -26,6 +49,16 @@ def safe_eval(expr, namespace):
         raise EvaluationError
 
 
+# This function is under the Python License, Version 2
+# This license requires modifications to the code be reported.
+# Based on ast.literal_eval in Python 2 and Python 3
+# Modifications:
+# * Python 2 and Python 3 versions of the function are combined
+# * checks that objects used as operands of + and - are numbers
+#   instead of checking they are constructed with number literals
+# * new docstring describing different functionality
+# * looks up names from namespace
+# * indexing syntax is allowed
 def simple_eval(node_or_string, namespace=None):
     """
     Safely evaluate an expression node or a string containing a Python
@@ -40,7 +73,6 @@ def simple_eval(node_or_string, namespace=None):
 
     The optional namespace dict-like ought not to cause side effects on lookup
     """
-    # Based heavily on stdlib ast.literal_eval
     if namespace is None:
         namespace = {}
     if isinstance(node_or_string, string_types):
@@ -118,11 +150,18 @@ 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):
-    """Based on ast.NodeVisitor"""
+    """Search depth-first for getitem indexing with name"""
     if isinstance(node, ast.Attribute) and node.attr == name:
         return node
-    for field, value in ast.iter_fields(node):
+    for _, value in ast.iter_fields(node):
         if isinstance(value, list):
             for item in value:
                if isinstance(item, ast.AST):
@@ -134,7 +173,6 @@ def find_attribute_with_name(node, name):
             if r:
                 return r
 
-
 def evaluate_current_expression(cursor_offset, line, namespace=None):
     """
     Return evaluated expression to the right of the dot of current attribute.
