diff options
author | Marcel Hellkamp <marc@gsites.de> | 2011-11-16 17:14:45 +0100 |
---|---|---|
committer | Marcel Hellkamp <marc@gsites.de> | 2011-11-16 18:40:41 +0100 |
commit | db2b85c9e1a37fff416e07a74a33f21ae0493de6 (patch) | |
tree | a867406585a62935c75da1d91296b692fdfb51c7 | |
parent | 6235d7e0a4e9a649c0325c1ba3d0fcca8da7cca5 (diff) | |
download | bottle-db2b85c9e1a37fff416e07a74a33f21ae0493de6.tar.gz |
fix: load_app now returns any callable, not only Bottle instances.
-rwxr-xr-x | bottle.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2297,7 +2297,7 @@ def load_app(target): try: tmp = default_app.push() # Create a new "default application" rv = load(target) # Import the target module - return rv if isinstance(rv, Bottle) else tmp + return rv if callable(rv) else tmp finally: default_app.remove(tmp) # Remove the temporary added default application NORUN = nr_old |