Merge branch 'master' into module-support

docs/patterns/sqlalchemy.rst

@@ -25,7 +25,7 @@ Here the example `database.py` module for your application::
     from sqlalchemy.orm import scoped_session, sessionmaker
     from sqlalchemy.ext.declarative import declarative_base
 
-    engine = create_engine('sqlite:////tmp/test.db')
+    engine = create_engine('sqlite:////tmp/test.db', convert_unicode=True)
     db_session = scoped_session(sessionmaker(autocommit=False,
                                              autoflush=False,
                                              bind=engine)) 
@@ -104,7 +104,7 @@ Here is an example `database.py` module for your application::
     from sqlalchemy import create_engine, MetaData
     from sqlalchemy.orm import scoped_session, sessionmaker
 
-    engine = create_engine('sqlite:////tmp/test.db')
+    engine = create_engine('sqlite:////tmp/test.db', convert_unicode=True)
     metadata = MetaData()
     db_session = scoped_session(sessionmaker(autocommit=False,
                                              autoflush=False,
@@ -156,7 +156,7 @@ you basically only need the engine::
 
     from sqlalchemy import create_engine, MetaData
 
-    engine = create_engine('sqlite:////tmp/test.db')
+    engine = create_engine('sqlite:////tmp/test.db', convert_unicode=True)
     metadata = MetaData(bind=engine)
 
 Then you can either declare the tables in your code like in the examples

flask.py

@@ -12,7 +12,6 @@
 from __future__ import with_statement
 import os
 import sys
-import types
 from datetime import datetime, timedelta
 
 from itertools import chain

tests/flask_tests.py

@@ -255,17 +255,17 @@ class BasicFunctionalityTestCase(unittest.TestCase):
                 == '/static/index.html'
 
     def test_none_response(self):
-        warnings.filterwarnings('error', 'View function did not return')
         app = flask.Flask(__name__)
         @app.route('/')
         def test():
             return None
         try:
             app.test_client().get('/')
-        except Warning:
+        except ValueError, e:
+            assert str(e) == 'View function did not return a response'
             pass
         else:
-            assert "Expected warning"
+            assert "Expected ValueError"
 
 
 class JSONTestCase(unittest.TestCase):