Remove last references to Zope 3

src/AccessControl/tests/testZCML.py

@@ -220,7 +220,7 @@ def test_checkPermission():
       >>> from zope.component.testing import setUp, tearDown
       >>> setUp()
 
-    Zope 3 has a function zope.security.checkPermission which provides
+    zope.security has a function zope.security.checkPermission which provides
     an easy way of checking whether the currently authenticated user
     has the permission to access an object.  The function delegates to
     the security policy's checkPermission() method.

src/OFS/SimpleItem.py

@@ -241,7 +241,7 @@ class Item(Base,
             # Can we re-raise the exception with a rendered-to-HTML
             # exception value? To be able to do so, the exception
             # constructor needs to be able to take more than two
-            # arguments (some Zope 3 exceptions can't).
+            # arguments (some Zope exceptions can't).
             can_raise = False
             ctor = getattr(error_type, '__init__', None)
             if inspect.ismethoddescriptor(ctor):

src/Products/BTreeFolder2/README.txt

@@ -112,13 +112,3 @@ Visit a BTreeFolder2 instance through the web as a manager.  Add
 "manage_cleanup" to the end of the URL and request that URL.  It may
 take some time to load and fix the entire structure.  If problems are
 detected, information will be added to the event log.
-
-
-Future
-======
-
-BTreeFolder2 will be maintained for Zope 2.  Zope 3, however, is not
-likely to require BTreeFolder, since the intention is to make Zope 3
-folders gracefully expand to support many items.
-
-

src/Products/PageTemplates/DeferExpr.py

@@ -32,8 +32,7 @@ Example
 from zope.tales.expressions import DeferWrapper, DeferExpr
 _marker = object()
 
-# TODO These should really be integrated into the Zope 3 ZPT
-# implementation (zope.tales)
+# TODO These should really be integrated into the zope.tales implementation
 
 class LazyWrapper(DeferWrapper):
     """Wrapper for lazy: expression

src/Products/PageTemplates/Expressions.py

@@ -53,16 +53,16 @@ SecureModuleImporter = ZRPythonExpr._SecureModuleImporter()
 LOG = logging.getLogger('Expressions')
 
 # In Zope 2 traversal semantics, NotFound or Unauthorized (the Zope 2
-# versions) indicate that traversal has failed.  By default, Zope 3's
-# TALES engine doesn't recognize them as such which is why we extend
-# Zope 3's list here and make sure our implementation of the TALES
+# versions) indicate that traversal has failed.  By default, zope.tales'
+# engine doesn't recognize them as such which is why we extend its
+# list here and make sure our implementation of the TALES
 # Path Expression uses them
 ZopeUndefs = Undefs + (NotFound, Unauthorized)
 
 def boboAwareZopeTraverse(object, path_items, econtext):
     """Traverses a sequence of names, first trying attributes then items.
 
-    This uses Zope 3 path traversal where possible and interacts
+    This uses zope.traversing path traversal where possible and interacts
     correctly with objects providing OFS.interface.ITraversable when
     necessary (bobo-awareness).
     """
@@ -82,7 +82,7 @@ def boboAwareZopeTraverse(object, path_items, econtext):
 def trustedBoboAwareZopeTraverse(object, path_items, econtext):
     """Traverses a sequence of names, first trying attributes then items.
 
-    This uses Zope 3 path traversal where possible and interacts
+    This uses zope.traversing path traversal where possible and interacts
     correctly with objects providing OFS.interface.ITraversable when
     necessary (bobo-awareness).
     """
@@ -205,7 +205,7 @@ class ZopeContext(Context):
 
     def evaluateBoolean(self, expr):
         value = self.evaluate(expr)
-        # here we override the normal Zope 3 behaviour.  Zope 3
+        # here we override the normal zope.tales behaviour. zope.tales
         # doesn't care about the default in a boolean expression,
         # while we do (Zope 2 legacy, see the
         # BooleanAttributesAndDefault.html test case)

src/Products/PageTemplates/ZopePageTemplate.py

@@ -10,7 +10,7 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-"""Zope Page Template module (wrapper for the Zope 3 ZPT implementation)
+"""Zope Page Template module (wrapper for the zope.pagetemplate implementation)
 
 $Id$
 """

src/ZPublisher/BaseRequest.py

@@ -711,8 +711,7 @@ def old_validation(groups, request, auth,
 # types during publishing, we ensure the same publishing rules in
 # both versions. The downside is that this needs to be extended as
 # new built-in types are added and future Python versions are
-# supported. That happens rarely enough that hopefully we'll be on
-# Zope 3 by then :)
+# supported.
 
 import types
 

src/ZPublisher/HTTPRequest.py

@@ -1579,7 +1579,7 @@ class ZopeFieldStorage(FieldStorage):
         return tempfile.NamedTemporaryFile("w+b")
 
 
-# Zope 3 version: zope.publisher.browser.FileUpload
+# Original version: zope.publisher.browser.FileUpload
 class FileUpload:
     '''File upload objects
 

src/ZPublisher/tests/generate_conflicts.py

 ## This script requires:
 ## - python >= 2.4
-## - Zope 3's zope.testbrowser package:
-##   http://www.zope.org/Members/benji_york/ZopeTestbrowser-0.9.0.tgz
+## - zope.testbrowser
 ##
 ## The just run:
 ## $python generate_conflicts.py

src/Zope2/App/startup.py

@@ -205,7 +205,7 @@ class ZPublisherExceptionHook:
             # raise the rendered value as the exception value
             # (basically the same that 'raise_standardErrorMessage'
             # does. The view is named 'index.html' because that's what
-            # Zope 3 uses as well.
+            # zope.publisher uses as well.
             view = queryMultiAdapter((v, REQUEST), name=u'index.html')
             if view is not None:
                 v = view()