diff options
| author | Michael Merickel <michael@merickel.org> | 2011-11-17 00:55:24 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2011-11-17 00:55:24 -0600 |
| commit | d386e17eab3292a7fd4a69a8f3ff84dcf86cf8f3 (patch) | |
| tree | 9d24308d82141ddc2838200a0c56b053d421665e | |
| parent | ddc4062fe5415db5be7a01ea65c7311fe20eef15 (diff) | |
| download | pyramid-d386e17eab3292a7fd4a69a8f3ff84dcf86cf8f3.tar.gz pyramid-d386e17eab3292a7fd4a69a8f3ff84dcf86cf8f3.tar.bz2 pyramid-d386e17eab3292a7fd4a69a8f3ff84dcf86cf8f3.zip | |
Fixed issue #353.
| -rw-r--r-- | pyramid/scripts/proutes.py | 7 | ||||
| -rw-r--r-- | pyramid/tests/test_scripts/test_proutes.py | 12 |
2 files changed, 17 insertions, 2 deletions
diff --git a/pyramid/scripts/proutes.py b/pyramid/scripts/proutes.py index 9b25ed169..570417e95 100644 --- a/pyramid/scripts/proutes.py +++ b/pyramid/scripts/proutes.py @@ -64,14 +64,17 @@ class PRoutesCommand(object): self.out( fmt % ('-'*len('Name'), '-'*len('Pattern'), '-'*len('View'))) for route in routes: + pattern = route.pattern + if not pattern.startswith('/'): + pattern = '/' + pattern request_iface = registry.queryUtility(IRouteRequest, name=route.name) view_callable = None if (request_iface is None) or (route.factory is not None): - self.out(fmt % (route.name, route.pattern, '<unknown>')) + self.out(fmt % (route.name, pattern, '<unknown>')) else: view_callable = registry.adapters.lookup( (IViewClassifier, request_iface, Interface), IView, name='', default=None) - self.out(fmt % (route.name, route.pattern, view_callable)) + self.out(fmt % (route.name, pattern, view_callable)) diff --git a/pyramid/tests/test_scripts/test_proutes.py b/pyramid/tests/test_scripts/test_proutes.py index af6ff19d0..328d1001d 100644 --- a/pyramid/tests/test_scripts/test_proutes.py +++ b/pyramid/tests/test_scripts/test_proutes.py @@ -43,6 +43,18 @@ class TestPRoutesCommand(unittest.TestCase): self.assertEqual(len(L), 3) self.assertEqual(L[-1].split(), ['a', '/a', '<unknown>']) + def test_route_with_no_slash_prefix(self): + command = self._makeOne() + route = dummy.DummyRoute('a', 'a') + mapper = dummy.DummyMapper(route) + command._get_mapper = lambda *arg: mapper + L = [] + command.out = L.append + result = command.run() + self.assertEqual(result, None) + self.assertEqual(len(L), 3) + self.assertEqual(L[-1].split(), ['a', '/a', '<unknown>']) + def test_single_route_no_views_registered(self): from zope.interface import Interface from pyramid.registry import Registry |
