[Zope3-checkins] CVS: Zope3/src/zope/app/browser - absoluteurl.py:1.12

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/app/browser
In directory cvs.zope.org:/tmp/cvs-serv5310/src/zope/app/browser

Modified Files:
	absoluteurl.py 
Log Message:
In preparation for containergeddon, refactored away the use of
the side_effect_names in context wrappers to deal with path segments
with side effects.


=== Zope3/src/zope/app/browser/absoluteurl.py 1.11 => 1.12 ===
--- Zope3/src/zope/app/browser/absoluteurl.py:1.11	Wed Aug  6 10:41:11 2003
+++ Zope3/src/zope/app/browser/absoluteurl.py	Fri Aug  8 14:07:06 2003
@@ -52,10 +52,6 @@
         if name:
             url += '/'+name
 
-        side_effect_names = dict.get('side_effect_names')
-        if side_effect_names:
-            url += _side_effects_url(side_effect_names)
-
         return url
 
     __call__ = __str__
@@ -85,17 +81,8 @@
                       'url': ("%s/%s" % (base[-1]['url'], name))
                       }, )
 
-        side_effect_names = dict.get('side_effect_names')
-        if side_effect_names:
-            base[-1]['url'] += _side_effects_url(side_effect_names)
-
         return base
 
-def _side_effects_url(side_effect_names):
-    return "/"+"/".join([name
-                         for name in side_effect_names
-                         if not name.startswith("++vh++")])
-
 class SiteAbsoluteURL(BrowserView):
 
     def __str__(self):
@@ -112,9 +99,6 @@
             name = dict.get('name')
             if name:
                 url += '/'+name
-            side_effect_names = dict.get('side_effect_names')
-            if side_effect_names:
-                url += _side_effects_url(side_effect_names)
                 
         return url
 
@@ -139,8 +123,5 @@
                           'url': ("%s/%s" % (base[-1]['url'], name))
                           }, )
 
-            side_effect_names = dict.get('side_effect_names')
-            if side_effect_names:
-                base[-1]['url'] += _side_effects_url(side_effect_names)
                 
         return base