[Zope3-checkins] CVS: Zope3/src/zope/app/container - btree.py:1.1.2.2 find.py:1.1.2.4 sample.py:1.1.2.3 traversal.py:1.1.2.3 zopecontainer.py:1.1.2.4
Tim Peters
tim.one@comcast.net
Tue, 24 Dec 2002 21:21:24 -0500
Update of /cvs-repository/Zope3/src/zope/app/container
In directory cvs.zope.org:/tmp/cvs-serv19240/src/zope/app/container
Modified Files:
Tag: NameGeddon-branch
btree.py find.py sample.py traversal.py zopecontainer.py
Log Message:
Whitespace normalization, via Python's Tools/scripts/reindent.py. The
files are fixed-points of that script now. Fixed a few cases where
code relied on significant trailing whitespace (ouch).
=== Zope3/src/zope/app/container/btree.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/container/btree.py:1.1.2.1 Mon Dec 23 14:31:27 2002
+++ Zope3/src/zope/app/container/btree.py Tue Dec 24 21:20:23 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 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.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""
This module provides a sample container implementation.
=== Zope3/src/zope/app/container/find.py 1.1.2.3 => 1.1.2.4 ===
--- Zope3/src/zope/app/container/find.py:1.1.2.3 Tue Dec 24 07:50:59 2002
+++ Zope3/src/zope/app/container/find.py Tue Dec 24 21:20:23 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 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.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""
@@ -27,7 +27,7 @@
__implements__ = IFind
__used_for__ = IReadContainer
-
+
def __init__(self, context):
self._context = context
@@ -43,7 +43,7 @@
id_filters, object_filters,
result)
return result
-
+
#
############################################################
@@ -79,4 +79,3 @@
def matches(self, id):
'See INameFindFilter'
return id in self._ids
-
=== Zope3/src/zope/app/container/sample.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/container/sample.py:1.1.2.2 Tue Dec 24 07:50:59 2002
+++ Zope3/src/zope/app/container/sample.py Tue Dec 24 21:20:23 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 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.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""
This module provides a sample container implementation.
=== Zope3/src/zope/app/container/traversal.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/container/traversal.py:1.1.2.2 Mon Dec 23 18:17:33 2002
+++ Zope3/src/zope/app/container/traversal.py Tue Dec 24 21:20:23 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 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.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""Define view component for folder contents.
@@ -61,7 +61,7 @@
def publishTraverse(self, request, name):
context = self.context
- try:
+ try:
return context[name]
except KeyError:
@@ -101,12 +101,11 @@
raise UnexpectedParameters(parameters)
container = self._container
-
+
v = container.get(name, _marker)
if v is _marker:
v = getattr(container, name, _marker)
- if v is _marker:
+ if v is _marker:
raise NotFoundError, original_name
return v
-
=== Zope3/src/zope/app/container/zopecontainer.py 1.1.2.3 => 1.1.2.4 ===
--- Zope3/src/zope/app/container/zopecontainer.py:1.1.2.3 Tue Dec 24 07:50:59 2002
+++ Zope3/src/zope/app/container/zopecontainer.py Tue Dec 24 21:20:23 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 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.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""
@@ -33,12 +33,12 @@
_marker = object()
class ZopeContainerAdapter:
-
+
__implements__ = IZopeContainer
def __init__(self, container):
self.context = container
-
+
def __getitem__(self, key):
"See IZopeItemContainer"
value = self.context[key]
@@ -55,23 +55,23 @@
def __contains__(self, key):
'''See interface IReadContainer'''
return key in self.context
-
+
def values(self):
"See IZopeReadContainer"
container = self.context
result = []
for key, value in container.items():
- result.append(ContextWrapper(value, container, name=key))
+ result.append(ContextWrapper(value, container, name=key))
return result
-
+
def keys(self):
'''See interface IReadContainer'''
return self.context.keys()
def __len__(self):
'''See interface IReadContainer'''
- return len(self.context)
+ return len(self.context)
def items(self):
"See IZopeReadContainer"
@@ -80,7 +80,7 @@
for key, value in container.items():
result.append((key, ContextWrapper(value, container, name=key)))
return result
-
+
def setObject(self, key, object):
"See IZopeWriteContainer"
@@ -105,7 +105,7 @@
# Publish an added event
# We explicitly get the object back from the container with
# container[key], because some kinds of container may choose
- # to store a different object than the exact one we added.
+ # to store a different object than the exact one we added.
object = ContextWrapper(container[key], container, name=key)
publish(container, ObjectAddedEvent(object))
@@ -120,16 +120,16 @@
def __delitem__(self, key):
"See IZopeWriteContainer"
container = self.context
-
+
object = container[key]
object = ContextWrapper(object, container, name=key)
-
+
# Call the before delete hook, if necessary
adapter = queryAdapter(object, IDeleteNotifiable)
if adapter is not None:
adapter.manage_beforeDelete(object, container)
-
-
+
+
del container[key]
publish(container, ObjectRemovedEvent(object))