Browse Source

be smarter about adding ".cli" to reloader command

python -m flask.cli raises an import warning on > 2.6
it's only needed on 2.6, "flask" works otherwise
pull/2694/head
David Lord 8 years ago
parent
commit
18c9db4794
No known key found for this signature in database
GPG Key ID: 7A1C87E3F5BC42A8
  1. 16
      flask/cli.py

16
flask/cli.py

@ -494,19 +494,19 @@ Example usage:
def main(as_module=False):
this_module = __package__ + '.cli'
args = sys.argv[1:]
if as_module:
if sys.version_info >= (2, 7):
name = 'python -m ' + this_module.rsplit('.', 1)[0]
else:
this_module = 'flask'
if sys.version_info < (2, 7):
this_module += '.cli'
name = 'python -m ' + this_module
# This module is always executed as "python -m flask.run" and as such
# we need to ensure that we restore the actual command line so that
# the reloader can properly operate.
sys.argv = ['-m', this_module] + sys.argv[1:]
# Python rewrites "python -m flask" to the path to the file in argv.
# Restore the original command so that the reloader works.
sys.argv = ['-m', this_module] + args
else:
name = None

Loading…
Cancel
Save