forgotten to update the ZPL due to a script error

0e6f29bb · Andreas Jung · 02e9b2a2 · 0e6f29bb · 0e6f29bb · 0e6f29bb
Commit 0e6f29bb authored Nov 18, 2005 by Andreas Jung
589 changed files
--- a/inst/WinBuilders/bin/compilezpy.py
+++ b/inst/WinBuilders/bin/compilezpy.py
@@ -4,7 +4,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/inst/WinBuilders/bin/decompilezpy.py
+++ b/inst/WinBuilders/bin/decompilezpy.py
@@ -4,7 +4,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/inst/WinBuilders/zeo_addons/utilities/compilezpy.py
+++ b/inst/WinBuilders/zeo_addons/utilities/compilezpy.py
@@ -4,7 +4,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/inst/WinBuilders/zeo_addons/utilities/copyskel.py
+++ b/inst/WinBuilders/zeo_addons/utilities/copyskel.py
@@ -4,7 +4,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/inst/WinBuilders/zeo_addons/utilities/decompilezpy.py
+++ b/inst/WinBuilders/zeo_addons/utilities/decompilezpy.py
@@ -4,7 +4,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/inst/WinBuilders/zeo_addons/utilities/mkzeoinstance.py
+++ b/inst/WinBuilders/zeo_addons/utilities/mkzeoinstance.py
@@ -4,7 +4,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/inst/compilezpy.py
+++ b/inst/compilezpy.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/inst/configure.py
+++ b/inst/configure.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/inst/file_from_infile.py
+++ b/inst/file_from_infile.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/inst/install.py
+++ b/inst/install.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/inst/make_resource.py
+++ b/inst/make_resource.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/inst/walkandscrub.py
+++ b/inst/walkandscrub.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/Components/BTree/intSet.c
+++ b/lib/Components/BTree/intSet.c
@@ -3,7 +3,7 @@
  Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
  
  This software is subject to the provisions of the Zope Public License,
-  Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+  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

--- a/lib/python/AccessControl/AuthEncoding.py
+++ b/lib/python/AccessControl/AuthEncoding.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/DTML.py
+++ b/lib/python/AccessControl/DTML.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/ImplC.py
+++ b/lib/python/AccessControl/ImplC.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2003 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/ImplPython.py
+++ b/lib/python/AccessControl/ImplPython.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2003 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/Implementation.py
+++ b/lib/python/AccessControl/Implementation.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2003 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/Owned.py
+++ b/lib/python/AccessControl/Owned.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/Permission.py
+++ b/lib/python/AccessControl/Permission.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/PermissionMapping.py
+++ b/lib/python/AccessControl/PermissionMapping.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/PermissionRole.py
+++ b/lib/python/AccessControl/PermissionRole.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/Permissions.py
+++ b/lib/python/AccessControl/Permissions.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/Role.py
+++ b/lib/python/AccessControl/Role.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/SecurityInfo.py
+++ b/lib/python/AccessControl/SecurityInfo.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/SecurityManagement.py
+++ b/lib/python/AccessControl/SecurityManagement.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/SecurityManager.py
+++ b/lib/python/AccessControl/SecurityManager.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/SimpleObjectPolicies.py
+++ b/lib/python/AccessControl/SimpleObjectPolicies.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/SpecialUsers.py
+++ b/lib/python/AccessControl/SpecialUsers.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/User.py
+++ b/lib/python/AccessControl/User.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/ZopeGuards.py
+++ b/lib/python/AccessControl/ZopeGuards.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/ZopeSecurityPolicy.py
+++ b/lib/python/AccessControl/ZopeSecurityPolicy.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/__init__.py
+++ b/lib/python/AccessControl/__init__.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/securitySuite/ResultObject.py
+++ b/lib/python/AccessControl/securitySuite/ResultObject.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/securitySuite/SecurityBase.py
+++ b/lib/python/AccessControl/securitySuite/SecurityBase.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/securitySuite/framework.py
+++ b/lib/python/AccessControl/securitySuite/framework.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/securitySuite/regressionSecurity.py
+++ b/lib/python/AccessControl/securitySuite/regressionSecurity.py
@@ -5,7 +5,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/tests/testAcquisition.py
+++ b/lib/python/AccessControl/tests/testAcquisition.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/tests/testBindings.py
+++ b/lib/python/AccessControl/tests/testBindings.py
@@ -4,7 +4,7 @@
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/tests/testClassSecurityInfo.py
+++ b/lib/python/AccessControl/tests/testClassSecurityInfo.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/tests/testDeprecatedAPI.py
+++ b/lib/python/AccessControl/tests/testDeprecatedAPI.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/tests/testImplementation.py
+++ b/lib/python/AccessControl/tests/testImplementation.py
@@ -4,7 +4,7 @@
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/tests/testModuleSecurity.py
+++ b/lib/python/AccessControl/tests/testModuleSecurity.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/tests/testPasswordDigest.py
+++ b/lib/python/AccessControl/tests/testPasswordDigest.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/tests/testPermissionRole.py
+++ b/lib/python/AccessControl/tests/testPermissionRole.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/tests/testSecurity.py
+++ b/lib/python/AccessControl/tests/testSecurity.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/tests/testUserFolder.py
+++ b/lib/python/AccessControl/tests/testUserFolder.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/tests/testZopeGuards.py
+++ b/lib/python/AccessControl/tests/testZopeGuards.py
@@ -4,7 +4,7 @@
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/tests/testZopeSecurityPolicy.py
+++ b/lib/python/AccessControl/tests/testZopeSecurityPolicy.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/tests/test_safeiter.py
+++ b/lib/python/AccessControl/tests/test_safeiter.py
@@ -4,7 +4,7 @@
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/AccessControl/unauthorized.py
+++ b/lib/python/AccessControl/unauthorized.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/Acquisition/Acquisition.h
+++ b/lib/python/Acquisition/Acquisition.h
@@ -4,7 +4,7 @@
  All Rights Reserved.

  This software is subject to the provisions of the Zope Public License,
-  Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+  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

--- a/lib/python/Acquisition/_Acquisition.c
+++ b/lib/python/Acquisition/_Acquisition.c
@@ -4,7 +4,7 @@
  All Rights Reserved.

  This software is subject to the provisions of the Zope Public License,
-  Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+  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

--- a/lib/python/Acquisition/setup.py
+++ b/lib/python/Acquisition/setup.py
@@ -4,7 +4,7 @@
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/Acquisition/tests.py
+++ b/lib/python/Acquisition/tests.py
@@ -4,7 +4,7 @@
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/App/ApplicationManager.py
+++ b/lib/python/App/ApplicationManager.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/App/CacheManager.py
+++ b/lib/python/App/CacheManager.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/App/Common.py
+++ b/lib/python/App/Common.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/App/DavLockManager.py
+++ b/lib/python/App/DavLockManager.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/App/Dialogs.py
+++ b/lib/python/App/Dialogs.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/App/Extensions.py
+++ b/lib/python/App/Extensions.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/App/Factory.py
+++ b/lib/python/App/Factory.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/App/FactoryDispatcher.py
+++ b/lib/python/App/FactoryDispatcher.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/App/FindHomes.py
+++ b/lib/python/App/FindHomes.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/App/Hotfixes.py
+++ b/lib/python/App/Hotfixes.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/App/ImageFile.py
+++ b/lib/python/App/ImageFile.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/App/Management.py
+++ b/lib/python/App/Management.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/App/Permission.py
+++ b/lib/python/App/Permission.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/App/PersistentExtra.py
+++ b/lib/python/App/PersistentExtra.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/App/Product.py
+++ b/lib/python/App/Product.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/App/ProductContext.py
+++ b/lib/python/App/ProductContext.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/App/ProductRegistry.py
+++ b/lib/python/App/ProductRegistry.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/App/RefreshFuncs.py
+++ b/lib/python/App/RefreshFuncs.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/App/Undo.py
+++ b/lib/python/App/Undo.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/App/__init__.py
+++ b/lib/python/App/__init__.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/App/class_init.py
+++ b/lib/python/App/class_init.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/App/config.py
+++ b/lib/python/App/config.py
@@ -4,7 +4,7 @@
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/App/special_dtml.py
+++ b/lib/python/App/special_dtml.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/App/tar.py
+++ b/lib/python/App/tar.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/App/tests/test_cachemanager.py
+++ b/lib/python/App/tests/test_cachemanager.py
@@ -4,7 +4,7 @@
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/App/tests/test_class_init.py
+++ b/lib/python/App/tests/test_class_init.py
@@ -4,7 +4,7 @@
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/App/tests/test_setConfiguration.py
+++ b/lib/python/App/tests/test_setConfiguration.py
@@ -4,7 +4,7 @@
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/App/tests/test_version_txt.py
+++ b/lib/python/App/tests/test_version_txt.py
@@ -4,7 +4,7 @@
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/App/version_txt.py
+++ b/lib/python/App/version_txt.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/ComputedAttribute/_ComputedAttribute.c
+++ b/lib/python/ComputedAttribute/_ComputedAttribute.c
@@ -4,7 +4,7 @@
  All Rights Reserved.

  This software is subject to the provisions of the Zope Public License,
-  Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+  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

