Change to use the get_callback_args route function to return the right function to analyse for keywords and insert the sqlite connection.
This commit is contained in:
parent
a640affc81
commit
2cc4e8d066
|
@ -580,6 +580,7 @@ class Route(object):
|
|||
func = getattr(func, '__func__' if py3k else 'im_func', func)
|
||||
closure_attr = '__closure__' if py3k else 'func_closure'
|
||||
while hasattr(func, closure_attr) and getattr(func, closure_attr):
|
||||
func_previous = func
|
||||
attributes = getattr(func, closure_attr)
|
||||
func = attributes[0].cell_contents
|
||||
|
||||
|
@ -588,6 +589,9 @@ class Route(object):
|
|||
# pick first FunctionType instance from multiple arguments
|
||||
func = filter(lambda x: isinstance(x, FunctionType),
|
||||
map(lambda x: x.cell_contents, attributes))
|
||||
if len(list(func))==0:
|
||||
func = func_previous
|
||||
break
|
||||
func = list(func)[0] # py3 support
|
||||
return func
|
||||
|
||||
|
|
|
@ -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,20 +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.
|
||||
# Ignore it if it does not need a database handle.
|
||||
argspec = inspect.getargspec(_callback)
|
||||
if keyword not in argspec.args:
|
||||
#check for closure
|
||||
no_keyword_arg = True
|
||||
for closure in _callback.func_closure:
|
||||
contents = closure.cell_contents
|
||||
if callable(contents):
|
||||
argspec = inspect.getargspec(contents)
|
||||
if keyword in argspec.args:
|
||||
no_keyword_arg = False
|
||||
break
|
||||
if no_keyword_arg:
|
||||
if keyword not in argspec:
|
||||
return callback
|
||||
|
||||
def wrapper(*args, **kwargs):
|
||||
|
|
7
test.py
7
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):
|
||||
|
|
1
views/test_view.tpl
Normal file
1
views/test_view.tpl
Normal file
|
@ -0,0 +1 @@
|
|||
test_view
|
Loading…
Reference in New Issue
Block a user