Merge remote-tracking branch 'origin/stable'

docs/tutorial/factory.rst

@@ -56,10 +56,7 @@ directory should be treated as a package.
             app.config.from_mapping(test_config)
 
         # ensure the instance folder exists
-        try:
-            os.makedirs(app.instance_path)
-        except OSError:
-            pass
+        os.makedirs(app.instance_path, exist_ok=True)
 
         # a simple page that says hello
         @app.route('/hello')

examples/tutorial/flaskr/__init__.py

@@ -21,10 +21,7 @@ def create_app(test_config=None):
         app.config.update(test_config)
 
     # ensure the instance folder exists
-    try:
-        os.makedirs(app.instance_path)
-    except OSError:
-        pass
+    os.makedirs(app.instance_path, exist_ok=True)
 
     @app.route("/hello")
     def hello():