--- a/lib/python/ComputedAttribute/setup.py
+++ b/lib/python/ComputedAttribute/setup.py
@@ -4,7 +4,7 @@
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/ComputedAttribute/tests.py
+++ b/lib/python/ComputedAttribute/tests.py
@@ -4,7 +4,7 @@
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/DateTime/DateTime.py
+++ b/lib/python/DateTime/DateTime.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/DateTime/DateTimeZone.py
+++ b/lib/python/DateTime/DateTimeZone.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/DateTime/__init__.py
+++ b/lib/python/DateTime/__init__.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/DateTime/tests/__init__.py
+++ b/lib/python/DateTime/tests/__init__.py
@@ -4,7 +4,7 @@
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/DocumentTemplate/DT_HTML.py
+++ b/lib/python/DocumentTemplate/DT_HTML.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/DocumentTemplate/DT_If.py
+++ b/lib/python/DocumentTemplate/DT_If.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/DocumentTemplate/DT_In.py
+++ b/lib/python/DocumentTemplate/DT_In.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/DocumentTemplate/DT_InSV.py
+++ b/lib/python/DocumentTemplate/DT_InSV.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/DocumentTemplate/DT_Let.py
+++ b/lib/python/DocumentTemplate/DT_Let.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/DocumentTemplate/DT_Raise.py
+++ b/lib/python/DocumentTemplate/DT_Raise.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/DocumentTemplate/DT_Return.py
+++ b/lib/python/DocumentTemplate/DT_Return.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/DocumentTemplate/DT_String.py
+++ b/lib/python/DocumentTemplate/DT_String.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/DocumentTemplate/DT_Try.py
+++ b/lib/python/DocumentTemplate/DT_Try.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# 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

