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

Merge branch 'master' into module-support

Browse source 
Conflicts:
	flask.py
This commit is contained in:
Armin Ronacher 2010-05-02 19:12:00 +02:00
commit 36f659b82b
3 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
flask.py
View file

@ -179,6 +179,7 @@ def url_for(endpoint, **values):
:param endpoint: the endpoint of the URL (name of the function)
:param values: the variable arguments of the URL rule
:param _external: if set to `True`, an absolute URL is generated.
"""
ctx = _request_ctx_stack.top
if '.' not in endpoint:
@ -187,7 +188,8 @@ def url_for(endpoint, **values):
endpoint = mod + '.' + endpoint
elif endpoint.startswith('.'):
endpoint = endpoint[1:]
return ctx.url_adapter.build(endpoint, values)
external = values.pop('_external', False)
return ctx.url_adapter.build(endpoint, values, force_external=external)
def get_template_attribute(template_name, attribute):