Minor speed tweak and coverage.

2 files changed, 11 insertions, 5 deletions

diff --git a/repoze/bfg/tests/test_urldispatch.py b/repoze/bfg/tests/test_urldispatch.py
index 278df8064..c7a6c7ff3 100644
--- a/repoze/bfg/tests/test_urldispatch.py
+++ b/repoze/bfg/tests/test_urldispatch.py
@@ -110,6 +110,14 @@ class RoutesRootFactoryTests(unittest.TestCase):
         result = mapper(environ)
         self.assertEqual(result, 123)
 
+    def test_no_path_info(self):
+        root_factory = DummyRootFactory(123)
+        mapper = self._makeOne(root_factory)
+        mapper.connect('/', 'root')
+        environ = self._getEnviron()
+        result = mapper(environ)
+        self.assertEqual(result, 123)
+
     def test_has_routes(self):
         mapper = self._makeOne(None)
         self.assertEqual(mapper.has_routes(), False)
diff --git a/repoze/bfg/traversal.py b/repoze/bfg/traversal.py
index cec87ebc8..108174924 100644
--- a/repoze/bfg/traversal.py
+++ b/repoze/bfg/traversal.py
@@ -627,8 +627,6 @@ class TraversalContextURL(object):
             if path.startswith(vroot_path):
                 path = path[len(vroot_path):]
 
-        environ = request.environ
-
         if 'bfg.routes.route' in environ:
             route = environ['bfg.routes.route']
             matchdict = environ['bfg.routes.matchdict'].copy()
@@ -641,9 +639,9 @@ class TraversalContextURL(object):
                     (matchdict, str(why)))
             app_url = request.application_url
             return app_url + segments
-        else:
-            app_url = request.application_url # never ends in a slash
-            return app_url + path
+
+        app_url = request.application_url # never ends in a slash
+        return app_url + path
 
 always_safe = ('ABCDEFGHIJKLMNOPQRSTUVWXYZ'
                'abcdefghijklmnopqrstuvwxyz'