--- a/lib/python/DocumentTemplate/DT_UI.py
+++ b/lib/python/DocumentTemplate/DT_UI.py
--- a/lib/python/DocumentTemplate/DT_Util.py
+++ b/lib/python/DocumentTemplate/DT_Util.py
--- a/lib/python/DocumentTemplate/DT_Var.py
+++ b/lib/python/DocumentTemplate/DT_Var.py
--- a/lib/python/DocumentTemplate/DT_With.py
+++ b/lib/python/DocumentTemplate/DT_With.py
--- a/lib/python/DocumentTemplate/DTtestExpr.py
+++ b/lib/python/DocumentTemplate/DTtestExpr.py
--- a/lib/python/DocumentTemplate/DocumentTemplate.py
+++ b/lib/python/DocumentTemplate/DocumentTemplate.py
--- a/lib/python/DocumentTemplate/__init__.py
+++ b/lib/python/DocumentTemplate/__init__.py
--- a/lib/python/DocumentTemplate/cDocumentTemplate.c
+++ b/lib/python/DocumentTemplate/cDocumentTemplate.c
--- a/lib/python/DocumentTemplate/pDocumentTemplate.py
+++ b/lib/python/DocumentTemplate/pDocumentTemplate.py
--- a/lib/python/DocumentTemplate/sequence/SortEx.py
+++ b/lib/python/DocumentTemplate/sequence/SortEx.py
--- a/lib/python/DocumentTemplate/sequence/__init__.py
+++ b/lib/python/DocumentTemplate/sequence/__init__.py
--- a/lib/python/DocumentTemplate/sequence/tests/testSequence.py
+++ b/lib/python/DocumentTemplate/sequence/tests/testSequence.py
--- a/lib/python/DocumentTemplate/tests/testDTML.py
+++ b/lib/python/DocumentTemplate/tests/testDTML.py
--- a/lib/python/DocumentTemplate/tests/testDTMLUnicode.py
+++ b/lib/python/DocumentTemplate/tests/testDTMLUnicode.py
--- a/lib/python/DocumentTemplate/tests/testustr.py
+++ b/lib/python/DocumentTemplate/tests/testustr.py
--- a/lib/python/DocumentTemplate/ustr.py
+++ b/lib/python/DocumentTemplate/ustr.py
--- a/lib/python/ExtensionClass/ExtensionClass.h
+++ b/lib/python/ExtensionClass/ExtensionClass.h
--- a/lib/python/ExtensionClass/_ExtensionClass.c
+++ b/lib/python/ExtensionClass/_ExtensionClass.c
--- a/lib/python/ExtensionClass/__init__.py
+++ b/lib/python/ExtensionClass/__init__.py
--- a/lib/python/ExtensionClass/pickle/pickle.c
+++ b/lib/python/ExtensionClass/pickle/pickle.c
--- a/lib/python/ExtensionClass/tests.py
+++ b/lib/python/ExtensionClass/tests.py
--- a/lib/python/Globals.py
+++ b/lib/python/Globals.py
--- a/lib/python/HelpSys/APIHelpTopic.py
+++ b/lib/python/HelpSys/APIHelpTopic.py
--- a/lib/python/HelpSys/HelpSys.py
+++ b/lib/python/HelpSys/HelpSys.py
--- a/lib/python/HelpSys/HelpTopic.py
+++ b/lib/python/HelpSys/HelpTopic.py
--- a/lib/python/HelpSys/HelpUtil.py
+++ b/lib/python/HelpSys/HelpUtil.py
--- a/lib/python/HelpSys/ObjectRef.py
+++ b/lib/python/HelpSys/ObjectRef.py
--- a/lib/python/HelpSys/__init__.py
+++ b/lib/python/HelpSys/__init__.py
--- a/lib/python/ImageFile.py
+++ b/lib/python/ImageFile.py
--- a/lib/python/Interface/Attribute.py
+++ b/lib/python/Interface/Attribute.py
--- a/lib/python/Interface/Common/Mapping.py
+++ b/lib/python/Interface/Common/Mapping.py
--- a/lib/python/Interface/Common/__init__.py
+++ b/lib/python/Interface/Common/__init__.py
--- a/lib/python/Interface/Common/tests/BaseTestMapping.py
+++ b/lib/python/Interface/Common/tests/BaseTestMapping.py
--- a/lib/python/Interface/Common/tests/__init__.py
+++ b/lib/python/Interface/Common/tests/__init__.py
--- a/lib/python/Interface/Document.py
+++ b/lib/python/Interface/Document.py
--- a/lib/python/Interface/Exceptions.py
+++ b/lib/python/Interface/Exceptions.py
--- a/lib/python/Interface/IAttribute.py
+++ b/lib/python/Interface/IAttribute.py
--- a/lib/python/Interface/IElement.py
+++ b/lib/python/Interface/IElement.py
--- a/lib/python/Interface/IInterface.py
+++ b/lib/python/Interface/IInterface.py
--- a/lib/python/Interface/IMethod.py
+++ b/lib/python/Interface/IMethod.py
--- a/lib/python/Interface/Implements.py
+++ b/lib/python/Interface/Implements.py
--- a/lib/python/Interface/Method.py
+++ b/lib/python/Interface/Method.py
--- a/lib/python/Interface/Verify.py
+++ b/lib/python/Interface/Verify.py
--- a/lib/python/Interface/_Element.py
+++ b/lib/python/Interface/_Element.py
--- a/lib/python/Interface/_Interface.py
+++ b/lib/python/Interface/_Interface.py
--- a/lib/python/Interface/_InterfaceClass.py
+++ b/lib/python/Interface/_InterfaceClass.py
--- a/lib/python/Interface/__init__.py
+++ b/lib/python/Interface/__init__.py
--- a/lib/python/Interface/_object.py
+++ b/lib/python/Interface/_object.py
--- a/lib/python/Interface/pyskel.py
+++ b/lib/python/Interface/pyskel.py
--- a/lib/python/Interface/tests/IFoo.py
+++ b/lib/python/Interface/tests/IFoo.py
--- a/lib/python/Interface/tests/__init__.py
+++ b/lib/python/Interface/tests/__init__.py
--- a/lib/python/Interface/tests/dummy.py
+++ b/lib/python/Interface/tests/dummy.py
--- a/lib/python/Interface/tests/testDocument.py
+++ b/lib/python/Interface/tests/testDocument.py
--- a/lib/python/Interface/tests/testElement.py
+++ b/lib/python/Interface/tests/testElement.py
--- a/lib/python/Interface/tests/testImplements.py
+++ b/lib/python/Interface/tests/testImplements.py
--- a/lib/python/Interface/tests/testInterface.py
+++ b/lib/python/Interface/tests/testInterface.py
--- a/lib/python/Interface/tests/testVerify.py
+++ b/lib/python/Interface/tests/testVerify.py
--- a/lib/python/Interface/tests/testVisitImplements.py
+++ b/lib/python/Interface/tests/testVisitImplements.py
--- a/lib/python/Interface/tests/unitfixtures.py
+++ b/lib/python/Interface/tests/unitfixtures.py
--- a/lib/python/MethodObject/_MethodObject.c
+++ b/lib/python/MethodObject/_MethodObject.c
--- a/lib/python/MethodObject/setup.py
+++ b/lib/python/MethodObject/setup.py
--- a/lib/python/MethodObject/tests.py
+++ b/lib/python/MethodObject/tests.py
--- a/lib/python/Missing/_Missing.c
+++ b/lib/python/Missing/_Missing.c
--- a/lib/python/Missing/setup.py
+++ b/lib/python/Missing/setup.py
--- a/lib/python/Missing/tests.py
+++ b/lib/python/Missing/tests.py
--- a/lib/python/MultiMapping/_MultiMapping.c
+++ b/lib/python/MultiMapping/_MultiMapping.c
--- a/lib/python/MultiMapping/setup.py
+++ b/lib/python/MultiMapping/setup.py
--- a/lib/python/MultiMapping/tests.py
+++ b/lib/python/MultiMapping/tests.py
--- a/lib/python/OFS/Application.py
+++ b/lib/python/OFS/Application.py
--- a/lib/python/OFS/Cache.py
+++ b/lib/python/OFS/Cache.py
--- a/lib/python/OFS/CopySupport.py
+++ b/lib/python/OFS/CopySupport.py
--- a/lib/python/OFS/DTMLDocument.py
+++ b/lib/python/OFS/DTMLDocument.py
--- a/lib/python/OFS/DTMLMethod.py
+++ b/lib/python/OFS/DTMLMethod.py
--- a/lib/python/OFS/DefaultObservable.py
+++ b/lib/python/OFS/DefaultObservable.py
--- a/lib/python/OFS/Document.py
+++ b/lib/python/OFS/Document.py
--- a/lib/python/OFS/FTPInterface.py
+++ b/lib/python/OFS/FTPInterface.py
--- a/lib/python/OFS/FindSupport.py
+++ b/lib/python/OFS/FindSupport.py
--- a/lib/python/OFS/Folder.py
+++ b/lib/python/OFS/Folder.py
--- a/lib/python/OFS/History.py
+++ b/lib/python/OFS/History.py
--- a/lib/python/OFS/IOrderSupport.py
+++ b/lib/python/OFS/IOrderSupport.py
--- a/lib/python/OFS/Image.py
+++ b/lib/python/OFS/Image.py
--- a/lib/python/OFS/Moniker.py
+++ b/lib/python/OFS/Moniker.py
--- a/lib/python/OFS/ObjectManager.py
+++ b/lib/python/OFS/ObjectManager.py
--- a/lib/python/OFS/OrderSupport.py
+++ b/lib/python/OFS/OrderSupport.py
--- a/lib/python/OFS/OrderedFolder.py
+++ b/lib/python/OFS/OrderedFolder.py
--- a/lib/python/OFS/PropertyManager.py
+++ b/lib/python/OFS/PropertyManager.py
--- a/lib/python/OFS/PropertySheets.py
+++ b/lib/python/OFS/PropertySheets.py
--- a/lib/python/OFS/SimpleItem.py
+++ b/lib/python/OFS/SimpleItem.py
--- a/lib/python/OFS/Traversable.py
+++ b/lib/python/OFS/Traversable.py
--- a/lib/python/OFS/Uninstalled.py
+++ b/lib/python/OFS/Uninstalled.py
--- a/lib/python/OFS/XMLExportImport.py
+++ b/lib/python/OFS/XMLExportImport.py
--- a/lib/python/OFS/ZDOM.py
+++ b/lib/python/OFS/ZDOM.py
--- a/lib/python/OFS/__init__.py
+++ b/lib/python/OFS/__init__.py
--- a/lib/python/OFS/content_types.py
+++ b/lib/python/OFS/content_types.py
--- a/lib/python/OFS/misc_.py
+++ b/lib/python/OFS/misc_.py
--- a/lib/python/OFS/rPickle.py
+++ b/lib/python/OFS/rPickle.py
--- a/lib/python/OFS/tests/testAppInitializer.py
+++ b/lib/python/OFS/tests/testAppInitializer.py
--- a/lib/python/OFS/tests/testContentTypes.py
+++ b/lib/python/OFS/tests/testContentTypes.py
--- a/lib/python/OFS/tests/testProductInit.py
+++ b/lib/python/OFS/tests/testProductInit.py
--- a/lib/python/OFS/tests/testProperties.py
+++ b/lib/python/OFS/tests/testProperties.py
--- a/lib/python/OFS/tests/testRanges.py
+++ b/lib/python/OFS/tests/testRanges.py
--- a/lib/python/OFS/tests/testTraverse.py
+++ b/lib/python/OFS/tests/testTraverse.py
--- a/lib/python/Products/BTreeFolder2/BTreeFolder2.py
+++ b/lib/python/Products/BTreeFolder2/BTreeFolder2.py
--- a/lib/python/Products/BTreeFolder2/__init__.py
+++ b/lib/python/Products/BTreeFolder2/__init__.py
--- a/lib/python/Products/BTreeFolder2/tests/testBTreeFolder2.py
+++ b/lib/python/Products/BTreeFolder2/tests/testBTreeFolder2.py
--- a/lib/python/Products/ExternalMethod/ExternalMethod.py
+++ b/lib/python/Products/ExternalMethod/ExternalMethod.py
--- a/lib/python/Products/ExternalMethod/__init__.py
+++ b/lib/python/Products/ExternalMethod/__init__.py
--- a/lib/python/Products/ExternalMethod/help/ExternalMethod.py
+++ b/lib/python/Products/ExternalMethod/help/ExternalMethod.py
--- a/lib/python/Products/ExternalMethod/tests/__init__.py
+++ b/lib/python/Products/ExternalMethod/tests/__init__.py
--- a/lib/python/Products/ExternalMethod/tests/testExternalMethod.py
+++ b/lib/python/Products/ExternalMethod/tests/testExternalMethod.py
--- a/lib/python/Products/MIMETools/MIMETag.py
+++ b/lib/python/Products/MIMETools/MIMETag.py
--- a/lib/python/Products/MIMETools/__init__.py
+++ b/lib/python/Products/MIMETools/__init__.py
--- a/lib/python/Products/MailHost/MailHost.py
+++ b/lib/python/Products/MailHost/MailHost.py
--- a/lib/python/Products/MailHost/SendMailTag.py
+++ b/lib/python/Products/MailHost/SendMailTag.py
--- a/lib/python/Products/MailHost/__init__.py
+++ b/lib/python/Products/MailHost/__init__.py
--- a/lib/python/Products/MailHost/help/MailHost.py
+++ b/lib/python/Products/MailHost/help/MailHost.py
--- a/lib/python/Products/MailHost/tests/__init__.py
+++ b/lib/python/Products/MailHost/tests/__init__.py
--- a/lib/python/Products/OFSP/Draft.py
+++ b/lib/python/Products/OFSP/Draft.py
--- a/lib/python/Products/OFSP/Session.py
+++ b/lib/python/Products/OFSP/Session.py
--- a/lib/python/Products/OFSP/Version.py
+++ b/lib/python/Products/OFSP/Version.py
--- a/lib/python/Products/OFSP/__init__.py
+++ b/lib/python/Products/OFSP/__init__.py
--- a/lib/python/Products/OFSP/help/AuthenticatedUser.py
+++ b/lib/python/Products/OFSP/help/AuthenticatedUser.py
--- a/lib/python/Products/OFSP/help/DTMLDocument.py
+++ b/lib/python/Products/OFSP/help/DTMLDocument.py
--- a/lib/python/Products/OFSP/help/DTMLMethod.py
+++ b/lib/python/Products/OFSP/help/DTMLMethod.py
--- a/lib/python/Products/OFSP/help/DateTime.py
+++ b/lib/python/Products/OFSP/help/DateTime.py
--- a/lib/python/Products/OFSP/help/File.py
+++ b/lib/python/Products/OFSP/help/File.py
--- a/lib/python/Products/OFSP/help/Folder.py
+++ b/lib/python/Products/OFSP/help/Folder.py
--- a/lib/python/Products/OFSP/help/Image.py
+++ b/lib/python/Products/OFSP/help/Image.py
--- a/lib/python/Products/OFSP/help/ObjectManager.py
+++ b/lib/python/Products/OFSP/help/ObjectManager.py
--- a/lib/python/Products/OFSP/help/ObjectManagerItem.py
+++ b/lib/python/Products/OFSP/help/ObjectManagerItem.py
--- a/lib/python/Products/OFSP/help/OrderSupport.py
+++ b/lib/python/Products/OFSP/help/OrderSupport.py
--- a/lib/python/Products/OFSP/help/OrderedFolder.py
+++ b/lib/python/Products/OFSP/help/OrderedFolder.py
--- a/lib/python/Products/OFSP/help/PropertyManager.py
+++ b/lib/python/Products/OFSP/help/PropertyManager.py
--- a/lib/python/Products/OFSP/help/PropertySheet.py
+++ b/lib/python/Products/OFSP/help/PropertySheet.py
--- a/lib/python/Products/OFSP/help/PropertySheets.py
+++ b/lib/python/Products/OFSP/help/PropertySheets.py
--- a/lib/python/Products/OFSP/help/Request.py
+++ b/lib/python/Products/OFSP/help/Request.py
--- a/lib/python/Products/OFSP/help/Response.py
+++ b/lib/python/Products/OFSP/help/Response.py
--- a/lib/python/Products/PageTemplates/DeferExpr.py
+++ b/lib/python/Products/PageTemplates/DeferExpr.py
--- a/lib/python/Products/PageTemplates/Expressions.py
+++ b/lib/python/Products/PageTemplates/Expressions.py
--- a/lib/python/Products/PageTemplates/GlobalTranslationService.py
+++ b/lib/python/Products/PageTemplates/GlobalTranslationService.py
--- a/lib/python/Products/PageTemplates/PageTemplate.py
+++ b/lib/python/Products/PageTemplates/PageTemplate.py
--- a/lib/python/Products/PageTemplates/PageTemplateFile.py
+++ b/lib/python/Products/PageTemplates/PageTemplateFile.py
--- a/lib/python/Products/PageTemplates/PathIterator.py
+++ b/lib/python/Products/PageTemplates/PathIterator.py
--- a/lib/python/Products/PageTemplates/PythonExpr.py
+++ b/lib/python/Products/PageTemplates/PythonExpr.py
--- a/lib/python/Products/PageTemplates/TALES.py
+++ b/lib/python/Products/PageTemplates/TALES.py
--- a/lib/python/Products/PageTemplates/ZPythonExpr.py
+++ b/lib/python/Products/PageTemplates/ZPythonExpr.py
--- a/lib/python/Products/PageTemplates/ZRPythonExpr.py
+++ b/lib/python/Products/PageTemplates/ZRPythonExpr.py
--- a/lib/python/Products/PageTemplates/ZopePageTemplate.py
+++ b/lib/python/Products/PageTemplates/ZopePageTemplate.py
--- a/lib/python/Products/PageTemplates/__init__.py
+++ b/lib/python/Products/PageTemplates/__init__.py
--- a/lib/python/Products/PageTemplates/tests/batch.py
+++ b/lib/python/Products/PageTemplates/tests/batch.py
--- a/lib/python/Products/PageTemplates/tests/testDTMLTests.py
+++ b/lib/python/Products/PageTemplates/tests/testDTMLTests.py
--- a/lib/python/Products/PageTemplates/tests/testHTMLTests.py
+++ b/lib/python/Products/PageTemplates/tests/testHTMLTests.py
--- a/lib/python/Products/PageTemplates/tests/util.py
+++ b/lib/python/Products/PageTemplates/tests/util.py
--- a/lib/python/Products/PluginIndexes/DateIndex/DateIndex.py
+++ b/lib/python/Products/PluginIndexes/DateIndex/DateIndex.py
--- a/lib/python/Products/PluginIndexes/DateIndex/tests/__init__.py
+++ b/lib/python/Products/PluginIndexes/DateIndex/tests/__init__.py
--- a/lib/python/Products/PluginIndexes/DateIndex/tests/test_DateIndex.py
+++ b/lib/python/Products/PluginIndexes/DateIndex/tests/test_DateIndex.py
--- a/lib/python/Products/PluginIndexes/DateRangeIndex/DateRangeIndex.py
+++ b/lib/python/Products/PluginIndexes/DateRangeIndex/DateRangeIndex.py
--- a/lib/python/Products/PluginIndexes/DateRangeIndex/tests/__init__.py
+++ b/lib/python/Products/PluginIndexes/DateRangeIndex/tests/__init__.py
--- a/lib/python/Products/PluginIndexes/DateRangeIndex/tests/test_DateRangeIndex.py
+++ b/lib/python/Products/PluginIndexes/DateRangeIndex/tests/test_DateRangeIndex.py
--- a/lib/python/Products/PluginIndexes/FieldIndex/FieldIndex.py
+++ b/lib/python/Products/PluginIndexes/FieldIndex/FieldIndex.py
--- a/lib/python/Products/PluginIndexes/FieldIndex/tests/__init__.py
+++ b/lib/python/Products/PluginIndexes/FieldIndex/tests/__init__.py
--- a/lib/python/Products/PluginIndexes/FieldIndex/tests/testFieldIndex.py
+++ b/lib/python/Products/PluginIndexes/FieldIndex/tests/testFieldIndex.py
--- a/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.py
+++ b/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.py
--- a/lib/python/Products/PluginIndexes/KeywordIndex/tests/__init__.py
+++ b/lib/python/Products/PluginIndexes/KeywordIndex/tests/__init__.py
--- a/lib/python/Products/PluginIndexes/KeywordIndex/tests/testKeywordIndex.py
+++ b/lib/python/Products/PluginIndexes/KeywordIndex/tests/testKeywordIndex.py
--- a/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py
+++ b/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py
--- a/lib/python/Products/PluginIndexes/PathIndex/tests/testPathIndex.py
+++ b/lib/python/Products/PluginIndexes/PathIndex/tests/testPathIndex.py
--- a/lib/python/Products/PluginIndexes/TextIndex/GlobbingLexicon.py
+++ b/lib/python/Products/PluginIndexes/TextIndex/GlobbingLexicon.py
--- a/lib/python/Products/PluginIndexes/TextIndex/Lexicon.py
+++ b/lib/python/Products/PluginIndexes/TextIndex/Lexicon.py
--- a/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/src/ISO_8859_1_Splitter.c
+++ b/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/src/ISO_8859_1_Splitter.c
--- a/lib/python/Products/PluginIndexes/TextIndex/Splitter/UnicodeSplitter/src/UnicodeSplitter.c
+++ b/lib/python/Products/PluginIndexes/TextIndex/Splitter/UnicodeSplitter/src/UnicodeSplitter.c
--- a/lib/python/Products/PluginIndexes/TextIndex/Splitter/UnicodeSplitter/tests/testUnicodeSplitter.py
+++ b/lib/python/Products/PluginIndexes/TextIndex/Splitter/UnicodeSplitter/tests/testUnicodeSplitter.py
--- a/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/src/ZopeSplitter.c
+++ b/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/src/ZopeSplitter.c
--- a/lib/python/Products/PluginIndexes/TextIndex/Splitter/__init__.py
+++ b/lib/python/Products/PluginIndexes/TextIndex/Splitter/__init__.py
--- a/lib/python/Products/PluginIndexes/TextIndex/TextIndex.py
+++ b/lib/python/Products/PluginIndexes/TextIndex/TextIndex.py
--- a/lib/python/Products/PluginIndexes/TextIndex/Vocabulary.py
+++ b/lib/python/Products/PluginIndexes/TextIndex/Vocabulary.py
--- a/lib/python/Products/PluginIndexes/TextIndex/tests/__init__.py
+++ b/lib/python/Products/PluginIndexes/TextIndex/tests/__init__.py
--- a/lib/python/Products/PluginIndexes/TextIndex/tests/testSplitter.py
+++ b/lib/python/Products/PluginIndexes/TextIndex/tests/testSplitter.py
--- a/lib/python/Products/PluginIndexes/TextIndex/tests/testTextIndex.py
+++ b/lib/python/Products/PluginIndexes/TextIndex/tests/testTextIndex.py
--- a/lib/python/Products/PluginIndexes/TopicIndex/FilteredSet.py
+++ b/lib/python/Products/PluginIndexes/TopicIndex/FilteredSet.py
--- a/lib/python/Products/PluginIndexes/TopicIndex/TopicIndex.py
+++ b/lib/python/Products/PluginIndexes/TopicIndex/TopicIndex.py
--- a/lib/python/Products/PluginIndexes/TopicIndex/__init__.py
+++ b/lib/python/Products/PluginIndexes/TopicIndex/__init__.py
--- a/lib/python/Products/PluginIndexes/TopicIndex/tests/__init__.py
+++ b/lib/python/Products/PluginIndexes/TopicIndex/tests/__init__.py
--- a/lib/python/Products/PluginIndexes/TopicIndex/tests/testTopicIndex.py
+++ b/lib/python/Products/PluginIndexes/TopicIndex/tests/testTopicIndex.py
--- a/lib/python/Products/PluginIndexes/__init__.py
+++ b/lib/python/Products/PluginIndexes/__init__.py
--- a/lib/python/Products/PluginIndexes/common/PluggableIndex.py
+++ b/lib/python/Products/PluginIndexes/common/PluggableIndex.py
--- a/lib/python/Products/PluginIndexes/common/ResultList.py
+++ b/lib/python/Products/PluginIndexes/common/ResultList.py
--- a/lib/python/Products/PluginIndexes/common/UnIndex.py
+++ b/lib/python/Products/PluginIndexes/common/UnIndex.py
--- a/lib/python/Products/PluginIndexes/common/__init__.py
+++ b/lib/python/Products/PluginIndexes/common/__init__.py
--- a/lib/python/Products/PluginIndexes/common/randid.py
+++ b/lib/python/Products/PluginIndexes/common/randid.py
--- a/lib/python/Products/PluginIndexes/common/tests/__init__.py
+++ b/lib/python/Products/PluginIndexes/common/tests/__init__.py
--- a/lib/python/Products/PluginIndexes/common/tests/test_UnIndex.py
+++ b/lib/python/Products/PluginIndexes/common/tests/test_UnIndex.py
--- a/lib/python/Products/PluginIndexes/common/util.py
+++ b/lib/python/Products/PluginIndexes/common/util.py
--- a/lib/python/Products/PythonScripts/PythonScript.py
+++ b/lib/python/Products/PythonScripts/PythonScript.py
--- a/lib/python/Products/PythonScripts/Utility.py
+++ b/lib/python/Products/PythonScripts/Utility.py
--- a/lib/python/Products/PythonScripts/__init__.py
+++ b/lib/python/Products/PythonScripts/__init__.py
--- a/lib/python/Products/PythonScripts/help/PythonScript.py
+++ b/lib/python/Products/PythonScripts/help/PythonScript.py
--- a/lib/python/Products/PythonScripts/help/Script.py
+++ b/lib/python/Products/PythonScripts/help/Script.py
--- a/lib/python/Products/PythonScripts/standard.py
+++ b/lib/python/Products/PythonScripts/standard.py
--- a/lib/python/Products/PythonScripts/tests/testPythonScript.py
+++ b/lib/python/Products/PythonScripts/tests/testPythonScript.py
--- a/lib/python/Products/Sessions/BrowserIdManager.py
+++ b/lib/python/Products/Sessions/BrowserIdManager.py
--- a/lib/python/Products/Sessions/SessionDataManager.py
+++ b/lib/python/Products/Sessions/SessionDataManager.py
--- a/lib/python/Products/Sessions/SessionInterfaces.py
+++ b/lib/python/Products/Sessions/SessionInterfaces.py
--- a/lib/python/Products/Sessions/SessionPermissions.py
+++ b/lib/python/Products/Sessions/SessionPermissions.py
--- a/lib/python/Products/Sessions/__init__.py
+++ b/lib/python/Products/Sessions/__init__.py
--- a/lib/python/Products/Sessions/common.py
+++ b/lib/python/Products/Sessions/common.py
--- a/lib/python/Products/Sessions/help/SessionInterfaces.py
+++ b/lib/python/Products/Sessions/help/SessionInterfaces.py
--- a/lib/python/Products/Sessions/stresstests/stresstestMultiThread.py
+++ b/lib/python/Products/Sessions/stresstests/stresstestMultiThread.py
--- a/lib/python/Products/Sessions/tests/__init__.py
+++ b/lib/python/Products/Sessions/tests/__init__.py
--- a/lib/python/Products/Sessions/tests/testBrowserIdManager.py
+++ b/lib/python/Products/Sessions/tests/testBrowserIdManager.py
--- a/lib/python/Products/Sessions/tests/testSessionDataManager.py
+++ b/lib/python/Products/Sessions/tests/testSessionDataManager.py
--- a/lib/python/Products/SiteErrorLog/SiteErrorLog.py
+++ b/lib/python/Products/SiteErrorLog/SiteErrorLog.py
--- a/lib/python/Products/SiteErrorLog/__init__.py
+++ b/lib/python/Products/SiteErrorLog/__init__.py
--- a/lib/python/Products/StandardCacheManagers/AcceleratedHTTPCacheManager.py
+++ b/lib/python/Products/StandardCacheManagers/AcceleratedHTTPCacheManager.py
--- a/lib/python/Products/StandardCacheManagers/RAMCacheManager.py
+++ b/lib/python/Products/StandardCacheManagers/RAMCacheManager.py
--- a/lib/python/Products/StandardCacheManagers/__init__.py
+++ b/lib/python/Products/StandardCacheManagers/__init__.py
--- a/lib/python/Products/StandardCacheManagers/tests/__init__.py
+++ b/lib/python/Products/StandardCacheManagers/tests/__init__.py
--- a/lib/python/Products/StandardCacheManagers/tests/test_AcceleratedHTTPCacheManager.py
+++ b/lib/python/Products/StandardCacheManagers/tests/test_AcceleratedHTTPCacheManager.py
--- a/lib/python/Products/TemporaryFolder/LowConflictConnection.py
+++ b/lib/python/Products/TemporaryFolder/LowConflictConnection.py
--- a/lib/python/Products/TemporaryFolder/TemporaryFolder.py
+++ b/lib/python/Products/TemporaryFolder/TemporaryFolder.py
--- a/lib/python/Products/TemporaryFolder/__init__.py
+++ b/lib/python/Products/TemporaryFolder/__init__.py
--- a/lib/python/Products/TemporaryFolder/patchfs.py
+++ b/lib/python/Products/TemporaryFolder/patchfs.py
--- a/lib/python/Products/Transience/Fake.py
+++ b/lib/python/Products/Transience/Fake.py
--- a/lib/python/Products/Transience/Transience.py
+++ b/lib/python/Products/Transience/Transience.py
--- a/lib/python/Products/Transience/TransienceInterfaces.py
+++ b/lib/python/Products/Transience/TransienceInterfaces.py
--- a/lib/python/Products/Transience/TransientObject.py
+++ b/lib/python/Products/Transience/TransientObject.py
--- a/lib/python/Products/Transience/__init__.py
+++ b/lib/python/Products/Transience/__init__.py
--- a/lib/python/Products/Transience/help/TransienceInterfaces.py
+++ b/lib/python/Products/Transience/help/TransienceInterfaces.py
--- a/lib/python/Products/Transience/tests/__init__.py
+++ b/lib/python/Products/Transience/tests/__init__.py
--- a/lib/python/Products/Transience/tests/testCounters.py
+++ b/lib/python/Products/Transience/tests/testCounters.py
--- a/lib/python/Products/Transience/tests/testTransactionHelper.py
+++ b/lib/python/Products/Transience/tests/testTransactionHelper.py
--- a/lib/python/Products/Transience/tests/testTransientObject.py
+++ b/lib/python/Products/Transience/tests/testTransientObject.py
--- a/lib/python/Products/Transience/tests/testTransientObjectContainer.py
+++ b/lib/python/Products/Transience/tests/testTransientObjectContainer.py
--- a/lib/python/Products/ZCTextIndex/BaseIndex.py
+++ b/lib/python/Products/ZCTextIndex/BaseIndex.py
--- a/lib/python/Products/ZCTextIndex/CosineIndex.py
+++ b/lib/python/Products/ZCTextIndex/CosineIndex.py
--- a/lib/python/Products/ZCTextIndex/HTMLSplitter.py
+++ b/lib/python/Products/ZCTextIndex/HTMLSplitter.py
--- a/lib/python/Products/ZCTextIndex/IIndex.py
+++ b/lib/python/Products/ZCTextIndex/IIndex.py
--- a/lib/python/Products/ZCTextIndex/ILexicon.py
+++ b/lib/python/Products/ZCTextIndex/ILexicon.py
--- a/lib/python/Products/ZCTextIndex/INBest.py
+++ b/lib/python/Products/ZCTextIndex/INBest.py
--- a/lib/python/Products/ZCTextIndex/IPipelineElement.py
+++ b/lib/python/Products/ZCTextIndex/IPipelineElement.py
--- a/lib/python/Products/ZCTextIndex/IPipelineElementFactory.py
+++ b/lib/python/Products/ZCTextIndex/IPipelineElementFactory.py
--- a/lib/python/Products/ZCTextIndex/IQueryParseTree.py
+++ b/lib/python/Products/ZCTextIndex/IQueryParseTree.py
--- a/lib/python/Products/ZCTextIndex/IQueryParser.py
+++ b/lib/python/Products/ZCTextIndex/IQueryParser.py
--- a/lib/python/Products/ZCTextIndex/ISplitter.py
+++ b/lib/python/Products/ZCTextIndex/ISplitter.py
--- a/lib/python/Products/ZCTextIndex/Lexicon.py
+++ b/lib/python/Products/ZCTextIndex/Lexicon.py
--- a/lib/python/Products/ZCTextIndex/NBest.py
+++ b/lib/python/Products/ZCTextIndex/NBest.py
--- a/lib/python/Products/ZCTextIndex/OkapiIndex.py
+++ b/lib/python/Products/ZCTextIndex/OkapiIndex.py
--- a/lib/python/Products/ZCTextIndex/ParseTree.py
+++ b/lib/python/Products/ZCTextIndex/ParseTree.py
--- a/lib/python/Products/ZCTextIndex/PipelineFactory.py
+++ b/lib/python/Products/ZCTextIndex/PipelineFactory.py
--- a/lib/python/Products/ZCTextIndex/QueryParser.py
+++ b/lib/python/Products/ZCTextIndex/QueryParser.py
--- a/lib/python/Products/ZCTextIndex/RiceCode.py
+++ b/lib/python/Products/ZCTextIndex/RiceCode.py
--- a/lib/python/Products/ZCTextIndex/SetOps.py
+++ b/lib/python/Products/ZCTextIndex/SetOps.py
--- a/lib/python/Products/ZCTextIndex/StopDict.py
+++ b/lib/python/Products/ZCTextIndex/StopDict.py
--- a/lib/python/Products/ZCTextIndex/WidCode.py
+++ b/lib/python/Products/ZCTextIndex/WidCode.py
--- a/lib/python/Products/ZCTextIndex/ZCTextIndex.py
+++ b/lib/python/Products/ZCTextIndex/ZCTextIndex.py
--- a/lib/python/Products/ZCTextIndex/__init__.py
+++ b/lib/python/Products/ZCTextIndex/__init__.py
--- a/lib/python/Products/ZCTextIndex/okascore.c
+++ b/lib/python/Products/ZCTextIndex/okascore.c
--- a/lib/python/Products/ZCTextIndex/stopper.c
+++ b/lib/python/Products/ZCTextIndex/stopper.c
--- a/lib/python/Products/ZCTextIndex/tests/__init__.py
+++ b/lib/python/Products/ZCTextIndex/tests/__init__.py
--- a/lib/python/Products/ZCTextIndex/tests/testIndex.py
+++ b/lib/python/Products/ZCTextIndex/tests/testIndex.py
--- a/lib/python/Products/ZCTextIndex/tests/testLexicon.py
+++ b/lib/python/Products/ZCTextIndex/tests/testLexicon.py
--- a/lib/python/Products/ZCTextIndex/tests/testNBest.py
+++ b/lib/python/Products/ZCTextIndex/tests/testNBest.py
--- a/lib/python/Products/ZCTextIndex/tests/testPipelineFactory.py
+++ b/lib/python/Products/ZCTextIndex/tests/testPipelineFactory.py
--- a/lib/python/Products/ZCTextIndex/tests/testQueryEngine.py
+++ b/lib/python/Products/ZCTextIndex/tests/testQueryEngine.py
--- a/lib/python/Products/ZCTextIndex/tests/testQueryParser.py
+++ b/lib/python/Products/ZCTextIndex/tests/testQueryParser.py
--- a/lib/python/Products/ZCTextIndex/tests/testSetOps.py
+++ b/lib/python/Products/ZCTextIndex/tests/testSetOps.py
--- a/lib/python/Products/ZCTextIndex/tests/testStopper.py
+++ b/lib/python/Products/ZCTextIndex/tests/testStopper.py
--- a/lib/python/Products/ZCTextIndex/tests/testZCTextIndex.py
+++ b/lib/python/Products/ZCTextIndex/tests/testZCTextIndex.py
--- a/lib/python/Products/ZCatalog/Catalog.py
+++ b/lib/python/Products/ZCatalog/Catalog.py
--- a/lib/python/Products/ZCatalog/CatalogAwareness.py
+++ b/lib/python/Products/ZCatalog/CatalogAwareness.py
--- a/lib/python/Products/ZCatalog/CatalogBrains.py
+++ b/lib/python/Products/ZCatalog/CatalogBrains.py
--- a/lib/python/Products/ZCatalog/CatalogPathAwareness.py
+++ b/lib/python/Products/ZCatalog/CatalogPathAwareness.py
--- a/lib/python/Products/ZCatalog/IZCatalog.py
+++ b/lib/python/Products/ZCatalog/IZCatalog.py
--- a/lib/python/Products/ZCatalog/Lazy.py
+++ b/lib/python/Products/ZCatalog/Lazy.py
--- a/lib/python/Products/ZCatalog/ProgressHandler.py
+++ b/lib/python/Products/ZCatalog/ProgressHandler.py
--- a/lib/python/Products/ZCatalog/ZCatalog.py
+++ b/lib/python/Products/ZCatalog/ZCatalog.py
--- a/lib/python/Products/ZCatalog/ZCatalogIndexes.py
+++ b/lib/python/Products/ZCatalog/ZCatalogIndexes.py
--- a/lib/python/Products/ZCatalog/__init__.py
+++ b/lib/python/Products/ZCatalog/__init__.py
--- a/lib/python/Products/ZCatalog/help/Vocabulary.py
+++ b/lib/python/Products/ZCatalog/help/Vocabulary.py
--- a/lib/python/Products/ZCatalog/help/ZCatalog.py
+++ b/lib/python/Products/ZCatalog/help/ZCatalog.py
--- a/lib/python/Products/ZCatalog/tests/testBrains.py
+++ b/lib/python/Products/ZCatalog/tests/testBrains.py
--- a/lib/python/Products/ZCatalog/tests/testCatalog.py
+++ b/lib/python/Products/ZCatalog/tests/testCatalog.py
--- a/lib/python/Products/ZCatalog/tests/testLazySequences.py
+++ b/lib/python/Products/ZCatalog/tests/testLazySequences.py
--- a/lib/python/Products/ZGadflyDA/DA.py
+++ b/lib/python/Products/ZGadflyDA/DA.py
--- a/lib/python/Products/ZGadflyDA/DABase.py
+++ b/lib/python/Products/ZGadflyDA/DABase.py
--- a/lib/python/Products/ZGadflyDA/__init__.py
+++ b/lib/python/Products/ZGadflyDA/__init__.py
--- a/lib/python/Products/ZGadflyDA/db.py
+++ b/lib/python/Products/ZGadflyDA/db.py
--- a/lib/python/Products/ZODBMountPoint/MountedObject.py
+++ b/lib/python/Products/ZODBMountPoint/MountedObject.py
--- a/lib/python/Products/ZODBMountPoint/__init__.py
+++ b/lib/python/Products/ZODBMountPoint/__init__.py
--- a/lib/python/Products/ZODBMountPoint/tests/testMountPoint.py
+++ b/lib/python/Products/ZODBMountPoint/tests/testMountPoint.py
--- a/lib/python/Products/ZSQLMethods/SQL.py
+++ b/lib/python/Products/ZSQLMethods/SQL.py
--- a/lib/python/Products/ZSQLMethods/__init__.py
+++ b/lib/python/Products/ZSQLMethods/__init__.py
--- a/lib/python/Products/ZSQLMethods/help/ZSQLMethod.py
+++ b/lib/python/Products/ZSQLMethods/help/ZSQLMethod.py
--- a/lib/python/Products/ZopeTutorial/TutorialTopic.py
+++ b/lib/python/Products/ZopeTutorial/TutorialTopic.py
--- a/lib/python/Products/ZopeTutorial/__init__.py
+++ b/lib/python/Products/ZopeTutorial/__init__.py
--- a/lib/python/Products/__init__.py
+++ b/lib/python/Products/__init__.py
--- a/lib/python/Record/_Record.c
+++ b/lib/python/Record/_Record.c
--- a/lib/python/Record/__init__.py
+++ b/lib/python/Record/__init__.py
--- a/lib/python/Record/setup.py
+++ b/lib/python/Record/setup.py
--- a/lib/python/Record/tests.py
+++ b/lib/python/Record/tests.py
--- a/lib/python/RestrictedPython/Eval.py
+++ b/lib/python/RestrictedPython/Eval.py
--- a/lib/python/RestrictedPython/Guards.py
+++ b/lib/python/RestrictedPython/Guards.py
--- a/lib/python/RestrictedPython/Limits.py
+++ b/lib/python/RestrictedPython/Limits.py
--- a/lib/python/RestrictedPython/MutatingWalker.py
+++ b/lib/python/RestrictedPython/MutatingWalker.py
--- a/lib/python/RestrictedPython/PrintCollector.py
+++ b/lib/python/RestrictedPython/PrintCollector.py
--- a/lib/python/RestrictedPython/RCompile.py
+++ b/lib/python/RestrictedPython/RCompile.py
--- a/lib/python/RestrictedPython/RestrictionMutator.py
+++ b/lib/python/RestrictedPython/RestrictionMutator.py
--- a/lib/python/RestrictedPython/SafeMapping.py
+++ b/lib/python/RestrictedPython/SafeMapping.py
--- a/lib/python/RestrictedPython/SelectCompiler.py
+++ b/lib/python/RestrictedPython/SelectCompiler.py
--- a/lib/python/RestrictedPython/Utilities.py
+++ b/lib/python/RestrictedPython/Utilities.py
--- a/lib/python/RestrictedPython/__init__.py
+++ b/lib/python/RestrictedPython/__init__.py
--- a/lib/python/RestrictedPython/tests/before_and_after.py
+++ b/lib/python/RestrictedPython/tests/before_and_after.py
--- a/lib/python/RestrictedPython/tests/before_and_after24.py
+++ b/lib/python/RestrictedPython/tests/before_and_after24.py
--- a/lib/python/RestrictedPython/tests/verify.py
+++ b/lib/python/RestrictedPython/tests/verify.py
--- a/lib/python/Shared/DC/Scripts/Bindings.py
+++ b/lib/python/Shared/DC/Scripts/Bindings.py
--- a/lib/python/Shared/DC/Scripts/BindingsUI.py
+++ b/lib/python/Shared/DC/Scripts/BindingsUI.py
--- a/lib/python/Shared/DC/Scripts/Script.py
+++ b/lib/python/Shared/DC/Scripts/Script.py
--- a/lib/python/Shared/DC/Scripts/Signature.py
+++ b/lib/python/Shared/DC/Scripts/Signature.py
--- a/lib/python/Shared/DC/Scripts/__init__.py
+++ b/lib/python/Shared/DC/Scripts/__init__.py
--- a/lib/python/Shared/DC/ZRDB/Aqueduct.py
+++ b/lib/python/Shared/DC/ZRDB/Aqueduct.py
--- a/lib/python/Shared/DC/ZRDB/Connection.py
+++ b/lib/python/Shared/DC/ZRDB/Connection.py
--- a/lib/python/Shared/DC/ZRDB/DA.py
+++ b/lib/python/Shared/DC/ZRDB/DA.py
--- a/lib/python/Shared/DC/ZRDB/RDB.py
+++ b/lib/python/Shared/DC/ZRDB/RDB.py
--- a/lib/python/Shared/DC/ZRDB/Results.py
+++ b/lib/python/Shared/DC/ZRDB/Results.py
--- a/lib/python/Shared/DC/ZRDB/Search.py
+++ b/lib/python/Shared/DC/ZRDB/Search.py
--- a/lib/python/Shared/DC/ZRDB/THUNK.py
+++ b/lib/python/Shared/DC/ZRDB/THUNK.py
--- a/lib/python/Shared/DC/ZRDB/TM.py
+++ b/lib/python/Shared/DC/ZRDB/TM.py
--- a/lib/python/Shared/DC/ZRDB/__init__.py
+++ b/lib/python/Shared/DC/ZRDB/__init__.py
--- a/lib/python/Shared/DC/ZRDB/dbi_db.py
+++ b/lib/python/Shared/DC/ZRDB/dbi_db.py
--- a/lib/python/Shared/DC/ZRDB/sqlgroup.py
+++ b/lib/python/Shared/DC/ZRDB/sqlgroup.py
--- a/lib/python/Shared/DC/ZRDB/sqltest.py
+++ b/lib/python/Shared/DC/ZRDB/sqltest.py
--- a/lib/python/Shared/DC/ZRDB/sqlvar.py
+++ b/lib/python/Shared/DC/ZRDB/sqlvar.py
--- a/lib/python/Shared/DC/ZRDB/tests/test_sqlgroup.py
+++ b/lib/python/Shared/DC/ZRDB/tests/test_sqlgroup.py
--- a/lib/python/Shared/DC/ZRDB/tests/test_sqlvar.py
+++ b/lib/python/Shared/DC/ZRDB/tests/test_sqlvar.py
--- a/lib/python/Shared/DC/__init__.py
+++ b/lib/python/Shared/DC/__init__.py
--- a/lib/python/Shared/DC/xml/__init__.py
+++ b/lib/python/Shared/DC/xml/__init__.py
--- a/lib/python/Shared/DC/xml/ppml.py
+++ b/lib/python/Shared/DC/xml/ppml.py
--- a/lib/python/Shared/__init__.py
+++ b/lib/python/Shared/__init__.py
--- a/lib/python/Signals/SignalHandler.py
+++ b/lib/python/Signals/SignalHandler.py
--- a/lib/python/Signals/Signals.py
+++ b/lib/python/Signals/Signals.py
--- a/lib/python/Signals/WinSignalHandler.py
+++ b/lib/python/Signals/WinSignalHandler.py
--- a/lib/python/StructuredText/ClassicDocumentClass.py
+++ b/lib/python/StructuredText/ClassicDocumentClass.py
--- a/lib/python/StructuredText/ClassicStructuredText.py
+++ b/lib/python/StructuredText/ClassicStructuredText.py
--- a/lib/python/StructuredText/DocBookClass.py
+++ b/lib/python/StructuredText/DocBookClass.py
--- a/lib/python/StructuredText/DocumentClass.py
+++ b/lib/python/StructuredText/DocumentClass.py
--- a/lib/python/StructuredText/DocumentWithImages.py
+++ b/lib/python/StructuredText/DocumentWithImages.py
--- a/lib/python/StructuredText/HTMLClass.py
+++ b/lib/python/StructuredText/HTMLClass.py
--- a/lib/python/StructuredText/HTMLWithImages.py
+++ b/lib/python/StructuredText/HTMLWithImages.py
--- a/lib/python/StructuredText/ST.py
+++ b/lib/python/StructuredText/ST.py
--- a/lib/python/StructuredText/STDOM.py
+++ b/lib/python/StructuredText/STDOM.py
--- a/lib/python/StructuredText/StructuredText.py
+++ b/lib/python/StructuredText/StructuredText.py
--- a/lib/python/StructuredText/Zwiki.py
+++ b/lib/python/StructuredText/Zwiki.py
--- a/lib/python/StructuredText/__init__.py
+++ b/lib/python/StructuredText/__init__.py
--- a/lib/python/StructuredText/regressions/create_referencesfiles.py
+++ b/lib/python/StructuredText/regressions/create_referencesfiles.py
--- a/lib/python/StructuredText/tests/__init__.py
+++ b/lib/python/StructuredText/tests/__init__.py
--- a/lib/python/StructuredText/tests/testStructuredText.py
+++ b/lib/python/StructuredText/tests/testStructuredText.py
--- a/lib/python/StructuredText/ts_regex.py
+++ b/lib/python/StructuredText/ts_regex.py
--- a/lib/python/TAL/DummyEngine.py
+++ b/lib/python/TAL/DummyEngine.py
--- a/lib/python/TAL/HTMLTALParser.py
+++ b/lib/python/TAL/HTMLTALParser.py
--- a/lib/python/TAL/TALDefs.py
+++ b/lib/python/TAL/TALDefs.py
--- a/lib/python/TAL/TALGenerator.py
+++ b/lib/python/TAL/TALGenerator.py
--- a/lib/python/TAL/TALParser.py
+++ b/lib/python/TAL/TALParser.py
--- a/lib/python/TAL/TranslationContext.py
+++ b/lib/python/TAL/TranslationContext.py
--- a/lib/python/TAL/XMLParser.py
+++ b/lib/python/TAL/XMLParser.py
--- a/lib/python/TAL/__init__.py
+++ b/lib/python/TAL/__init__.py
--- a/lib/python/TAL/driver.py
+++ b/lib/python/TAL/driver.py
--- a/lib/python/TAL/runtest.py
+++ b/lib/python/TAL/runtest.py
--- a/lib/python/TAL/talgettext.py
+++ b/lib/python/TAL/talgettext.py
--- a/lib/python/TAL/tests/test_htmltalparser.py
+++ b/lib/python/TAL/tests/test_htmltalparser.py
--- a/lib/python/TAL/timer.py
+++ b/lib/python/TAL/timer.py
--- a/lib/python/Testing/__init__.py
+++ b/lib/python/Testing/__init__.py
--- a/lib/python/Testing/dispatcher.py
+++ b/lib/python/Testing/dispatcher.py
--- a/lib/python/Testing/makerequest.py
+++ b/lib/python/Testing/makerequest.py
--- a/lib/python/ThreadLock/_ThreadLock.c
+++ b/lib/python/ThreadLock/_ThreadLock.c
--- a/lib/python/ThreadLock/setup.py
+++ b/lib/python/ThreadLock/setup.py
--- a/lib/python/ThreadLock/tests.py
+++ b/lib/python/ThreadLock/tests.py
--- a/lib/python/TreeDisplay/TreeTag.py
+++ b/lib/python/TreeDisplay/TreeTag.py
--- a/lib/python/TreeDisplay/__init__.py
+++ b/lib/python/TreeDisplay/__init__.py
--- a/lib/python/ZClasses/Basic.py
+++ b/lib/python/ZClasses/Basic.py
--- a/lib/python/ZClasses/Method.py
+++ b/lib/python/ZClasses/Method.py
--- a/lib/python/ZClasses/ObjectManager.py
+++ b/lib/python/ZClasses/ObjectManager.py
--- a/lib/python/ZClasses/Property.py
+++ b/lib/python/ZClasses/Property.py
--- a/lib/python/ZClasses/ZClass.py
+++ b/lib/python/ZClasses/ZClass.py
--- a/lib/python/ZClasses/ZClassOwner.py
+++ b/lib/python/ZClasses/ZClassOwner.py
--- a/lib/python/ZClasses/_pmc.py
+++ b/lib/python/ZClasses/_pmc.py
--- a/lib/python/ZPublisher/BaseRequest.py
+++ b/lib/python/ZPublisher/BaseRequest.py
--- a/lib/python/ZPublisher/BaseResponse.py
+++ b/lib/python/ZPublisher/BaseResponse.py
--- a/lib/python/ZPublisher/BeforeTraverse.py
+++ b/lib/python/ZPublisher/BeforeTraverse.py
--- a/lib/python/ZPublisher/Client.py
+++ b/lib/python/ZPublisher/Client.py
--- a/lib/python/ZPublisher/Converters.py
+++ b/lib/python/ZPublisher/Converters.py
--- a/lib/python/ZPublisher/HTTPRangeSupport.py
+++ b/lib/python/ZPublisher/HTTPRangeSupport.py
--- a/lib/python/ZPublisher/HTTPRequest.py
+++ b/lib/python/ZPublisher/HTTPRequest.py
--- a/lib/python/ZPublisher/HTTPResponse.py
+++ b/lib/python/ZPublisher/HTTPResponse.py
--- a/lib/python/ZPublisher/Publish.py
+++ b/lib/python/ZPublisher/Publish.py
--- a/lib/python/ZPublisher/Request.py
+++ b/lib/python/ZPublisher/Request.py
--- a/lib/python/ZPublisher/Response.py
+++ b/lib/python/ZPublisher/Response.py
--- a/lib/python/ZPublisher/TaintedString.py
+++ b/lib/python/ZPublisher/TaintedString.py
--- a/lib/python/ZPublisher/Test.py
+++ b/lib/python/ZPublisher/Test.py
--- a/lib/python/ZPublisher/__init__.py
+++ b/lib/python/ZPublisher/__init__.py
--- a/lib/python/ZPublisher/mapply.py
+++ b/lib/python/ZPublisher/mapply.py
--- a/lib/python/ZPublisher/maybe_lock.py
+++ b/lib/python/ZPublisher/maybe_lock.py
--- a/lib/python/ZPublisher/tests/testHTTPRangeSupport.py
+++ b/lib/python/ZPublisher/tests/testHTTPRangeSupport.py
--- a/lib/python/ZPublisher/tests/testTaintedString.py
+++ b/lib/python/ZPublisher/tests/testTaintedString.py
--- a/lib/python/ZPublisher/xmlrpc.py
+++ b/lib/python/ZPublisher/xmlrpc.py
--- a/lib/python/ZServer/AccessLogger.py
+++ b/lib/python/ZServer/AccessLogger.py
--- a/lib/python/ZServer/BaseLogger.py
+++ b/lib/python/ZServer/BaseLogger.py
--- a/lib/python/ZServer/DebugLogger.py
+++ b/lib/python/ZServer/DebugLogger.py
--- a/lib/python/ZServer/FCGIServer.py
+++ b/lib/python/ZServer/FCGIServer.py
--- a/lib/python/ZServer/FTPRequest.py
+++ b/lib/python/ZServer/FTPRequest.py
--- a/lib/python/ZServer/FTPResponse.py
+++ b/lib/python/ZServer/FTPResponse.py
--- a/lib/python/ZServer/FTPServer.py
+++ b/lib/python/ZServer/FTPServer.py
--- a/lib/python/ZServer/HTTPResponse.py
+++ b/lib/python/ZServer/HTTPResponse.py
--- a/lib/python/ZServer/HTTPServer.py
+++ b/lib/python/ZServer/HTTPServer.py
--- a/lib/python/ZServer/ICPServer.py
+++ b/lib/python/ZServer/ICPServer.py
--- a/lib/python/ZServer/PCGIServer.py
+++ b/lib/python/ZServer/PCGIServer.py
--- a/lib/python/ZServer/Producers.py
+++ b/lib/python/ZServer/Producers.py
--- a/lib/python/ZServer/PubCore/ZEvent.py
+++ b/lib/python/ZServer/PubCore/ZEvent.py
--- a/lib/python/ZServer/PubCore/ZRendezvous.py
+++ b/lib/python/ZServer/PubCore/ZRendezvous.py
--- a/lib/python/ZServer/PubCore/ZServerPublisher.py
+++ b/lib/python/ZServer/PubCore/ZServerPublisher.py
--- a/lib/python/ZServer/PubCore/__init__.py
+++ b/lib/python/ZServer/PubCore/__init__.py
--- a/lib/python/ZServer/WebDAVSrcHandler.py
+++ b/lib/python/ZServer/WebDAVSrcHandler.py
--- a/lib/python/ZServer/__init__.py
+++ b/lib/python/ZServer/__init__.py
--- a/lib/python/ZServer/datatypes.py
+++ b/lib/python/ZServer/datatypes.py
--- a/lib/python/ZServer/tests/__init__.py
+++ b/lib/python/ZServer/tests/__init__.py
--- a/lib/python/ZServer/tests/test_config.py
+++ b/lib/python/ZServer/tests/test_config.py
--- a/lib/python/ZServer/tests/test_responses.py
+++ b/lib/python/ZServer/tests/test_responses.py
--- a/lib/python/ZServer/utils.py
+++ b/lib/python/ZServer/utils.py
--- a/lib/python/ZTUtils/Batch.py
+++ b/lib/python/ZTUtils/Batch.py
--- a/lib/python/ZTUtils/Iterator.py
+++ b/lib/python/ZTUtils/Iterator.py
--- a/lib/python/ZTUtils/SimpleTree.py
+++ b/lib/python/ZTUtils/SimpleTree.py
--- a/lib/python/ZTUtils/Tree.py
+++ b/lib/python/ZTUtils/Tree.py
--- a/lib/python/ZTUtils/Zope.py
+++ b/lib/python/ZTUtils/Zope.py
--- a/lib/python/ZTUtils/__init__.py
+++ b/lib/python/ZTUtils/__init__.py
--- a/lib/python/Zope.py
+++ b/lib/python/Zope.py
--- a/lib/python/Zope2/App/ClassFactory.py
+++ b/lib/python/Zope2/App/ClassFactory.py
--- a/lib/python/Zope2/App/__init__.py
+++ b/lib/python/Zope2/App/__init__.py
--- a/lib/python/Zope2/App/startup.py
+++ b/lib/python/Zope2/App/startup.py
--- a/lib/python/Zope2/ClassFactory.py
+++ b/lib/python/Zope2/ClassFactory.py
--- a/lib/python/Zope2/Startup/__init__.py
+++ b/lib/python/Zope2/Startup/__init__.py
--- a/lib/python/Zope2/Startup/datatypes.py
+++ b/lib/python/Zope2/Startup/datatypes.py
--- a/lib/python/Zope2/Startup/misc/TextBlockFormatter.py
+++ b/lib/python/Zope2/Startup/misc/TextBlockFormatter.py
--- a/lib/python/Zope2/Startup/misc/lock_file.py
+++ b/lib/python/Zope2/Startup/misc/lock_file.py
--- a/lib/python/Zope2/Startup/misc/zpasswd.py
+++ b/lib/python/Zope2/Startup/misc/zpasswd.py
--- a/lib/python/Zope2/Startup/nt/NTService.py
+++ b/lib/python/Zope2/Startup/nt/NTService.py
--- a/lib/python/Zope2/Startup/options.py
+++ b/lib/python/Zope2/Startup/options.py
--- a/lib/python/Zope2/Startup/run.py
+++ b/lib/python/Zope2/Startup/run.py
--- a/lib/python/Zope2/Startup/tests/__init__.py
+++ b/lib/python/Zope2/Startup/tests/__init__.py
--- a/lib/python/Zope2/Startup/tests/testStarter.py
+++ b/lib/python/Zope2/Startup/tests/testStarter.py
--- a/lib/python/Zope2/Startup/tests/test_schema.py
+++ b/lib/python/Zope2/Startup/tests/test_schema.py
--- a/lib/python/Zope2/Startup/tests/test_warnfilter.py
+++ b/lib/python/Zope2/Startup/tests/test_warnfilter.py
--- a/lib/python/Zope2/Startup/warnfilter.py
+++ b/lib/python/Zope2/Startup/warnfilter.py
--- a/lib/python/Zope2/Startup/zopectl.py
+++ b/lib/python/Zope2/Startup/zopectl.py
--- a/lib/python/Zope2/__init__.py
+++ b/lib/python/Zope2/__init__.py
--- a/lib/python/initgroups/_initgroups.c
+++ b/lib/python/initgroups/_initgroups.c
--- a/lib/python/nt_svcutils/service.py
+++ b/lib/python/nt_svcutils/service.py
--- a/lib/python/reStructuredText/__init__.py
+++ b/lib/python/reStructuredText/__init__.py
--- a/lib/python/tempstorage/TemporaryStorage.py
+++ b/lib/python/tempstorage/TemporaryStorage.py
--- a/lib/python/tempstorage/tests/__init__.py
+++ b/lib/python/tempstorage/tests/__init__.py
--- a/lib/python/webdav/Collection.py
+++ b/lib/python/webdav/Collection.py
--- a/lib/python/webdav/EtagSupport.py
+++ b/lib/python/webdav/EtagSupport.py
--- a/lib/python/webdav/LockItem.py
+++ b/lib/python/webdav/LockItem.py
--- a/lib/python/webdav/Lockable.py
+++ b/lib/python/webdav/Lockable.py
--- a/lib/python/webdav/NullResource.py
+++ b/lib/python/webdav/NullResource.py
--- a/lib/python/webdav/Resource.py
+++ b/lib/python/webdav/Resource.py
--- a/lib/python/webdav/WriteLockInterface.py
+++ b/lib/python/webdav/WriteLockInterface.py
--- a/lib/python/webdav/__init__.py
+++ b/lib/python/webdav/__init__.py
--- a/lib/python/webdav/common.py
+++ b/lib/python/webdav/common.py
--- a/lib/python/webdav/davcmds.py
+++ b/lib/python/webdav/davcmds.py
--- a/lib/python/webdav/xmltools.py
+++ b/lib/python/webdav/xmltools.py
--- a/lib/python/zExceptions/ExceptionFormatter.py
+++ b/lib/python/zExceptions/ExceptionFormatter.py
--- a/lib/python/zExceptions/ITracebackSupplement.py
+++ b/lib/python/zExceptions/ITracebackSupplement.py
--- a/lib/python/zExceptions/__init__.py
+++ b/lib/python/zExceptions/__init__.py
--- a/lib/python/zExceptions/tests/testExceptionFormatter.py
+++ b/lib/python/zExceptions/tests/testExceptionFormatter.py
--- a/lib/python/zExceptions/unauthorized.py
+++ b/lib/python/zExceptions/unauthorized.py
--- a/lib/python/zLOG/EventLogger.py
+++ b/lib/python/zLOG/EventLogger.py
--- a/lib/python/zLOG/__init__.py
+++ b/lib/python/zLOG/__init__.py
--- a/lib/python/zLOG/tests/test_logging.py
+++ b/lib/python/zLOG/tests/test_logging.py
--- a/lib/python/zLOG/tests/testzLog.py
+++ b/lib/python/zLOG/tests/testzLog.py
--- a/test.py
+++ b/test.py
--- a/utilities/check_catalog.py
+++ b/utilities/check_catalog.py
--- a/utilities/compilezpy.py
+++ b/utilities/compilezpy.py
--- a/utilities/copyzopeskel.py
+++ b/utilities/copyzopeskel.py
--- a/utilities/decompilezpy.py
+++ b/utilities/decompilezpy.py
--- a/utilities/load_site.py
+++ b/utilities/load_site.py
--- a/utilities/mkzeoinstance.py
+++ b/utilities/mkzeoinstance.py
--- a/utilities/mkzopeinstance.py
+++ b/utilities/mkzopeinstance.py
--- a/utilities/reindex_catalog.py
+++ b/utilities/reindex_catalog.py
--- a/utilities/requestprofiler.py
+++ b/utilities/requestprofiler.py
--- a/utilities/zpasswd.py
+++ b/utilities/zpasswd.py