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>
Junio C Hamano committed
Sep 23, 2005 at 18:43 UTC
dc56bc034176d76ce95e9ba7636e3551d51dc897
1 file changed
+4
-20
compat/subprocess.py
+4
-20
@@ -2,28 +2,12 @@
2
#
3
# For more information about this module, see PEP 324.
4
#
5
-# Copyright (c) 2003-2004 by Peter Astrand <astrand@lysator.liu.se>
5
+# This module should remain compatible with Python 2.2, see PEP 291.
6
#
7
-# By obtaining, using, and/or copying this software and/or its
8
-# associated documentation, you agree that you have read, understood,
9
-# and will comply with the following terms and conditions:
7
+# Copyright (c) 2003-2005 by Peter Astrand <astrand@lysator.liu.se>
8
#
11
-# Permission to use, copy, modify, and distribute this software and
12
-# its associated documentation for any purpose and without fee is
13
-# hereby granted, provided that the above copyright notice appears in
14
-# all copies, and that both that copyright notice and this permission
15
-# notice appear in supporting documentation, and that the name of the
16
-# author not be used in advertising or publicity pertaining to
17
-# distribution of the software without specific, written prior
18
-# permission.
19
-#
20
-# THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
21
-# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
22
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT OR
23
-# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
24
-# OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
25
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
26
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
9
+# Licensed to PSF under a Contributor Agreement.
10
+# See http://www.python.org/2.4/license for licensing details.
11
12
r"""subprocess - Subprocesses with accessible I/O streams
13