[Zope3-checkins] CVS: Zope3/src/zope/app/content - folder.py:1.1.2.3
Fred L. Drake, Jr.
fred@zope.com
Tue, 24 Dec 2002 01:03:02 -0500
Update of /cvs-repository/Zope3/src/zope/app/content
In directory cvs.zope.org:/tmp/cvs-serv10765
Modified Files:
Tag: NameGeddon-branch
folder.py
Log Message:
Whitespace cleanup. Reorganize imports a little.
=== Zope3/src/zope/app/content/folder.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/content/folder.py:1.1.2.2 Mon Dec 23 18:22:18 2002
+++ Zope3/src/zope/app/content/folder.py Tue Dec 24 01:03:01 2002
@@ -2,33 +2,34 @@
#
# 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.
-#
+#
##############################################################################
-from zope.app.interfaces.content.folder import IFolder, IRootFolder
from persistence import Persistent
from zodb.btrees.OOBTree import OOBTree
+from zope.app.interfaces.content.folder import IFolder, IRootFolder
from zope.app.services.service import ServiceManagerContainer
from zope.app.interfaces.services.service import IServiceManagerContainer
from zope.exceptions import DuplicationError
+
class Folder(Persistent, ServiceManagerContainer):
"""The standard Zope Folder implementation."""
__implements__ = IFolder
-
+
def __init__(self):
self.data = OOBTree()
def keys(self):
- """Return a sequence-like object containing the names
+ """Return a sequence-like object containing the names
associated with the objects that appear in the folder
"""
return self.data.keys()
@@ -49,7 +50,7 @@
return self.data.items()
def __getitem__(self, name):
- """Return the named object, or the value of the default
+ """Return the named object, or the value of the default
argument if given and the named object is not found.
If no default is given and the object is not found a
KeyError is raised.
@@ -57,7 +58,7 @@
return self.data[name]
def get(self, name, default=None):
- """Return the named object, or the value of the default
+ """Return the named object, or the value of the default
argument if given and the named object is not found.
If no default is given and the object is not found a
KeyError is raised.
@@ -97,4 +98,3 @@
"""The standard Zope root Folder implementation."""
__implements__ = Folder.__implements__, IRootFolder
-