[Zope-Checkins] CVS: Zope/lib/python/Products/SiteAccess - AccessRule.py:1.4 SiteRoot.py:1.6 VirtualHostMonster.py:1.9 __init__.py:1.4

Martijn Pieters mj@zope.com
Wed, 14 Aug 2002 18:25:41 -0400


Update of /cvs-repository/Zope/lib/python/Products/SiteAccess
In directory cvs.zope.org:/tmp/cvs-serv27658/SiteAccess

Modified Files:
	AccessRule.py SiteRoot.py VirtualHostMonster.py __init__.py 
Log Message:
Clean up indentation and trailing whitespace.


=== Zope/lib/python/Products/SiteAccess/AccessRule.py 1.3 => 1.4 ===
--- Zope/lib/python/Products/SiteAccess/AccessRule.py:1.3	Fri Feb  9 16:11:24 2001
+++ Zope/lib/python/Products/SiteAccess/AccessRule.py	Wed Aug 14 18:25:10 2002
@@ -34,7 +34,7 @@
 def manage_addAccessRule(self, method_id=None, REQUEST=None, **ignored):
     """Point a __before_traverse__ entry at the specified method"""
     # We want the original object, not stuff in between, and no acquisition
-    self = self.this() 
+    self = self.this()
     self = getattr(self, 'aq_base', self)
     priority = (1, 'AccessRule')
 
@@ -54,7 +54,7 @@
             except: pass
         hook = AccessRule(method_id)
         registerBeforeTraverse(self, hook, 'AccessRule', 1)
-        try: 
+        try:
             getattr(self, method_id).icon = 'misc_/SiteAccess/AccessRule.gif'
         except: pass
         if REQUEST:
@@ -70,7 +70,7 @@
 
 def getAccessRule(self, REQUEST=None):
     "Return the name of the current AccessRule, if any"
-    self = self.this() 
+    self = self.this()
     rules = queryBeforeTraverse(self, 'AccessRule')
     if rules:
         return rules[0][1].name


=== Zope/lib/python/Products/SiteAccess/SiteRoot.py 1.5 => 1.6 ===
--- Zope/lib/python/Products/SiteAccess/SiteRoot.py:1.5	Mon Mar 11 11:06:51 2002
+++ Zope/lib/python/Products/SiteAccess/SiteRoot.py	Wed Aug 14 18:25:10 2002
@@ -36,9 +36,9 @@
                   message='This object already contains a %s' % self.meta_type,
                   action=nextURL)
         self.addToContainer(container)
-        if nextURL:    
+        if nextURL:
             return MessageDialog(title='Item Added',
-              message='This object now has a %s' % self.meta_type, 
+              message='This object now has a %s' % self.meta_type,
               action=nextURL)
 
     def manage_beforeDelete(self, item, container):
@@ -96,11 +96,11 @@
         '''Set the title, base, and path'''
         self.__init__(title, base, path)
         if REQUEST:
-          return MessageDialog(title='SiteRoot changed.',
-            message='The title is now "%s"<br>'
-                    'The base is now "%s"<br>'
-                    'The path is now "%s"<br>' % (title, base, path),
-            action='%s/manage_main' % REQUEST['URL1'])
+            return MessageDialog(title='SiteRoot changed.',
+              message='The title is now "%s"<br>'
+                      'The base is now "%s"<br>'
+                      'The path is now "%s"<br>' % (title, base, path),
+              action='%s/manage_main' % REQUEST['URL1'])
 
     def __call__(self, client, request, response=None):
         '''Traversing'''


=== Zope/lib/python/Products/SiteAccess/VirtualHostMonster.py 1.8 => 1.9 ===
--- Zope/lib/python/Products/SiteAccess/VirtualHostMonster.py:1.8	Mon Mar 11 11:06:51 2002
+++ Zope/lib/python/Products/SiteAccess/VirtualHostMonster.py	Wed Aug 14 18:25:10 2002
@@ -97,9 +97,9 @@
 
     def manage_addToContainer(self, container, nextURL=''):
         self.addToContainer(container)
-        if nextURL:    
+        if nextURL:
             return MessageDialog(title='Item Added',
-              message='This object now has a %s' % self.meta_type, 
+              message='This object now has a %s' % self.meta_type,
               action=nextURL)
 
     def manage_beforeDelete(self, item, container):


=== Zope/lib/python/Products/SiteAccess/__init__.py 1.3 => 1.4 ===
--- Zope/lib/python/Products/SiteAccess/__init__.py:1.3	Tue Jan 16 09:39:27 2001
+++ Zope/lib/python/Products/SiteAccess/__init__.py	Wed Aug 14 18:25:10 2002
@@ -3,15 +3,15 @@
 import SiteRoot, AccessRule, VirtualHostMonster
 
 def initialize(context):
-  context.registerClass(instance_class=SiteRoot.SiteRoot,
-    permission='Add Site Roots',
-    constructors=SiteRoot.constructors, legacy=SiteRoot.constructors,
-    icon='www/SiteRoot.gif')
-  context.registerClass(instance_class=AccessRule.AccessRule,
-    permission='Manage Access Rules', constructors=AccessRule.constructors,
-    icon='www/AccessRule.gif')
-  context.registerClass(instance_class=VirtualHostMonster.VirtualHostMonster,
-    permission='Add Virtual Host Monsters',
-    constructors=VirtualHostMonster.constructors,
-    icon='www/VirtualHostMonster.gif')
-  context.registerHelp()
+    context.registerClass(instance_class=SiteRoot.SiteRoot,
+      permission='Add Site Roots',
+      constructors=SiteRoot.constructors, legacy=SiteRoot.constructors,
+      icon='www/SiteRoot.gif')
+    context.registerClass(instance_class=AccessRule.AccessRule,
+      permission='Manage Access Rules', constructors=AccessRule.constructors,
+      icon='www/AccessRule.gif')
+    context.registerClass(instance_class=VirtualHostMonster.VirtualHostMonster,
+      permission='Add Virtual Host Monsters',
+      constructors=VirtualHostMonster.constructors,
+      icon='www/VirtualHostMonster.gif')
+    context.registerHelp()