Comply with repository policy.3.4

39 files changed, 46 insertions, 54 deletions

diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
index 530aa87..79859e0 100644
--- a/COPYRIGHT.txt
+++ b/COPYRIGHT.txt
@@ -1,9 +1 @@
-Copyright (c) 2007 Zope Corporation and contributors.
-All Rights Reserved.
-
-This software is subject to the provisions of the Zope Public License,
-Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-FOR A PARTICULAR PURPOSE. 
+Zope Foundation and Contributors
\ No newline at end of file
diff --git a/LICENSE.txt b/LICENSE.txt
index e374992..e1f9ad7 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -21,7 +21,8 @@ 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
+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.
 
@@ -32,13 +33,12 @@ 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
+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.
-
+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.
diff --git a/bootstrap.py b/bootstrap.py
index e2facc9..3fd7d90 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2006 Zope Corporation and Contributors.
+# Copyright (c) 2006 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/setup.py b/setup.py
index b1579cd..1851ef3 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2006 Zope Corporation and Contributors.
+# Copyright (c) 2006 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
@@ -26,7 +26,7 @@ setup(name='zope.schema',
       url='http://pypi.python.org/pypi/zope.schema',
       license='ZPL 2.1',
       description='Zope3 Data Schemas',
-      author='Zope Corporation and Contributors',
+      author='Zope Foundation and Contributors',
       author_email='zope3-dev@zope.org',
       long_description=(read('src', 'zope', 'schema', 'README.txt')
                         + '\n\n' +
diff --git a/src/zope/schema/__init__.py b/src/zope/schema/__init__.py
index f55c77c..104fee5 100644
--- a/src/zope/schema/__init__.py
+++ b/src/zope/schema/__init__.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors.
+# Copyright (c) 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/schema/_bootstrapfields.py b/src/zope/schema/_bootstrapfields.py
index 0367134..7f76843 100644
--- a/src/zope/schema/_bootstrapfields.py
+++ b/src/zope/schema/_bootstrapfields.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors.
+# Copyright (c) 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/schema/_bootstrapinterfaces.py b/src/zope/schema/_bootstrapinterfaces.py
index 55c0648..2255881 100644
--- a/src/zope/schema/_bootstrapinterfaces.py
+++ b/src/zope/schema/_bootstrapinterfaces.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors.
+# Copyright (c) 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/schema/_field.py b/src/zope/schema/_field.py
index cac1106..daadc69 100644
--- a/src/zope/schema/_field.py
+++ b/src/zope/schema/_field.py
@@ -1,6 +1,6 @@
 # -*- coding: ISO-8859-1 -*-
 ##############################################################################
-# Copyright (c) 2002 Zope Corporation and Contributors.
+# Copyright (c) 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/schema/_schema.py b/src/zope/schema/_schema.py
index f4eac6d..f6c9181 100644
--- a/src/zope/schema/_schema.py
+++ b/src/zope/schema/_schema.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors.
+# Copyright (c) 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/schema/accessors.py b/src/zope/schema/accessors.py
index aba2f2a..12febfc 100644
--- a/src/zope/schema/accessors.py
+++ b/src/zope/schema/accessors.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003 Zope Corporation and Contributors.
+# Copyright (c) 2003 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/schema/fieldproperty.py b/src/zope/schema/fieldproperty.py
index 8ed38a9..c489fc5 100644
--- a/src/zope/schema/fieldproperty.py
+++ b/src/zope/schema/fieldproperty.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors.
+# Copyright (c) 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/schema/interfaces.py b/src/zope/schema/interfaces.py
index 074a8a3..1521290 100644
--- a/src/zope/schema/interfaces.py
+++ b/src/zope/schema/interfaces.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors.
+# Copyright (c) 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/schema/tests/states.py b/src/zope/schema/tests/states.py
index 812372a..c0cc8d5 100644
--- a/src/zope/schema/tests/states.py
+++ b/src/zope/schema/tests/states.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003 Zope Corporation and Contributors.
+# Copyright (c) 2003 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/schema/tests/test_accessors.py b/src/zope/schema/tests/test_accessors.py
index bac848a..3de7a86 100644
--- a/src/zope/schema/tests/test_accessors.py
+++ b/src/zope/schema/tests/test_accessors.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003 Zope Corporation and Contributors.
+# Copyright (c) 2003 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/schema/tests/test_boolfield.py b/src/zope/schema/tests/test_boolfield.py
index 2e4a22e..010f3c8 100644
--- a/src/zope/schema/tests/test_boolfield.py
+++ b/src/zope/schema/tests/test_boolfield.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/schema/tests/test_choice.py b/src/zope/schema/tests/test_choice.py
index 77a797d..85ffdc3 100644
--- a/src/zope/schema/tests/test_choice.py
+++ b/src/zope/schema/tests/test_choice.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003 Zope Corporation and Contributors.
+# Copyright (c) 2003 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/schema/tests/test_containerfield.py b/src/zope/schema/tests/test_containerfield.py
index 5cc7c76..f54d70b 100644
--- a/src/zope/schema/tests/test_containerfield.py
+++ b/src/zope/schema/tests/test_containerfield.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/schema/tests/test_date.py b/src/zope/schema/tests/test_date.py
index 6ce890d..9cb44db 100644
--- a/src/zope/schema/tests/test_date.py
+++ b/src/zope/schema/tests/test_date.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/schema/tests/test_datetime.py b/src/zope/schema/tests/test_datetime.py
index 40915b4..a072746 100644
--- a/src/zope/schema/tests/test_datetime.py
+++ b/src/zope/schema/tests/test_datetime.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/schema/tests/test_decimalfield.py b/src/zope/schema/tests/test_decimalfield.py
index e19297b..709c267 100644
--- a/src/zope/schema/tests/test_decimalfield.py
+++ b/src/zope/schema/tests/test_decimalfield.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002, 2006 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002, 2006 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/schema/tests/test_dictfield.py b/src/zope/schema/tests/test_dictfield.py
index 9e810d6..c580fd5 100644
--- a/src/zope/schema/tests/test_dictfield.py
+++ b/src/zope/schema/tests/test_dictfield.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/schema/tests/test_docs.py b/src/zope/schema/tests/test_docs.py
index 2fda08e..d64a32f 100644
--- a/src/zope/schema/tests/test_docs.py
+++ b/src/zope/schema/tests/test_docs.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2004 Zope Corporation and Contributors.
+# Copyright (c) 2004 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/schema/tests/test_equality.py b/src/zope/schema/tests/test_equality.py
index 3cba306..1000460 100644
--- a/src/zope/schema/tests/test_equality.py
+++ b/src/zope/schema/tests/test_equality.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/schema/tests/test_field.py b/src/zope/schema/tests/test_field.py
index 793b0cc..2847e5e 100644
--- a/src/zope/schema/tests/test_field.py
+++ b/src/zope/schema/tests/test_field.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/schema/tests/test_fieldproperty.py b/src/zope/schema/tests/test_fieldproperty.py
index 4dfffcf..cfcc2f8 100644
--- a/src/zope/schema/tests/test_fieldproperty.py
+++ b/src/zope/schema/tests/test_fieldproperty.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/schema/tests/test_floatfield.py b/src/zope/schema/tests/test_floatfield.py
index 85e6fd6..ba375cb 100644
--- a/src/zope/schema/tests/test_floatfield.py
+++ b/src/zope/schema/tests/test_floatfield.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/schema/tests/test_interfacefield.py b/src/zope/schema/tests/test_interfacefield.py
index a161851..4d33fd5 100644
--- a/src/zope/schema/tests/test_interfacefield.py
+++ b/src/zope/schema/tests/test_interfacefield.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/schema/tests/test_intfield.py b/src/zope/schema/tests/test_intfield.py
index 0ad629b..fdcf19d 100644
--- a/src/zope/schema/tests/test_intfield.py
+++ b/src/zope/schema/tests/test_intfield.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/schema/tests/test_iterablefield.py b/src/zope/schema/tests/test_iterablefield.py
index 2da0053..4e16976 100644
--- a/src/zope/schema/tests/test_iterablefield.py
+++ b/src/zope/schema/tests/test_iterablefield.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003 Zope Corporation and Contributors.
+# Copyright (c) 2003 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/schema/tests/test_listfield.py b/src/zope/schema/tests/test_listfield.py
index 7fa0402..128a215 100644
--- a/src/zope/schema/tests/test_listfield.py
+++ b/src/zope/schema/tests/test_listfield.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/schema/tests/test_objectfield.py b/src/zope/schema/tests/test_objectfield.py
index 40f30e2..dc473a6 100644
--- a/src/zope/schema/tests/test_objectfield.py
+++ b/src/zope/schema/tests/test_objectfield.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/schema/tests/test_schema.py b/src/zope/schema/tests/test_schema.py
index 522f79b..cc54820 100644
--- a/src/zope/schema/tests/test_schema.py
+++ b/src/zope/schema/tests/test_schema.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/schema/tests/test_setfield.py b/src/zope/schema/tests/test_setfield.py
index 6ce7abb..c8f78be 100644
--- a/src/zope/schema/tests/test_setfield.py
+++ b/src/zope/schema/tests/test_setfield.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/schema/tests/test_states.py b/src/zope/schema/tests/test_states.py
index 0d715c9..7998961 100644
--- a/src/zope/schema/tests/test_states.py
+++ b/src/zope/schema/tests/test_states.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003 Zope Corporation and Contributors.
+# Copyright (c) 2003 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/schema/tests/test_strfield.py b/src/zope/schema/tests/test_strfield.py
index 160d755..1e5bad0 100644
--- a/src/zope/schema/tests/test_strfield.py
+++ b/src/zope/schema/tests/test_strfield.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/schema/tests/test_timedelta.py b/src/zope/schema/tests/test_timedelta.py
index c27cc86..0531d44 100644
--- a/src/zope/schema/tests/test_timedelta.py
+++ b/src/zope/schema/tests/test_timedelta.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/schema/tests/test_tuplefield.py b/src/zope/schema/tests/test_tuplefield.py
index 93298fc..ec3bb81 100644
--- a/src/zope/schema/tests/test_tuplefield.py
+++ b/src/zope/schema/tests/test_tuplefield.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/schema/tests/test_vocabulary.py b/src/zope/schema/tests/test_vocabulary.py
index b949960..e347521 100644
--- a/src/zope/schema/tests/test_vocabulary.py
+++ b/src/zope/schema/tests/test_vocabulary.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003 Zope Corporation and Contributors.
+# Copyright (c) 2003 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/schema/vocabulary.py b/src/zope/schema/vocabulary.py
index 3fab2b3..3a03b5c 100644
--- a/src/zope/schema/vocabulary.py
+++ b/src/zope/schema/vocabulary.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003 Zope Corporation and Contributors.
+# Copyright (c) 2003 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,