diff options
author | Guido van Rossum <guido@python.org> | 2002-04-04 17:52:50 (GMT) |
---|---|---|
committer | Guido van Rossum <guido@python.org> | 2002-04-04 17:52:50 (GMT) |
commit | 2e1c09c1fd06531a3ce1de5b12ec5c8f771e78e0 (patch) | |
tree | 436279d8d74b9d759f890ee3c8378e8d6e28d80e /Modules | |
parent | bfc2e5ee8ec66fb483e595eed16d49b75eb7e482 (diff) | |
download | cpython-2e1c09c1fd06531a3ce1de5b12ec5c8f771e78e0.zip cpython-2e1c09c1fd06531a3ce1de5b12ec5c8f771e78e0.tar.gz cpython-2e1c09c1fd06531a3ce1de5b12ec5c8f771e78e0.tar.bz2 |
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.
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/Setup.dist | 2 | ||||
-rw-r--r-- | Modules/cPickle.c | 48 | ||||
-rw-r--r-- | Modules/cStringIO.c | 53 | ||||
-rw-r--r-- | Modules/operator.c | 59 |
4 files changed, 1 insertions, 161 deletions
diff --git a/Modules/Setup.dist b/Modules/Setup.dist index df8176b..6a49752 100644 --- a/Modules/Setup.dist +++ b/Modules/Setup.dist @@ -410,7 +410,7 @@ GLHACK=-Dclear=__GLclear # Fred Drake's interface to the Python parser #parser parsermodule.c -# Digital Creations' cStringIO and cPickle +# cStringIO and cPickle #cStringIO cStringIO.c #cPickle cPickle.c diff --git a/Modules/cPickle.c b/Modules/cPickle.c index db12d4b..9871627 100644 --- a/Modules/cPickle.c +++ b/Modules/cPickle.c @@ -1,51 +1,3 @@ -/* - * 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" "\n" diff --git a/Modules/cStringIO.c b/Modules/cStringIO.c index 8c9dab9..068a835 100644 --- a/Modules/cStringIO.c +++ b/Modules/cStringIO.c @@ -1,56 +1,3 @@ -/* - * 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" "\n" diff --git a/Modules/operator.c b/Modules/operator.c index d73744d..d1ea181 100644 --- a/Modules/operator.c +++ b/Modules/operator.c @@ -8,65 +8,6 @@ used for special class methods; variants without leading and trailing\n\ '__' are also provided for convenience.\n\ "; -/* - - 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" #define spam1(OP,AOP) static PyObject *OP(PyObject *s, PyObject *a) { \ |