[wwwsearch-commits] r25578 - wwwsearch/pullparser/trunk
jjlee at codespeak.net
jjlee at codespeak.net
Sat Apr 8 20:05:32 CEST 2006
Author: jjlee
Date: Sat Apr 8 20:05:30 2006
New Revision: 25578
Added:
wwwsearch/pullparser/trunk/COPYING.txt
- copied, changed from r25552, wwwsearch/pullparser/trunk/COPYING
Removed:
wwwsearch/pullparser/trunk/COPYING
Modified:
wwwsearch/pullparser/trunk/INSTALL
wwwsearch/pullparser/trunk/MANIFEST.in
wwwsearch/pullparser/trunk/README.html.in
wwwsearch/pullparser/trunk/pullparser.py
wwwsearch/pullparser/trunk/setup.py
Log:
Explicitly allow ZPL 2.1; Update some copyright dates &c
Deleted: /wwwsearch/pullparser/trunk/COPYING
==============================================================================
--- /wwwsearch/pullparser/trunk/COPYING Sat Apr 8 20:05:30 2006
+++ (empty file)
@@ -1,31 +0,0 @@
-Copyright (c) 2002-2005 John J. Lee <jjl at pobox.com>
-Copyright (c) 1998-2001 Gisle Aas (original libwww-perl code)
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-Neither the name of the contributors nor the names of their employers
-may be used to endorse or promote products derived from this software
-without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Copied: wwwsearch/pullparser/trunk/COPYING.txt (from r25552, wwwsearch/pullparser/trunk/COPYING)
==============================================================================
--- wwwsearch/pullparser/trunk/COPYING (original)
+++ wwwsearch/pullparser/trunk/COPYING.txt Sat Apr 8 20:05:30 2006
@@ -1,6 +1,65 @@
-Copyright (c) 2002-2005 John J. Lee <jjl at pobox.com>
+Copyright (c) 2002-2006 John J. Lee <jjl at pobox.com>
Copyright (c) 1998-2001 Gisle Aas (original libwww-perl code)
+This software is dual-licensed: you may pick either of the licenses
+below.
+
+
+BSD-style license
+==================
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+Neither the name of the contributors nor the names of their employers
+may be used to endorse or promote products derived from this software
+without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
+
+ZPL 2.1
+==================
+
+Zope Public License (ZPL) Version 2.1
+
+A copyright notice accompanies this license document that identifies the copyright holders.
+
+This license has been certified as open source. It has also been designated as GPL compatible by the Free Software Foundation (FSF).
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions in source code must retain the accompanying copyright notice, this list of conditions, and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the accompanying copyright notice, this list of conditions, and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ 3. Names of the copyright holders must not be used to endorse or promote products derived from this software without prior written permission from the copyright holders.
+ 4. The right to distribute this software or to use it for any purpose does not give you the right to use Servicemarks (sm) or Trademarks (tm) of the copyright holders. Use of them is covered by separate agreement with the copyright holders.
+ 5. If any files are modified, you must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
+
+Disclaimer
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
All rights reserved.
Redistribution and use in source and binary forms, with or without
Modified: wwwsearch/pullparser/trunk/INSTALL
==============================================================================
--- wwwsearch/pullparser/trunk/INSTALL (original)
+++ wwwsearch/pullparser/trunk/INSTALL Sat Apr 8 20:05:30 2006
@@ -21,9 +21,8 @@
Alternatively, just copy pullparser.py into your Python path
-(eg. unix: /usr/local/lib/python2.2/site-packages, Windows:
-C:\Python21, or C:\Python22\Lib\site-packages). That's all that
-setup.py does.
+(eg. unix: /usr/local/lib/python2.4/site-packages, Windows:
+C:\Python24\Lib\site-packages).
To run the tests (none of which access the network), run the following
@@ -48,12 +47,12 @@
Copyright Notices
- (C) 2002-2003 John J. Lee. All rights reserved.
+ (C) 2002-2006 John J. Lee. All rights reserved.
(C) 1998-2001 Gisle Aas. All rights reserved. (Original LWP code)
This code in this package is free software; you can redistribute it
-and/or modify it under the terms of the BSD license (see the file
-COPYING).
+and/or modify it under the terms of the BSD or ZPL 2.1 licenses (see
+the file COPYING.txt).
John J. Lee <jjl at pobox.com>
-December 2003
+April 2006
Modified: wwwsearch/pullparser/trunk/MANIFEST.in
==============================================================================
--- wwwsearch/pullparser/trunk/MANIFEST.in (original)
+++ wwwsearch/pullparser/trunk/MANIFEST.in Sat Apr 8 20:05:30 2006
@@ -5,5 +5,5 @@
include README.html.in
include README.html
include README.txt
-include ChangeLog
+include ChangeLog.txt
include *.py
Modified: wwwsearch/pullparser/trunk/README.html.in
==============================================================================
--- wwwsearch/pullparser/trunk/README.html.in (original)
+++ wwwsearch/pullparser/trunk/README.html.in Sat Apr 8 20:05:30 2006
@@ -108,8 +108,10 @@
<li>Which version of Python do I need?
<p>2.2.1 or above.
<li>Which license?
- <p>The <a href="http://www.opensource.org/licenses/bsd-license.php">
- BSD license</a> (included in distribution).
+ <p>pullparser is dual-licensed: you may pick either the
+ <a href="http://www.opensource.org/licenses/bsd-license.php">BSD license</a>,
+ or the <a href="http://www.zope.org/Resources/ZPL">ZPL 2.1</a> (both are
+ included in the distribution).
<li>Why does it fail to parse my HTML?
<p>Because module <code>HTMLParser</code> is fussy. Try
<code>pullparser.TolerantPullParser</code> instead, which uses module
Modified: wwwsearch/pullparser/trunk/pullparser.py
==============================================================================
--- wwwsearch/pullparser/trunk/pullparser.py (original)
+++ wwwsearch/pullparser/trunk/pullparser.py Sat Apr 8 20:05:30 2006
@@ -29,7 +29,7 @@
Copyright 1998-2001 Gisle Aas (original libwww-perl code)
This code is free software; you can redistribute it and/or modify it
-under the terms of the BSD License.
+under the terms of the BSD or ZPL 2.1 licenses.
"""
Modified: wwwsearch/pullparser/trunk/setup.py
==============================================================================
--- wwwsearch/pullparser/trunk/setup.py (original)
+++ wwwsearch/pullparser/trunk/setup.py Sat Apr 8 20:05:30 2006
@@ -45,7 +45,7 @@
INSTALL_REQUIRES = []
NAME = "pullparser"
PACKAGE = False
-LICENSE = "BSD"
+LICENSE = "BSD" # or ZPL 2.1
PLATFORMS = ["any"]
ZIP_SAFE = True
CLASSIFIERS = """\
@@ -53,6 +53,7 @@
Intended Audience :: Developers
Intended Audience :: System Administrators
License :: OSI Approved :: BSD License
+License :: OSI Approved :: Zope Public License
Natural Language :: English
Operating System :: OS Independent
Programming Language :: Python
More information about the wwwsearch-commits
mailing list