[Zope-Checkins] CVS: Zope/lib/python/Products/OFSP - Draft.py:1.19 Session.py:1.28 Version.py:1.53 __init__.py:1.37
Martijn Pieters
mj@zope.com
Wed, 14 Aug 2002 18:16:35 -0400
Update of /cvs-repository/Zope/lib/python/Products/OFSP
In directory cvs.zope.org:/tmp/cvs-serv22845
Modified Files:
Draft.py Session.py Version.py __init__.py
Log Message:
Clean up indentation and trailing whitespace.
=== Zope/lib/python/Products/OFSP/Draft.py 1.18 => 1.19 ===
--- Zope/lib/python/Products/OFSP/Draft.py:1.18 Tue Mar 12 08:50:26 2002
+++ Zope/lib/python/Products/OFSP/Draft.py Wed Aug 14 18:16:04 2002
@@ -1,14 +1,14 @@
##############################################################################
#
# Copyright (c) 2001 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
-#
+#
##############################################################################
import Globals, AccessControl.User
from Globals import Persistent
@@ -43,7 +43,7 @@
self._version="%s/%s" % (version, id)
self.users__draft__=uf=AccessControl.User.UserFolder()
self.__allow_groups__=uf
-
+
def icon(self):
try: return getattr(self.aq_parent.aq_base,self._refid).icon
except: return 'p_/broken'
@@ -75,7 +75,7 @@
def __bobo_traverse__(self, REQUEST, name):
if name[-9:]=='__draft__': return getattr(self, name)
-
+
try: db=self._p_jar.db()
except:
# BoboPOS 2
@@ -86,15 +86,15 @@
cleanup=Cleanup()
cleanup.__del__=jar.close
REQUEST[Cleanup]=cleanup
-
-
+
+
dself=getdraft(self, jar)
-
+
ref=getattr(dself.aq_parent.aq_base,dself._refid).aq_base.__of__(dself)
if hasattr(ref, name): return dself, ref, getattr(ref, name)
return getattr(self, name)
-
- def nonempty(self):
+
+ def nonempty(self):
try: db=self._p_jar.db()
except:
# BoboPOS 2
@@ -117,7 +117,7 @@
d=self._p_jar.getVersion()
if d==s: d=''
db.commitVersion(s, d)
-
+
if REQUEST:
REQUEST['RESPONSE'].redirect(REQUEST['URL2']+'/manage_main')
@@ -141,7 +141,7 @@
if not self._version:
self._version=self.absolute_url(1)
- def manage_beforeDelete(self, item, container):
+ def manage_beforeDelete(self, item, container):
if self.nonempty():
raise 'Version Error', (
'Attempt to %sdelete a non-empty version.<p>'
=== Zope/lib/python/Products/OFSP/Session.py 1.27 => 1.28 ===
--- Zope/lib/python/Products/OFSP/Session.py:1.27 Wed Nov 28 10:51:00 2001
+++ Zope/lib/python/Products/OFSP/Session.py Wed Aug 14 18:16:04 2002
@@ -1,14 +1,14 @@
##############################################################################
#
# Copyright (c) 2001 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
-#
+#
##############################################################################
"""Backward compatability!
"""
=== Zope/lib/python/Products/OFSP/Version.py 1.52 => 1.53 ===
--- Zope/lib/python/Products/OFSP/Version.py:1.52 Mon Mar 11 10:55:36 2002
+++ Zope/lib/python/Products/OFSP/Version.py Wed Aug 14 18:16:04 2002
@@ -1,14 +1,14 @@
##############################################################################
#
# Copyright (c) 2001 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
-#
+#
##############################################################################
"""Version object"""
@@ -79,12 +79,12 @@
r=Version.inheritedAttribute('title_and_id')(self)
try: db=self._p_jar.db()
except:
- # BoboPOS 2
+ # BoboPOS 2
if Globals.VersionBase[self.cookie].nonempty(): return '%s *' % r
else:
# ZODB 3
if not db.versionEmpty(self.cookie): return '%s *' % r
-
+
return r
def manage_edit(self, title, REQUEST=None):
@@ -111,7 +111,7 @@
% self.id)
)
return RESPONSE.redirect(REQUEST['URL1']+'/manage_main')
-
+
def leave(self, REQUEST, RESPONSE):
"""Temporarily stop working in a version"""
RESPONSE.setCookie(
@@ -129,7 +129,7 @@
% self.id)
)
return RESPONSE.redirect(REQUEST['URL1']+'/manage_main')
-
+
def leave_another(self, REQUEST, RESPONSE):
"""Leave a version that may not be the current version"""
return self.leave(REQUEST, RESPONSE)
@@ -150,7 +150,7 @@
if REQUEST is not None:
REQUEST['RESPONSE'].redirect(REQUEST['URL1']+'/manage_main')
-
+
def discard(self, remark='', REQUEST=None):
'Discard changes made during the version'
try: db=self._p_jar.db()
@@ -164,7 +164,7 @@
if REQUEST is not None:
REQUEST['RESPONSE'].redirect(REQUEST['URL1']+'/manage_main')
-
+
def nonempty(self):
try: db=self._p_jar.db()
except:
@@ -175,7 +175,7 @@
return not db.versionEmpty(self.cookie)
# Prevent copy/move/rename of versions. It's better that way, really.
-
+
def _canCopy(self, op=0):
return 0
@@ -187,18 +187,18 @@
# Physical path
self.cookie='/'.join(self.getPhysicalPath())
- def manage_beforeDelete(self, item, container):
+ def manage_beforeDelete(self, item, container):
if self.nonempty():
raise VersionException(
'Attempt to %sdelete a non-empty version.<br />' %
((self is not item) and 'indirectly ' or ''))
-
+
try: REQUEST=self.REQUEST
except: pass
else:
v=self.cookie
if REQUEST.get(Globals.VersionNameName, '') == v:
- raise VersionException(
+ raise VersionException(
'An attempt was made to delete a version, %s, or an\n'
'object containing %s while\n working in the\n'
'version %s. This would lead to a "version\n'
@@ -208,4 +208,3 @@
'version, because the version would no longer\n'
'be accessable.<p>\n'
% (v,v,v))
-
=== Zope/lib/python/Products/OFSP/__init__.py 1.36 => 1.37 ===
--- Zope/lib/python/Products/OFSP/__init__.py:1.36 Wed Nov 28 10:51:00 2001
+++ Zope/lib/python/Products/OFSP/__init__.py Wed Aug 14 18:16:04 2002
@@ -1,14 +1,14 @@
##############################################################################
#
# Copyright (c) 2001 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
-#
+#
##############################################################################
__doc__='''Object system core
$Id$'''
@@ -80,7 +80,7 @@
icon='images/File_icon.gif',
legacy=(OFS.Image.manage_addFile,),
)
-
+
context.registerClass(
OFS.Folder.Folder,
constructors=(OFS.Folder.manage_addFolderForm,
@@ -88,7 +88,7 @@
icon='images/Folder_icon.gif',
legacy=(OFS.Folder.manage_addFolder,),
)
-
+
context.registerClass(
AccessControl.User.UserFolder,