diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-09-23 18:43:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-23 18:43:53 -0700 |
| commit | dc56bc034176d76ce95e9ba7636e3551d51dc897 (patch) | |
| tree | 70c4b3fcf5a89a7b7f6d5e0491e9da793d3cd673 | |
| parent | e433b071fed7dbdf91437b489e261b86288542d8 (diff) | |
| download | git-dc56bc034176d76ce95e9ba7636e3551d51dc897.tar.gz git-dc56bc034176d76ce95e9ba7636e3551d51dc897.tar.xz | |
Further clarify licensing status of compat/subprocess.py.
PSF license explicitly states the files in Python distribution is
compatible with GPL, and upstream clarified the licensing terms by
shortening its file header. This version is a verbatim copy from
release24-maint branch form Python CVS.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | compat/subprocess.py | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/compat/subprocess.py b/compat/subprocess.py index d115e87cc..bbd26c7b0 100644 --- a/compat/subprocess.py +++ b/compat/subprocess.py @@ -2,28 +2,12 @@ # # For more information about this module, see PEP 324. # -# Copyright (c) 2003-2004 by Peter Astrand <astrand@lysator.liu.se> +# This module should remain compatible with Python 2.2, see PEP 291. # -# By obtaining, using, and/or copying this software and/or its -# associated documentation, you agree that you have read, understood, -# and will comply with the following terms and conditions: +# Copyright (c) 2003-2005 by Peter Astrand <astrand@lysator.liu.se> # -# Permission to use, copy, modify, and distribute this software and -# its associated documentation for any purpose and without fee is -# hereby granted, provided that the above copyright notice appears in -# all copies, and that both that copyright notice and this permission -# notice appear in supporting documentation, and that the name of the -# author not be used in advertising or publicity pertaining to -# distribution of the software without specific, written prior -# permission. -# -# THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT OR -# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS -# OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# Licensed to PSF under a Contributor Agreement. +# See http://www.python.org/2.4/license for licensing details. r"""subprocess - Subprocesses with accessible I/O streams |