policy -> traversal.

4 files changed, 24 insertions, 18 deletions

diff --git a/repoze/bfg/router.py b/repoze/bfg/router.py
index 12d3d4ac4..68e85d50c 100644
--- a/repoze/bfg/router.py
+++ b/repoze/bfg/router.py
@@ -2,14 +2,14 @@ from zope.component import getAdapter
 from repoze.bfg.interfaces import IWSGIApplication
 
 class Router:
-    def __init__(self, app, root_finder, policy):
+    def __init__(self, app, root_policy, traversal_policy):
         self.app = app
-        self.root_finder = root_finder
-        self.policy = policy
+        self.root_policy = root_policy
+        self.traversal_policy = traversal_policy
 
     def __call__(self, environ, start_response):
-        root = self.root_finder(environ)
-        context, name, subpath = self.policy(root, environ)
+        root = self.root_policy(environ)
+        context, name, subpath = self.traversal_policy(root, environ)
         app = getAdapter(context, IWSGIApplication, name)
         environ['repoze.bfg.context'] = context
         environ['repoze.bfg.subpath'] = subpath
diff --git a/repoze/bfg/tests/test_policy.py b/repoze/bfg/tests/test_traversal.py
index 3623d43f5..bb0b98b79 100644
--- a/repoze/bfg/tests/test_policy.py
+++ b/repoze/bfg/tests/test_traversal.py
@@ -4,7 +4,7 @@ from zope.component.testing import PlacelessSetup
 
 class SplitPathTests(unittest.TestCase):
     def _getFUT(self):
-        from repoze.bfg.policy import split_path
+        from repoze.bfg.traversal import split_path
         return split_path
         
     def test_cleanPath_path_startswith_endswith(self):
@@ -36,7 +36,7 @@ class NaivePolicyTests(unittest.TestCase, PlacelessSetup):
         PlacelessSetup.tearDown(self)
         
     def _getTargetClass(self):
-        from repoze.bfg.policy import NaiveTraversalPolicy
+        from repoze.bfg.traversal import NaiveTraversalPolicy
         return NaiveTraversalPolicy
 
     def _makeOne(self, *arg, **kw):
@@ -47,12 +47,12 @@ class NaivePolicyTests(unittest.TestCase, PlacelessSetup):
         klass = self._getTargetClass()
         return klass(*arg, **kw)
 
-    def test_class_conforms_to_IPolicy(self):
+    def test_class_conforms_to_ITraversalPolicy(self):
         from zope.interface.verify import verifyClass
         from repoze.bfg.interfaces import ITraversalPolicy
         verifyClass(ITraversalPolicy, self._getTargetClass())
 
-    def test_instance_conforms_to_IPolicy(self):
+    def test_instance_conforms_to_ITraversalPolicy(self):
         from zope.interface.verify import verifyObject
         from repoze.bfg.interfaces import ITraversalPolicy
         verifyObject(ITraversalPolicy, self._makeOne())
diff --git a/repoze/bfg/policy.py b/repoze/bfg/traversal.py
index 697350b16..1b9cfb332 100644
--- a/repoze/bfg/policy.py
+++ b/repoze/bfg/traversal.py
@@ -11,14 +11,14 @@ def split_path(path):
     if path.endswith('/'):
         path = path[:-1]
     clean=[]
-    for item in path.split('/'):
-        item = urllib.unquote(item) # deal with spaces in path segment
-        if not item or item=='.':
+    for segment in path.split('/'):
+        segment = urllib.unquote(segment) # deal with spaces in path segment
+        if not segment or segment=='.':
             continue
-        elif item == '..':
+        elif segment == '..':
             del clean[-1]
         else:
-            clean.append(item)
+            clean.append(segment)
     return clean
 
 class NaiveTraversalPolicy:
@@ -31,9 +31,9 @@ class NaiveTraversalPolicy:
         name = ''
 
         while path:
-            element = pop(path)
+            segment = pop(path)
             traverser = ITraverser(ob)
-            next = traverser(environ, element)
+            next = traverser(environ, segment)
             if next is None:
                 if path:
                     name = pop(path)
diff --git a/setup.py b/setup.py
index 8cf61678e..8b39301a1 100644
--- a/setup.py
+++ b/setup.py
@@ -48,8 +48,14 @@ setup(name='repoze.bfg',
       include_package_data=True,
       namespace_packages=['repoze', 'repoze.bfg'],
       zip_safe=False,
-      tests_require = ['zope.interface', 'zope.component', 'zope.testing'],
-      install_requires=['zope.interface', 'zope.component', 'zope.testing'],
+      install_requires=[
+            'zope.interface',
+            'zope.component',
+            'zope.testing'],
+      tests_require=[
+            'zope.interface',
+            'zope.component',
+            'zope.testing'],
       test_suite="repoze.bfg.tests",
       entry_points = """\
       """