This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository licensecheck.

commit 231af800655a4e4bd33df6737a184ac8c1cbdda4
Author: Jonas Smedegaard <d...@jones.dk>
Date:   Mon Oct 10 11:23:18 2016 +0200

    Add license pattern python.
---
 lib/App/Licensecheck.pm       |  5 ++-
 lib/Regexp/Pattern/License.pm |  8 +++++
 t/SPDX.t                      |  1 +
 t/SPDX/Python-2.0.txt         | 72 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 83 insertions(+), 3 deletions(-)

diff --git a/lib/App/Licensecheck.pm b/lib/App/Licensecheck.pm
index d6a6f19..44971ca 100755
--- a/lib/App/Licensecheck.pm
+++ b/lib/App/Licensecheck.pm
@@ -58,7 +58,6 @@ See the script for casual usage.
 my %SPDX = (
        'MS-PL'                => 'Ms-PL',
        'public-domain'        => 'Public domain',
-       'Python'               => 'PSF',
 );
 
 my $under_terms_of
@@ -901,8 +900,8 @@ sub parse_license
 
        # Python
        given ($licensetext) {
-               when ( /PYTHON SOFTWARE FOUNDATION LICENSE(?:,? 
$L{re}{version}{-keep})?/i ) {
-                       $gen_license->( 'Python', $1, $2 );
+               when ( /$L{re}{python}(?:,? $L{re}{version}{-keep})?/i ) {
+                       $gen_license->( 'python', $1 );
                }
        }
 
diff --git a/lib/Regexp/Pattern/License.pm b/lib/Regexp/Pattern/License.pm
index a92a2ba..ed00713 100644
--- a/lib/Regexp/Pattern/License.pm
+++ b/lib/Regexp/Pattern/License.pm
@@ -108,6 +108,8 @@ Patterns each covering a single license.
 
 =item * postgresql
 
+=item * python
+
 =item * qpl
 
 =item * sgi_b
@@ -412,6 +414,12 @@ END
                tags => ['mit'],
                pat  => qr/$P{permission_use_fee_agree}/i,
        },
