[wwwsearch-commits] r26690 - in wwwsearch/mechanize/branch/mechanize-0.1.0-devel: . mechanize

jjlee at codespeak.net jjlee at codespeak.net
Wed May 3 00:53:17 CEST 2006 

Author: jjlee
Date: Wed May  3 00:53:15 2006
New Revision: 26690

Modified:
   wwwsearch/mechanize/branch/mechanize-0.1.0-devel/COPYING.txt
   wwwsearch/mechanize/branch/mechanize-0.1.0-devel/INSTALL.txt
   wwwsearch/mechanize/branch/mechanize-0.1.0-devel/README.html.in
   wwwsearch/mechanize/branch/mechanize-0.1.0-devel/mechanize/_html.py
   wwwsearch/mechanize/branch/mechanize-0.1.0-devel/mechanize/_mechanize.py
   wwwsearch/mechanize/branch/mechanize-0.1.0-devel/mechanize/_useragent.py
   wwwsearch/mechanize/branch/mechanize-0.1.0-devel/setup.py
Log:
Explicitly allow ZPL 2.1

Modified: wwwsearch/mechanize/branch/mechanize-0.1.0-devel/COPYING.txt
==============================================================================
--- wwwsearch/mechanize/branch/mechanize-0.1.0-devel/COPYING.txt	(original)
+++ wwwsearch/mechanize/branch/mechanize-0.1.0-devel/COPYING.txt	Wed May  3 00:53:15 2006
@@ -1,4 +1,4 @@
-Copyright (c) 2002-2005 John J. Lee <jjl at pobox.com>
+Copyright (c) 2002-2006 John J. Lee <jjl at pobox.com>
 Copyright (c) 2003 Andy Lester
 
 All rights reserved.
@@ -29,3 +29,28 @@
 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.

Modified: wwwsearch/mechanize/branch/mechanize-0.1.0-devel/INSTALL.txt
==============================================================================
--- wwwsearch/mechanize/branch/mechanize-0.1.0-devel/INSTALL.txt	(original)
+++ wwwsearch/mechanize/branch/mechanize-0.1.0-devel/INSTALL.txt	Wed May  3 00:53:15 2006
@@ -33,11 +33,10 @@
 
 
 Alternatively, just copy the whole mechanize directory 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.  Only copy the ClientCookie directory that's
-inside the distributed tarball / zip archive, not the entire
-mechanize-x.x.x directory!
+Python path (eg. unix: /usr/local/lib/python2.4/site-packages,
+Windows: C:\Python24\Lib\site-packages).  Only copy the mechanize
+directory that's inside the distributed tarball / zip archive, not the
+entire mechanize-x.x.x directory!
 
 
 To run the tests (none of which access the network), run the following
@@ -62,13 +61,13 @@
 
 Copyright Notices
 
-  (C) 2002-2003 John J. Lee.  All rights reserved.
+  (C) 2002-2006 John J. Lee.  All rights reserved.
   (C) 2003 Andy Lester.  All rights reserved.  (Perl code from which
       this module is derived)
 
 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
+May 2006

Modified: wwwsearch/mechanize/branch/mechanize-0.1.0-devel/README.html.in
==============================================================================
--- wwwsearch/mechanize/branch/mechanize-0.1.0-devel/README.html.in	(original)
+++ wwwsearch/mechanize/branch/mechanize-0.1.0-devel/README.html.in	Wed May  3 00:53:15 2006
@@ -422,8 +422,10 @@
      and install them manually, instead &#8211; see the <code>INSTALL.txt</code>
      file (included with the distribution).
   <li>Which license?
-  <p>The <a href="http://www.opensource.org/licenses/bsd-license.php">
-   BSD license</a> (included in distribution).
+  <p>mechanize 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).
 </ul>
 
 <p>I prefer questions and comments to be sent to the <a

Modified: wwwsearch/mechanize/branch/mechanize-0.1.0-devel/mechanize/_html.py
==============================================================================
--- wwwsearch/mechanize/branch/mechanize-0.1.0-devel/mechanize/_html.py	(original)
+++ wwwsearch/mechanize/branch/mechanize-0.1.0-devel/mechanize/_html.py	Wed May  3 00:53:15 2006
@@ -1,3 +1,13 @@
+"""HTML handling.
+
+Copyright 2003-2006 John J. Lee <jjl at pobox.com>
+
+This code is free software; you can redistribute it and/or modify it under
+the terms of the BSD or ZPL 2.1 licenses (see the file COPYING.txt
+included with the distribution).
+
+"""
+
 from __future__ import generators
 
 import re, copy, urllib, htmlentitydefs

Modified: wwwsearch/mechanize/branch/mechanize-0.1.0-devel/mechanize/_mechanize.py
==============================================================================
--- wwwsearch/mechanize/branch/mechanize-0.1.0-devel/mechanize/_mechanize.py	(original)
+++ wwwsearch/mechanize/branch/mechanize-0.1.0-devel/mechanize/_mechanize.py	Wed May  3 00:53:15 2006
@@ -3,9 +3,9 @@
 Copyright 2003-2006 John J. Lee <jjl at pobox.com>
 Copyright 2003 Andy Lester (original Perl code)
 
-This code is free software; you can redistribute it and/or modify it under
-the terms of the BSD License (see the file COPYING included with the
-distribution).
+This code is free software; you can redistribute it and/or modify it
+under the terms of the BSD or ZPL 2.1 licenses (see the file COPYING.txt
+included with the distribution).
 
 """
 

Modified: wwwsearch/mechanize/branch/mechanize-0.1.0-devel/mechanize/_useragent.py
==============================================================================
--- wwwsearch/mechanize/branch/mechanize-0.1.0-devel/mechanize/_useragent.py	(original)
+++ wwwsearch/mechanize/branch/mechanize-0.1.0-devel/mechanize/_useragent.py	Wed May  3 00:53:15 2006
@@ -6,8 +6,8 @@
 Copyright 2003-2006 John J. Lee <jjl at pobox.com>
 
 This code is free software; you can redistribute it and/or modify it under
-the terms of the BSD License (see the file COPYING included with the
-distribution).
+the terms of the BSD or ZPL 2.1 licenses (see the file COPYING.txt
+included with the distribution).
 
 """
 

Modified: wwwsearch/mechanize/branch/mechanize-0.1.0-devel/setup.py
==============================================================================
--- wwwsearch/mechanize/branch/mechanize-0.1.0-devel/setup.py	(original)
+++ wwwsearch/mechanize/branch/mechanize-0.1.0-devel/setup.py	Wed May  3 00:53:15 2006
@@ -45,7 +45,7 @@
     "pullparser>=0.0.8.dev_r21645, ==dev"]
 NAME = "mechanize"
 PACKAGE = True
-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