Merge branch '0.11-maintenance'

examples/flaskr/README

@@ -19,7 +19,7 @@
 
       3. Instruct flask to use the right application
 
-         export FLASK_APP=flaskr.flaskr
+         export FLASK_APP=flaskr
 
       4. initialize the database with this command:
 

examples/flaskr/flaskr/__init__.py

@@ -0,0 +1 @@
+from flaskr import app

examples/flaskr/tests/context.py

@@ -1,6 +0,0 @@
-import sys, os
-
-basedir = os.path.dirname(os.path.abspath(__file__))
-sys.path.insert(0, basedir + '/../')
-
-from flaskr import flaskr

examples/flaskr/tests/test_flaskr.py

@@ -9,11 +9,11 @@
     :license: BSD, see LICENSE for more details.
 """
 
-import pytest
 import os
 import tempfile
+import pytest
+from flaskr import flaskr
 
-from context import flaskr
 
 @pytest.fixture
 def client(request):