+       python => {
+               name    => 'Python',
+               caption => 'PSF',
+               pat =>
+                       qr/$the?Python Software Foundation License|PYTHON 
SOFTWARE FOUNDATION LICENSE/,
+       },
        qpl => {
                name    => 'QPL',
                summary => '$the?Q Public License',
diff --git a/t/SPDX.t b/t/SPDX.t
index f2588fa..f3625a3 100644
--- a/t/SPDX.t
+++ b/t/SPDX.t
@@ -22,6 +22,7 @@ my %Debian2SPDX = (
        'GPL-2+'       => 'GPL-2.0',
        'LGPL-2+'      => 'LGPL-2.0',
        'LGPL-2.1+'    => 'LGPL-2.1',
+       'Python-2'     => 'Python-2.0',
 );
 
 path("t/SPDX")->visit(
diff --git a/t/SPDX/Python-2.0.txt b/t/SPDX/Python-2.0.txt
new file mode 100644
index 0000000..cc821dc
--- /dev/null
+++ b/t/SPDX/Python-2.0.txt
@@ -0,0 +1,72 @@
+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, 2005, 2006 Python Software 
Foundation; All Rights Reserved"  [...]
+
+     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.
+
+
+BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0 
+
+BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
+
+     1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an 
office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the Individual or 
Organization ("Licensee") accessing and otherwise using this software in source 
or binary form and its associated documentation ("the Software").
+
+     2. Subject to the terms and conditions of this BeOpen Python License 
Agreement, BeOpen hereby grants Licensee a non-exclusive, royalty-free, 
world-wide license to reproduce, analyze, test, perform and/or display 
publicly, prepare derivative works, distribute, and otherwise use the Software 
alone or in any derivative version, provided, however, that the BeOpen Python 
License is retained in the Software, alone or in any derivative version 
prepared by Licensee.
+
+     3. BeOpen is making the Software available to Licensee on an "AS IS" 
basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY 
WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND DISCLAIMS ANY 
REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR 
PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT INFRINGE ANY THIRD PARTY 
RIGHTS.
+
+     4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE 
SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A 
RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY DERIVATIVE 
THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+     5. This License Agreement will automatically terminate upon a material 
breach of its terms and conditions.
+
+     6. This License Agreement shall be governed by and interpreted in all 
respects by the law of the State of California, excluding conflict of law 
provisions. Nothing in this License Agreement shall be deemed to create any 
relationship of agency, partnership, or joint venture between BeOpen and 
Licensee. This License Agreement does not grant permission to use BeOpen 
trademarks or trade names in a trademark sense to endorse or promote products 
or services of Licensee, or any third party [...]
+
+     7. By copying, installing or otherwise using the software, Licensee 
agrees to be bound by the terms and conditions of this License Agreement.
+
+
+CNRI OPEN SOURCE LICENSE AGREEMENT (for Python 1.6b1) 
+
+IMPORTANT: PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY.
+
+BY CLICKING ON "ACCEPT" WHERE INDICATED BELOW, OR BY COPYING, INSTALLING OR 
OTHERWISE USING PYTHON 1.6, beta 1 SOFTWARE, YOU ARE DEEMED TO HAVE AGREED TO 
THE TERMS AND CONDITIONS OF THIS LICENSE AGREEMENT.
+
+     1. This LICENSE AGREEMENT is between the Corporation for National 
Research Initiatives, having an office at 1895 Preston White Drive, Reston, VA 
20191 ("CNRI"), and the Individual or Organization ("Licensee") accessing and 
otherwise using Python 1.6, beta 1 software in source or binary form and its 
associated documentation, as released at the www.python.org Internet site on 
August 4, 2000 ("Python 1.6b1").
+
+     2. Subject to the terms and conditions of this License Agreement, CNRI 
hereby grants Licensee a non-exclusive, royalty-free, world-wide license to 
reproduce, analyze, test, perform and/or display publicly, prepare derivative 
works, distribute, and otherwise use Python 1.6b1 alone or in any derivative 
version, provided, however, that CNRIs License Agreement is retained in Python 
1.6b1, alone or in any derivative version prepared by Licensee.
+
+     Alternately, in lieu of CNRIs License Agreement, Licensee may substitute 
the following text (omitting the quotes): "Python 1.6, beta 1, is made 
available subject to the terms and conditions in CNRIs License Agreement. This 
Agreement may be located on the Internet using the following unique, persistent 
identifier (known as a handle): 1895.22/1011. This Agreement may also be 
obtained from a proxy server on the Internet using the 
URL:http://hdl.handle.net/1895.22/1011";.
+
+     3. In the event Licensee prepares a derivative work that is based on or 
incorporates Python 1.6b1 or any part thereof, and wants to make the derivative 
work available to the public as provided herein, then Licensee hereby agrees to 
indicate in any such work the nature of the modifications made to Python 1.6b1.
+
+     4. CNRI is making Python 1.6b1 available to Licensee on an "AS IS" basis. 
CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF 
EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND DISCLAIMS ANY REPRESENTATION OR 
WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE 
USE OF PYTHON 1.6b1 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
+
+     5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE 
SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A 
RESULT OF USING, MODIFYING OR DISTRIBUTING PYTHON 1.6b1, 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. This License Agreement shall be governed by and interpreted in all 
respects by the law of the State of Virginia, excluding conflict of law 
provisions. Nothing in this License Agreement shall be deemed to create any 
relationship of agency, partnership, or joint venture between CNRI and 
Licensee. This License Agreement does not grant permission to use CNRI 
trademarks or trade name in a trademark sense to endorse or promote products or 
services of Licensee, or any third party.
+
+     8. By clicking on the "ACCEPT" button where indicated, or by copying, 
installing or otherwise using Python 1.6b1, Licensee agrees to be bound by the 
terms and conditions of this License Agreement.
+
+ACCEPT
+
+
+CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2 
+
+Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, The 
Netherlands. All rights reserved.
+
+     Permission to use, copy, modify, and distribute this software and its 
documentation for any purpose and without fee is hereby granted, provided that 
the above copyright notice appear in all copies and that both that copyright 
notice and this permission notice appear in supporting documentation, and that 
the name of Stichting Mathematisch Centrum or CWI not be used in advertising or 
publicity pertaining to distribution of the software without specific, written 
prior permission.
+
+     STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO 
THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, 
IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM 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.
\ No newline at end of file

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-perl/packages/licensecheck.git

_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits

Reply via email to