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

be smarter about adding ".cli" to reloader command

Browse source 
python -m flask.cli raises an import warning on > 2.6
it's only needed on 2.6, "flask" works otherwise
closes #2357
This commit is contained in:
David Lord 2017-06-04 12:26:21 -07:00
parent 63129e8426
commit fa7e8d6073
No known key found for this signature in database
GPG key ID: 7A1C87E3F5BC42A8
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
flask/cli.py
View file

@ -22,7 +22,7 @@ from threading import Lock, Thread
import click import click
from . import __version__ from . import __version__
from ._compat import iteritems, reraise from ._compat import iteritems, reraise, PY2
from .globals import current_app from .globals import current_app
from .helpers import get_debug_flag from .helpers import get_debug_flag
from ._compat import getargspec from ._compat import getargspec
@ -647,19 +647,19 @@ Example usage:
def main(as_module=False): def main(as_module=False):
this_module = __package__ + '.cli'
args = sys.argv[1:] args = sys.argv[1:]
if as_module: if as_module:
if sys.version_info >= (2, 7): this_module = 'flask'
name = 'python -m ' + this_module.rsplit('.', 1)[0]
else:
name = 'python -m ' + this_module
# This module is always executed as "python -m flask.run" and as such if sys.version_info < (2, 7):
# we need to ensure that we restore the actual command line so that this_module += '.cli'
# the reloader can properly operate.
sys.argv = ['-m', this_module] + sys.argv[1:] name = 'python -m ' + this_module
# 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: else:
name = None name = None