Merge branch '1.0-maintenance'

Author: davidism

CHANGES.rst

@@ -10,16 +10,30 @@ Version 1.1
 Unreleased
 
 
-Version 1.0.2
+Version 1.0.3
 -------------
 
 Unreleased
 
 
+Version 1.0.2
+-------------
+
+Released on May 2nd 2018
+
+-   Fix more backwards compatibility issues with merging slashes between
+    a blueprint prefix and route. (`#2748`_)
+-   Fix error with ``flask routes`` command when there are no routes.
+    (`#2751`_)
+
+.. _#2748: https://github.com/pallets/flask/pull/2748
+.. _#2751: https://github.com/pallets/flask/issues/2751
+
+
 Version 1.0.1
 -------------
 
-Released on April 29 2018
+Released on April 29th 2018
 
 -   Fix registering partials (with no ``__name__``) as view functions.
     (`#2730`_)

flask/blueprints.py

@@ -10,6 +10,7 @@
     :license: BSD, see LICENSE for more details.
 """
 from functools import update_wrapper
+from werkzeug.urls import url_join
 
 from .helpers import _PackageBoundObject, _endpoint_from_view_func
 
@@ -49,8 +50,6 @@ def __init__(self, blueprint, app, options, first_registration):
         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.
         self.url_prefix = url_prefix
@@ -66,7 +65,11 @@ def add_url_rule(self, rule, endpoint=None, view_func=None, **options):
         blueprint's name.
         """
         if self.url_prefix is not None:
-            rule = '/'.join((self.url_prefix, rule.lstrip('/')))
+            if rule:
+                rule = '/'.join((
+                    self.url_prefix.rstrip('/'), rule.lstrip('/')))
+            else:
+                rule = self.url_prefix
         options.setdefault('subdomain', self.subdomain)
         if endpoint is None:
             endpoint = _endpoint_from_view_func(view_func)

flask/cli.py

@@ -825,6 +825,10 @@ def routes_command(sort, all_methods):
     """Show all registered routes with endpoints and methods."""
 
     rules = list(current_app.url_map.iter_rules())
+    if not rules:
+        click.echo('No routes were registered.')
+        return
+
     ignored_methods = set(() if all_methods else ('HEAD', 'OPTIONS'))
 
     if sort in ('endpoint', 'rule'):

tests/test_blueprints.py

@@ -116,6 +116,12 @@ def bp_forbidden():
 
 
 @pytest.mark.parametrize(('prefix', 'rule', 'url'), (
+    ('', '/', '/'),
+    ('/', '', '/'),
+    ('/', '/', '/'),
+    ('/foo', '', '/foo'),
+    ('/foo/', '', '/foo/'),
+    ('', '/bar', '/bar'),
     ('/foo/', '/bar', '/foo/bar'),
     ('/foo/', 'bar', '/foo/bar'),
     ('/foo', '/bar', '/foo/bar'),