diff options
| author | Michael Merickel <michael@merickel.org> | 2018-11-04 13:25:32 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2018-11-04 13:25:32 -0600 |
| commit | 44e7e63ac1f95d52bdd25c22c36efd820c059e35 (patch) | |
| tree | e6062558dd3c5a4716f9cd521059f1621bc76457 /src | |
| parent | 6f0d73d6eea8064f1c5d9294beb7f7d64619071d (diff) | |
| parent | de5e4f40e0246d71ba5875c957281fb764da74dd (diff) | |
| download | pyramid-44e7e63ac1f95d52bdd25c22c36efd820c059e35.tar.gz pyramid-44e7e63ac1f95d52bdd25c22c36efd820c059e35.tar.bz2 pyramid-44e7e63ac1f95d52bdd25c22c36efd820c059e35.zip | |
Merge branch 'pr/1639' into bare-route-prefix
Diffstat (limited to 'src')
| -rw-r--r-- | src/pyramid/config/routes.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/pyramid/config/routes.py b/src/pyramid/config/routes.py index f9180bd76..7bddf4e67 100644 --- a/src/pyramid/config/routes.py +++ b/src/pyramid/config/routes.py @@ -364,7 +364,10 @@ class RoutesConfiguratorMixin(object): static = True elif self.route_prefix: - pattern = self.route_prefix.rstrip('/') + '/' + pattern.lstrip('/') + if pattern == '': + pattern = self.route_prefix.rstrip('/') + else: + pattern = self.route_prefix.rstrip('/') + '/' + pattern.lstrip('/') mapper = self.get_routes_mapper() |