orbit-oss/flask
4
4
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

style cleanup

Browse source 
[ci skip]
This commit is contained in:
David Lord 2017-06-16 06:59:37 -07:00
parent 0b80acb25c
commit 448368e226
No known key found for this signature in database
GPG key ID: 7A1C87E3F5BC42A8
3 changed files with 35 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

30
flask/cli.py
View file

@ -174,12 +174,14 @@ def prepare_exec_for_file(filename):
if sys.path[0] != dirpath:
sys.path.insert(0, dirpath)
return '.'.join(module[::-1])
def locate_app(script_info, app_id, raise_if_not_found=True):
"""Attempts to locate the application."""
__traceback_hide__ = True
if ':' in app_id:
module, app_obj = app_id.split(':', 1)
else:
@ -193,17 +195,23 @@ def locate_app(script_info, app_id, raise_if_not_found=True):
# Determine this by checking whether the trace has a depth > 1.
if sys.exc_info()[-1].tb_next:
stack_trace = traceback.format_exc()
raise NoAppException('There was an error trying to import'
' the app (%s):\n%s' % (module, stack_trace))
raise NoAppException(
'There was an error trying to import the app ({module}):\n'
'{stack_trace}'.format(
module=module, stack_trace=stack_trace
)
)
elif raise_if_not_found:
raise NoAppException('The file/path provided (%s) does not appear'
' to exist. Please verify the path is '
'correct. If app is not on PYTHONPATH, '
'ensure the extension is .py' % module)
raise NoAppException(
'The file/path provided (%s) does not appear to exist. Please'
' verify the path is correct. If app is not on PYTHONPATH,'
' ensure the extension is .py.'.format(module=module)
)
else:
return
mod = sys.modules[module]
if app_obj is None:
return find_best_app(script_info, mod)
else:
@ -334,17 +342,21 @@ class ScriptInfo(object):
else:
for module in ['wsgi.py', 'app.py']:
import_path = prepare_exec_for_file(module)
rv = locate_app(self, import_path,
raise_if_not_found=False)
rv = locate_app(
self, import_path, raise_if_not_found=False
)
if rv:
break
if not rv:
raise NoAppException(
'Could not locate Flask application. You did not provide '
'the FLASK_APP environment variable, and a wsgi.py or '
'app.py module was not found in the current directory.\n\n'
'For more information see '
'http://flask.pocoo.org/docs/latest/quickstart/')
'http://flask.pocoo.org/docs/latest/quickstart/'
)
debug = get_debug_flag()