Merge 2cc4e8d066 into f55aeb96ad

bottle_sqlite.py

@@ -83,9 +83,11 @@ class SQLitePlugin(object):
         if bottle.__version__.startswith('0.9'):
             config = route['config']
             _callback = route['callback']
+            argspec = inspect.getargspec(_callback).args
         else:
             config = route.config
             _callback = route.callback
+            argspec =  route.get_callback_args()
 
         # Override global configuration with route-specific values.
         if "sqlite" in config:
@@ -100,10 +102,7 @@ class SQLitePlugin(object):
         keyword = g('keyword', self.keyword)
         text_factory = g('keyword', self.text_factory)
 
-        # Test if the original callback accepts a 'db' keyword.
+        if keyword not in argspec:
-        # Ignore it if it does not need a database handle.
-        argspec = inspect.getargspec(_callback)
-        if keyword not in argspec.args:
             return callback
 
         def wrapper(*args, **kwargs):

test.py

@@ -28,6 +28,13 @@ class SQLiteTest(unittest.TestCase):
     def tearDown(self):
         os.unlink(self.plugin.dbfile)
 
+    def test_with_view(self):
+        @self.app.get('/')
+        @bottle.view('test_view')
+        def test(db):
+            self.assertEqual(type(db), type(sqlite3.connect(':memory:')))
+        self._request('/')
+
     def test_with_keyword(self):
         @self.app.get('/')
         def test(db):

views/test_view.tpl

@@ -0,0 +1 @@
+test_view