[Zope-Checkins] SVN: Zope/trunk/src/ Remove last references to Zope 3
Hanno Schlichting
hannosch at hannosch.eu
Fri Jan 1 14:26:59 EST 2010
Log message for revision 107513:
Remove last references to Zope 3
Changed:
U Zope/trunk/src/AccessControl/tests/testZCML.py
U Zope/trunk/src/OFS/SimpleItem.py
U Zope/trunk/src/Products/BTreeFolder2/README.txt
U Zope/trunk/src/Products/PageTemplates/DeferExpr.py
U Zope/trunk/src/Products/PageTemplates/Expressions.py
U Zope/trunk/src/Products/PageTemplates/ZopePageTemplate.py
U Zope/trunk/src/ZPublisher/BaseRequest.py
U Zope/trunk/src/ZPublisher/HTTPRequest.py
U Zope/trunk/src/ZPublisher/tests/generate_conflicts.py
U Zope/trunk/src/Zope2/App/startup.py
-=-
Modified: Zope/trunk/src/AccessControl/tests/testZCML.py
===================================================================
--- Zope/trunk/src/AccessControl/tests/testZCML.py 2010-01-01 19:03:09 UTC (rev 107512)
+++ Zope/trunk/src/AccessControl/tests/testZCML.py 2010-01-01 19:26:58 UTC (rev 107513)
@@ -220,7 +220,7 @@
>>> 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.
Modified: Zope/trunk/src/OFS/SimpleItem.py
===================================================================
--- Zope/trunk/src/OFS/SimpleItem.py 2010-01-01 19:03:09 UTC (rev 107512)
+++ Zope/trunk/src/OFS/SimpleItem.py 2010-01-01 19:26:58 UTC (rev 107513)
@@ -241,7 +241,7 @@
# 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):
Modified: Zope/trunk/src/Products/BTreeFolder2/README.txt
===================================================================
--- Zope/trunk/src/Products/BTreeFolder2/README.txt 2010-01-01 19:03:09 UTC (rev 107512)
+++ Zope/trunk/src/Products/BTreeFolder2/README.txt 2010-01-01 19:26:58 UTC (rev 107513)
@@ -112,13 +112,3 @@
"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.
-
-
Modified: Zope/trunk/src/Products/PageTemplates/DeferExpr.py
===================================================================
--- Zope/trunk/src/Products/PageTemplates/DeferExpr.py 2010-01-01 19:03:09 UTC (rev 107512)
+++ Zope/trunk/src/Products/PageTemplates/DeferExpr.py 2010-01-01 19:26:58 UTC (rev 107513)
@@ -32,8 +32,7 @@
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
Modified: Zope/trunk/src/Products/PageTemplates/Expressions.py
===================================================================
--- Zope/trunk/src/Products/PageTemplates/Expressions.py 2010-01-01 19:03:09 UTC (rev 107512)
+++ Zope/trunk/src/Products/PageTemplates/Expressions.py 2010-01-01 19:26:58 UTC (rev 107513)
@@ -53,16 +53,16 @@
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 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 @@
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)
Modified: Zope/trunk/src/Products/PageTemplates/ZopePageTemplate.py
===================================================================
--- Zope/trunk/src/Products/PageTemplates/ZopePageTemplate.py 2010-01-01 19:03:09 UTC (rev 107512)
+++ Zope/trunk/src/Products/PageTemplates/ZopePageTemplate.py 2010-01-01 19:26:58 UTC (rev 107513)
@@ -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$
"""
Modified: Zope/trunk/src/ZPublisher/BaseRequest.py
===================================================================
--- Zope/trunk/src/ZPublisher/BaseRequest.py 2010-01-01 19:03:09 UTC (rev 107512)
+++ Zope/trunk/src/ZPublisher/BaseRequest.py 2010-01-01 19:26:58 UTC (rev 107513)
@@ -711,8 +711,7 @@
# 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
Modified: Zope/trunk/src/ZPublisher/HTTPRequest.py
===================================================================
--- Zope/trunk/src/ZPublisher/HTTPRequest.py 2010-01-01 19:03:09 UTC (rev 107512)
+++ Zope/trunk/src/ZPublisher/HTTPRequest.py 2010-01-01 19:26:58 UTC (rev 107513)
@@ -1579,7 +1579,7 @@
return tempfile.NamedTemporaryFile("w+b")
-# Zope 3 version: zope.publisher.browser.FileUpload
+# Original version: zope.publisher.browser.FileUpload
class FileUpload:
'''File upload objects
Modified: Zope/trunk/src/ZPublisher/tests/generate_conflicts.py
===================================================================
--- Zope/trunk/src/ZPublisher/tests/generate_conflicts.py 2010-01-01 19:03:09 UTC (rev 107512)
+++ Zope/trunk/src/ZPublisher/tests/generate_conflicts.py 2010-01-01 19:26:58 UTC (rev 107513)
@@ -1,7 +1,6 @@
## 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
Modified: Zope/trunk/src/Zope2/App/startup.py
===================================================================
--- Zope/trunk/src/Zope2/App/startup.py 2010-01-01 19:03:09 UTC (rev 107512)
+++ Zope/trunk/src/Zope2/App/startup.py 2010-01-01 19:26:58 UTC (rev 107513)
@@ -205,7 +205,7 @@
# 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()
More information about the Zope-Checkins
mailing list