[Python-checkins] CVS: python/dist/src/Modules Setup.dist,1.25,1.26 cPickle.c,2.79,2.80 cStringIO.c,2.33,2.34 operator.c,2.19,2.20
Guido van Rossum
gvanrossum@users.sourceforge.net
Thu, 04 Apr 2002 09:52:53 -0800
Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv7804/Modules
Modified Files:
Setup.dist cPickle.c cStringIO.c operator.c
Log Message:
Removed old Digital Creations copyright/license notices (with
permission from Paul Everitt). Also removed a few other references to
Digital Creations and changed the remaining ones to Zope Corporation.
Index: Setup.dist
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/Setup.dist,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Setup.dist 16 Feb 2002 18:23:30 -0000 1.25
--- Setup.dist 4 Apr 2002 17:52:50 -0000 1.26
***************
*** 411,415 ****
#parser parsermodule.c
! # Digital Creations' cStringIO and cPickle
#cStringIO cStringIO.c
#cPickle cPickle.c
--- 411,415 ----
#parser parsermodule.c
! # cStringIO and cPickle
#cStringIO cStringIO.c
#cPickle cPickle.c
Index: cPickle.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/cPickle.c,v
retrieving revision 2.79
retrieving revision 2.80
diff -C2 -d -r2.79 -r2.80
*** cPickle.c 3 Apr 2002 22:41:50 -0000 2.79
--- cPickle.c 4 Apr 2002 17:52:50 -0000 2.80
***************
*** 1,50 ****
- /*
- * cPickle.c,v 1.71 1999/07/11 13:30:34 jim Exp
- *
- * Copyright (c) 1996-1998, Digital Creations, Fredericksburg, VA, USA.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * o Redistributions of source code must retain the above copyright
- * notice, this list of conditions, and the disclaimer that follows.
- *
- * o 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.
- *
- * o Neither the name of Digital Creations nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- *
- * THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS 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 DIGITAL
- * CREATIONS 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.
- *
- #
- # If you have questions regarding this software, contact:
- #
- # Digital Creations, L.C.
- # 910 Princess Ann Street
- # Fredericksburge, Virginia 22401
- #
- # info@digicool.com
- #
- # (540) 371-6909
- */
-
static char cPickle_module_documentation[] =
"C implementation and optimization of the Python pickle module\n"
--- 1,2 ----
Index: cStringIO.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/cStringIO.c,v
retrieving revision 2.33
retrieving revision 2.34
diff -C2 -d -r2.33 -r2.34
*** cStringIO.c 8 Mar 2002 17:17:33 -0000 2.33
--- cStringIO.c 4 Apr 2002 17:52:50 -0000 2.34
***************
*** 1,55 ****
- /*
- * cStringIO.c,v 1.29 1999/06/15 14:10:27 jim Exp
- *
- * Copyright (c) 1996-1998, Digital Creations, Fredericksburg, VA, USA.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * o Redistributions of source code must retain the above copyright
- * notice, this list of conditions, and the disclaimer that follows.
- *
- * o 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.
- *
- * o All advertising materials mentioning features or use of this
- * software must display the following acknowledgement:
- *
- * This product includes software developed by Digital Creations
- * and its contributors.
- *
- * o Neither the name of Digital Creations nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- *
- * THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS 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 DIGITAL
- * CREATIONS 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.
- *
- #
- # If you have questions regarding this software, contact:
- #
- # Digital Creations, L.C.
- # 910 Princess Ann Street
- # Fredericksburge, Virginia 22401
- #
- # info@digicool.com
- #
- # (540) 371-6909
- */
static char cStringIO_module_documentation[] =
"A simple fast partial StringIO replacement.\n"
--- 1,2 ----
Index: operator.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/operator.c,v
retrieving revision 2.19
retrieving revision 2.20
diff -C2 -d -r2.19 -r2.20
*** operator.c 3 Apr 2002 22:41:50 -0000 2.19
--- operator.c 4 Apr 2002 17:52:50 -0000 2.20
***************
*** 9,71 ****
";
- /*
-
- Copyright
-
- Copyright 1996 Digital Creations, L.C., 910 Princess Anne
- Street, Suite 300, Fredericksburg, Virginia 22401 U.S.A. All
- rights reserved. Copyright in this software is owned by DCLC,
- unless otherwise indicated. Permission to use, copy and
- distribute this software is hereby granted, provided that the
- above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear. Note that
- any product, process or technology described in this software
- may be the subject of other Intellectual Property rights
- reserved by Digital Creations, L.C. and are not licensed
- hereunder.
-
- Trademarks
-
- Digital Creations & DCLC, are trademarks of Digital Creations, L.C..
- All other trademarks are owned by their respective companies.
-
- No Warranty
-
- The software is provided "as is" without warranty of any kind,
- either express or implied, including, but not limited to, the
- implied warranties of merchantability, fitness for a particular
- purpose, or non-infringement. This software could include
- technical inaccuracies or typographical errors. Changes are
- periodically made to the software; these changes will be
- incorporated in new editions of the software. DCLC may make
- improvements and/or changes in this software at any time
- without notice.
-
- Limitation Of Liability
-
- In no event will DCLC be liable for direct, indirect, special,
- incidental, economic, cover, or consequential damages arising
- out of the use of or inability to use this software even if
- advised of the possibility of such damages. Some states do not
- allow the exclusion or limitation of implied warranties or
- limitation of liability for incidental or consequential
- damages, so the above limitation or exclusion may not apply to
- you.
-
-
- If you have questions regarding this software,
- contact:
-
- Jim Fulton, jim@digicool.com
- Digital Creations L.C.
-
- (540) 371-6909
-
- Modifications
-
- Renamed and slightly rearranged by Guido van Rossum
-
- */
-
#include "Python.h"
--- 9,12 ----