[Zope-Checkins] CVS: Zope3/lib/python/Zope/Publisher/Browser - AttributePublisher.py:1.1.2.12 BrowserRequest.py:1.1.4.6 BrowserResponse.py:1.1.4.2 IBrowserApplicationRequest.py:1.1.2.4 IBrowserPublication.py:1.1.4.2 IBrowserPublisher.py:1.1.2.8 IBrowserRequest.py:1.1.4.2 IVirtualHostRequest.py:1.1.4.2

[Stephan Richter]

Update of /cvs-repository/Zope3/lib/python/Zope/Publisher/Browser
In directory cvs.zope.org:/tmp/cvs-serv4972/Browser

Modified Files:
      Tag: Zope-3x-branch
	AttributePublisher.py BrowserRequest.py BrowserResponse.py 
	IBrowserApplicationRequest.py IBrowserPublication.py 
	IBrowserPublisher.py IBrowserRequest.py IVirtualHostRequest.py 
Log Message:
This is the second batch of the bug fix attempt.


=== Zope3/lib/python/Zope/Publisher/Browser/AttributePublisher.py 1.1.2.11 => 1.1.2.12 ===
     # Zope.Publisher.Browser.IBrowserPublisher.
 
-    def publishTraverse(self, request, name):
+    def browser_traverse(self, request, name):
         '''See interface IBrowserPublisher'''
 
         if name.endswith('.html'):
@@ -24,7 +24,6 @@
 
         return getattr(self, name)
 
-    def browserDefault(self, request):
+    def browser_default(self, request):
         '''See interface IBrowserPublisher'''
-
         return self, ("index.html",)


=== Zope3/lib/python/Zope/Publisher/Browser/BrowserRequest.py 1.1.4.5 => 1.1.4.6 ===
                             flags=flags|SEQUENCE
                         elif (type_name == 'method' or type_name == 'action'):
-                            if loc: meth=key
+                            if l: meth=key
                             else: meth=item
                         elif (type_name == 'default_method' or type_name == \
                               'default_action'):
                             if not meth:
-                                if loc: meth=key
+                                if lov: meth=key
                                 else: meth=item
                         elif type_name == 'default':
                             flags=flags|DEFAULT
@@ -516,3 +516,4 @@
             outstream = StringIO()
 
         super(TestRequest, self).__init__(body_instream, outstream, _testEnv)
+    


=== Zope3/lib/python/Zope/Publisher/Browser/BrowserResponse.py 1.1.4.1 => 1.1.4.2 ===


=== Zope3/lib/python/Zope/Publisher/Browser/IBrowserApplicationRequest.py 1.1.2.3 => 1.1.2.4 ===


=== Zope3/lib/python/Zope/Publisher/Browser/IBrowserPublication.py 1.1.4.1 => 1.1.4.2 ===


=== Zope3/lib/python/Zope/Publisher/Browser/IBrowserPublisher.py 1.1.2.7 => 1.1.2.8 ===
 class IBrowserPublisher(Interface):
 
-    def publishTraverse(request, name):
+    def browser_traverse(request, name):
         """Lookup a name
 
         The request argument is the publisher request object.
         """
 
-    def browserDefault(request):
+    def browser_default(request):
         """Provide the default object
 
         The default object is expressed as a (possibly different)
@@ -26,13 +26,13 @@
         Returns an object and a sequence of names.  If the sequence of
         names is not empty, then a traversal step is made for each name.
         After the publisher gets to the end of the sequence, it will
-        call browserDefault on the last traversed object.
+        call browser_default on the last traversed object.
 
         Normal usage is to return self for object and a default view name.
 
         The publisher calls this method at the end of each traversal path. If
         a non-empty sequence of names is returned, the publisher will traverse 
-        those names and call browserDefault again at the end.
+        those names and call browser_default again at the end.
 
         Note that if additional traversal steps are indicated (via a
         nonempty sequence of names), then the publisher will try to adjust


=== Zope3/lib/python/Zope/Publisher/Browser/IBrowserRequest.py 1.1.4.1 => 1.1.4.2 ===


=== Zope3/lib/python/Zope/Publisher/Browser/IVirtualHostRequest.py 1.1.4.1 => 1.1.4.2 ===