[Repoze-dev] Repoze CVS: publisher.py

[Tres Seaver]

Update of /home/repoze/cvs/repoze.obob/repoze/obob
In directory laguna.palladion.com:/tmp/cvs-serv16165/repoze/obob

Modified Files:
	publisher.py 
Log Message:
 - Rename 'root' plug-point to 'get_root'.

Index: publisher.py
===================================================================
RCS file: /home/repoze/cvs/repoze.obob/repoze/obob/publisher.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- publisher.py	12 Sep 2007 15:29:46 -0000	1.3
+++ publisher.py	12 Sep 2007 16:34:46 -0000	1.4
@@ -1,7 +1,7 @@
 class ObobPublisher:
 
     def __init__(self,
-                 root=None,
+                 get_root=None,
                  request_factory=None,
                  before_traverse=None,
                  traverse=None,
@@ -10,13 +10,13 @@
                  map_result=None,
                 ):
 
-        if root is None:
-            raise ValueError("No 'root'!")
+        if get_root is None:
+            raise ValueError("No 'get_root'!")
 
-        if not callable(root):
-            raise ValueError("'root' not callable!")
+        if not callable(get_root):
+            raise ValueError("'get_root' not callable!")
 
-        self.root = root
+        self.get_root = get_root
 
         if request_factory is not None:
             if not callable(request_factory):
@@ -53,7 +53,7 @@
         
         1. Convert WSGI environ into a request object.
 
-        2. Get traversal root via self.root().
+        2. Get traversal root via self.get_root().
 
         3. Iterate over items in request's path:
 
@@ -69,7 +69,7 @@
         6. Map result + request onto WSGI 'start_response' + iteration.
         """
         request = self.request_factory(environ)
-        root = current = self.root(request)
+        root = current = self.get_root(request)
 
         for name in request['PATH_INFO'].split('/'): # XXX, contract?
             self.before_traverse(current, name, request)

_______________________________________________
Repoze-dev mailing list
Repoze-dev at lists.repoze.org
http://lists.repoze.org/mailman/listinfo/repoze-dev