Ver Fonte

We no longer ship with elementtree, meld3, or medusa.

Chris McDonough há 18 anos atrás
pai
commit
b88a45da0b
2 ficheiros alterados com 14 adições e 68 exclusões
  1. 13 6
      COPYRIGHT.txt
  2. 1 62
      LICENSES.txt

+ 13 - 6
COPYRIGHT.txt

@@ -1,4 +1,4 @@
-Supervisor and meld3 are Copyright (c) 2007 Agendaless Consulting. 
+Supervisor is Copyright (c) 2007 Agendaless Consulting.
 (http://www.agendaless.com), All Rights Reserved
 (http://www.agendaless.com), All Rights Reserved
 
 
   This software is subject to the provisions of the Zope Public License, 
   This software is subject to the provisions of the Zope Public License, 
@@ -8,10 +8,17 @@ Supervisor and meld3 are Copyright (c) 2007 Agendaless Consulting.
   WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS 
   WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS 
   FOR A PARTICULAR PURPOSE. 
   FOR A PARTICULAR PURPOSE. 
 
 
-medusa was (is?) Copyright (c) Sam Rushing.
-
-ElementTree is Copyright (c) 1999-2005 by Secret Labs AB, Copyright
-(c) 1999-2005 by Fredrik Lundh
-
 http_client.py code Copyright (c) by Daniel Krech, http://eikeon.com/.
 http_client.py code Copyright (c) by Daniel Krech, http://eikeon.com/.
 
 
+  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.
+

+ 1 - 62
LICENSES.txt

@@ -1,5 +1,4 @@
-Supervisor and meld3 are licensed under the Zope Public License (ZPL)
-2.1 :
+Supervisor is licensed under the Zope Public License (ZPL) 2.1 :
 
 
   A copyright notice accompanies this license document that identifies
   A copyright notice accompanies this license document that identifies
   the copyright holders.
   the copyright holders.
@@ -48,66 +47,6 @@ Supervisor and meld3 are licensed under the Zope Public License (ZPL)
     THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
     THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
     SUCH DAMAGE.
     SUCH DAMAGE.
 
 
-Medusa, the asynchronous communications framework upon which
-supervisor's server and client code is based, was created by Sam
-Rushing:
-
-  Medusa was once distributed under a 'free for non-commercial use'
-  license, but in May of 2000 Sam Rushing changed the license to be
-  identical to the standard Python license at the time.  The standard
-  Python license has always applied to the core components of Medusa,
-  this change just frees up the rest of the system, including the http
-  server, ftp server, utilities, etc.  Medusa is therefore under the
-  following license:
-
-  ============================== 
-  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 Sam Rushing not be
-  used in advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  SAM RUSHING DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
-  NO EVENT SHALL SAM RUSHING 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.
-  ==============================
-
-ElementTree, by Frederik Lundh, which ships with Supervisor is
-licensed as follows:
-
-  The ElementTree package and the cElementTree accelerator are:
-
-  Copyright (c) 1999-2005 by Secret Labs AB
-  Copyright (c) 1999-2005 by Fredrik Lundh
-
-  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:
-
-  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
-  Secret Labs AB or the author not be used in advertising or publicity
-  pertaining to distribution of the software without specific, written
-  prior permission.
-
-  SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
-  TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL SECRET LABS AB OR
-  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.
-
 http_client.py code is based on code by Daniel Krech, which was
 http_client.py code is based on code by Daniel Krech, which was
 released under this license:
 released under this license: