maya-chen/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity

Simplified click integration a bit

Browse source
This commit is contained in:
Armin Ronacher 2014-05-12 02:13:32 +02:00
parent 32d32249d5
commit 7321a480ea
2 changed files with 14 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
flask/app.py
View file

@ -11,6 +11,7 @@
import os import os
import sys import sys
import click
from threading import Lock from threading import Lock
from datetime import timedelta from datetime import timedelta
from itertools import chain from itertools import chain
@ -34,7 +35,6 @@ from .templating import DispatchingJinjaLoader, Environment, \
_default_template_ctx_processor _default_template_ctx_processor
from .signals import request_started, request_finished, got_request_exception, \ from .signals import request_started, request_finished, got_request_exception, \
request_tearing_down, appcontext_tearing_down request_tearing_down, appcontext_tearing_down
from .cli import make_default_cli
from ._compat import reraise, string_types, text_type, integer_types from ._compat import reraise, string_types, text_type, integer_types
# a lock used for logger initialization # a lock used for logger initialization
@ -544,7 +544,7 @@ class Flask(_PackageBoundObject):
#: provided by Flask itself and can be overridden. #: provided by Flask itself and can be overridden.
#: #:
#: This is an instance of a :class:`click.Group` object. #: This is an instance of a :class:`click.Group` object.
self.cli = make_default_cli(self) self.cli = click.Group(self)
def _get_error_handlers(self): def _get_error_handlers(self):
from warnings import warn from warnings import warn

38
flask/cli.py
View file

@ -131,12 +131,6 @@ class DispatchingApp(object):
return rv(environ, start_response) return rv(environ, start_response)
def _no_such_app():
raise NoAppException('Could not locate Flask application. '
'You did not provide FLASK_APP or the '
'--app parameter.')
class ScriptInfo(object): class ScriptInfo(object):
"""Help object to deal with Flask applications. This is usually not """Help object to deal with Flask applications. This is usually not
necessary to interface with as it's used internally in the dispatching necessary to interface with as it's used internally in the dispatching
@ -168,7 +162,9 @@ class ScriptInfo(object):
rv = self.create_app(self) rv = self.create_app(self)
else: else:
if self.app_import_path is None: if self.app_import_path is None:
_no_such_app() raise NoAppException('Could not locate Flask application. '
'You did not provide FLASK_APP or the '
'--app parameter.')
rv = locate_app(self.app_import_path) rv = locate_app(self.app_import_path)
if self.debug is not None: if self.debug is not None:
rv.debug = self.debug rv.debug = self.debug
@ -418,29 +414,19 @@ def shell_command():
code.interact(banner=banner, local=app.make_shell_context()) code.interact(banner=banner, local=app.make_shell_context())
def make_default_cli(app): cli = FlaskGroup(help="""\
"""Creates the default click object for the app itself. Currently This shell command acts as general utility script for Flask applications.
there are no default commands registered because all builtin commands
are registered on the actual cmd object here.
"""
return click.Group()
It loads the application configured (either through the FLASK_APP environment
variable or the --app parameter) and then provides commands either provided
by the application or Flask itself.
@click.group(cls=FlaskGroup) The most useful commands are the "run" and "shell" command.
def cli(**params):
"""
This shell command acts as general utility script for Flask applications.
It loads the application configured (either through the FLASK_APP environment Example usage:
variable or the --app parameter) and then provides commands either provided
by the application or Flask itself.
The most useful commands are the "run" and "shell" command. flask --app=hello --debug run
""")
Example usage:
flask --app=hello --debug run
"""
def main(as_module=False): def main(as_module=False):