orbit-oss/flask
4
4
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge slashes between blueprint prefix and rule

Browse source
This commit is contained in:
David Lord 2018-04-27 12:27:31 -07:00
parent 5239458f28
commit 4d0cdf95e6
No known key found for this signature in database
GPG key ID: 7A1C87E3F5BC42A8
2 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
flask/blueprints.py
View file

@ -49,12 +49,10 @@ class BlueprintSetupState(object):
url_prefix = self.options.get('url_prefix')
if url_prefix is None:
url_prefix = self.blueprint.url_prefix
if url_prefix:
url_prefix = url_prefix.rstrip('/')
#: The prefix that should be used for all URLs defined on the
#: blueprint.
if url_prefix and url_prefix[-1] == '/':
url_prefix = url_prefix[:-1]
self.url_prefix = url_prefix
#: A dictionary with URL defaults that is added to each and every
@ -68,7 +66,7 @@ class BlueprintSetupState(object):
blueprint's name.
"""
if self.url_prefix:
rule = self.url_prefix + rule
rule = '/'.join((self.url_prefix, rule.lstrip('/')))
options.setdefault('subdomain', self.subdomain)
if endpoint is None:
endpoint = _endpoint_from_view_func(view_func)