Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix for https://github.com/mitsuhiko/flask/issues/494 #497

Merged
merged 2 commits into from Jun 17, 2012
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion flask/app.py
Expand Up @@ -1468,7 +1468,7 @@ def inject_url_defaults(self, endpoint, values):
""" """
funcs = self.url_default_functions.get(None, ()) funcs = self.url_default_functions.get(None, ())
if '.' in endpoint: if '.' in endpoint:
bp = endpoint.split('.', 1)[0] bp = endpoint.rsplit('.', 1)[0]
funcs = chain(funcs, self.url_default_functions.get(bp, ())) funcs = chain(funcs, self.url_default_functions.get(bp, ()))
for func in funcs: for func in funcs:
func(endpoint, values) func(endpoint, values)
Expand Down
23 changes: 23 additions & 0 deletions flask/testsuite/basic.py
Expand Up @@ -911,6 +911,29 @@ def something_else():
self.assert_equal(c.get('/de/').data, '/de/about') self.assert_equal(c.get('/de/').data, '/de/about')
self.assert_equal(c.get('/de/about').data, '/foo') self.assert_equal(c.get('/de/about').data, '/foo')
self.assert_equal(c.get('/foo').data, '/en/about') self.assert_equal(c.get('/foo').data, '/en/about')

def test_inject_blueprint_url_defaults(self):
app = flask.Flask(__name__)
bp = flask.Blueprint('foo.bar.baz', __name__,
template_folder='template')

@bp.url_defaults
def bp_defaults(endpoint, values):
values['page'] = 'login'
@bp.route('/<page>')
def view(page): pass

app.register_blueprint(bp)

values = dict()
app.inject_url_defaults('foo.bar.baz.view', values)
expected = dict(page='login')
self.assert_equal(values, expected)

with app.test_request_context('/somepage'):
url = flask.url_for('foo.bar.baz.view')
expected = '/login'
self.assert_equal(url, expected)


def test_debug_mode_complains_after_first_request(self): def test_debug_mode_complains_after_first_request(self):
app = flask.Flask(__name__) app = flask.Flask(__name__)
Expand Down