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.

diff --git a/Doc/texinputs/license.tex b/Doc/texinputs/license.tex
index 6330c83594ca1dbcc6416b41257e6bea9a1044d0..e869e29e46c3aa5a34a4f9b312d65a09461fe01f 100644 (file)
--- a/Doc/texinputs/license.tex
+++ b/Doc/texinputs/license.tex
@@ -12,11 +12,11 @@ software.
 
 In May 2000, Guido and the Python core development team moved to
 BeOpen.com to form the BeOpen PythonLabs team.  In October of the same
-year, the PythonLabs team moved to Zope Corporation (then Digital
-Creations; see \url{http://www.zope.com/}).  In 2001, the Python
+year, the PythonLabs team moved to Digital Creations (now Zope
+Corporation; see \url{http://www.zope.com/}).  In 2001, the Python
 Software Foundation (PSF, see \url{http://www.python.org/psf/}) was
 formed, a non-profit organization created specifically to own
-Python-related Intellectual Property.  Digital Creations is a
+Python-related Intellectual Property.  Zope Corporation is a
 sponsoring member of the PSF.
 
 All Python releases are Open Source (see

diff --git a/Include/cStringIO.h b/Include/cStringIO.h
index fa3fcd70a6b88d34acb19e6a518891d407ccaacd..235f777f5fefe7aefade2f4d78287d2f535d71b9 100644 (file)
--- a/Include/cStringIO.h
+++ b/Include/cStringIO.h
@@ -5,61 +5,6 @@ extern "C" {
 #endif
 /*
 
-  cStringIO.h,v 1.4 1997/12/07 14:27:00 jim Exp
-
-  cStringIO C API
-
-     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:
-   
-      info@digicool.com
-      Digital Creations L.C.  
-   
-      (540) 371-6909
-
-
   This header provides access to cStringIO objects from C.
   Functions are provided for calling cStringIO objects and
   macros are provided for testing whether you have cStringIO 

diff --git a/LICENSE b/LICENSE
index 3984158c759a5906a4527c38c70a0da3c26801f8..397d6e247b54ef96cb6f14331a0906ad45e700f0 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -13,11 +13,12 @@ software.
 
 In May 2000, Guido and the Python core development team moved to
 BeOpen.com to form the BeOpen PythonLabs team.  In October of the same
-year, the PythonLabs team moved to Digital Creations (see
-http://www.digicool.com).  In 2001, the Python Software Foundation
-(PSF, see http://www.python.org/psf/) was formed, a non-profit
-organization created specifically to own Python-related Intellectual
-Property.  Digital Creations is a sponsoring member of the PSF.
+year, the PythonLabs team moved to Digital Creations (now Zope
+Corporation, see http://www.zope.com).  In 2001, the Python Software
+Foundation (PSF, see http://www.python.org/psf/) was formed, a
+non-profit organization created specifically to own Python-related
+Intellectual Property.  Zope Corporation is a sponsoring member of
+the PSF.
 
 All Python releases are Open Source (see http://www.opensource.org for
 the Open Source Definition).  Historically, most, but not all, Python

diff --git a/Lib/site.py b/Lib/site.py
index fee13f8459fa3550f7a42ac51eecdc12ec2d5377..770eb5291ce5b252c8656cd58d61d07ee74fd1d3 100644 (file)
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -261,7 +261,7 @@ if sys.platform[:4] == 'java':
         "Jython is maintained by the Jython developers (www.jython.org).")
 else:
     __builtin__.credits = _Printer("credits", """\
-Thanks to CWI, CNRI, BeOpen.com, Digital Creations and a cast of thousands
+Thanks to CWI, CNRI, BeOpen.com, Zope Corporation and a cast of thousands
 for supporting Python development.  See www.python.org for more information.""")
 here = os.path.dirname(os.__file__)
 __builtin__.license = _Printer(

diff --git a/Misc/BeOS-setup.py b/Misc/BeOS-setup.py
index 012f50b1391c06306417bd0eada554ccd9a19318..8f9b7766b297c19597eebb6eea191ef3318115b2 100644 (file)
--- a/Misc/BeOS-setup.py
+++ b/Misc/BeOS-setup.py
@@ -242,7 +242,7 @@ class PyBuildExt(build_ext):
         # Fred Drake's interface to the Python parser
         exts.append( Extension('parser', ['parsermodule.c']) )
 
-        # Digital Creations' cStringIO and cPickle
+        # cStringIO and cPickle
         exts.append( Extension('cStringIO', ['cStringIO.c']) )
         exts.append( Extension('cPickle', ['cPickle.c']) )
 

diff --git a/Modules/Setup.dist b/Modules/Setup.dist
index df8176b3f6fe09b6fa3524d1e5ad6973b2c0a10f..6a49752e3c86850a14171fe409cd10c536bed367 100644 (file)
--- 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 db12d4b2a377aa6c25825cebe3406909b6edee7c..9871627953d95e72e79ed1280a177e442c4372c3 100644 (file)
--- 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 8c9dab9680d4f744fd0bc78dccfcf9e4481ea7b0..068a835413783cfeb678c40815202cc200f77f48 100644 (file)
--- 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 d73744d5116d02f45a57da8cd1377ad3e6f949a8..d1ea181ef494a5b0aab567b435c8063504dfdba6 100644 (file)
--- 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) { \

diff --git a/PCbuild/python.iss b/PCbuild/python.iss
index 479f5bf75ebaec7e3ed4b92f1cb3863cb070e417..5532564b7f8ce13520dcdce6db01ea73cea4aa0f 100644 (file)
--- a/PCbuild/python.iss
+++ b/PCbuild/python.iss
@@ -65,7 +65,7 @@ SourceDir=..
 OutputDir=PCBuild
 OutputBaseFilename=Python-2.2a1
 
-AppPublisher=PythonLabs at Digital Creations
+AppPublisher=PythonLabs at Zope Corporation
 AppPublisherURL=http://www.python.org
 AppSupportURL=http://www.python.org
 AppUpdatesURL=http://www.python.org

diff --git a/setup.py b/setup.py
index e10981e043ac709d6b49e59e57f06f029a89a669..d5579435460828bbff391a1ab2ef7ad147e916ae 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -312,7 +312,7 @@ class PyBuildExt(build_ext):
         # Fred Drake's interface to the Python parser
         exts.append( Extension('parser', ['parsermodule.c']) )
 
-        # Digital Creations' cStringIO and cPickle
+        # cStringIO and cPickle
         exts.append( Extension('cStringIO', ['cStringIO.c']) )
         exts.append( Extension('cPickle', ['cPickle.c']) )