# HG changeset patch # User Marcin Kuzminski # Date 2017-10-25 09:58:54 # Node ID bf1dfb34532ec7b289441e13c238e80d4d5732f9 # Parent 397144e9980992b6530acb385b9540e6fdb5ed1a core: use common bootstrap for pyramid app diff --git a/rhodecode/lib/rc_commands/ishell.py b/rhodecode/lib/rc_commands/ishell.py --- a/rhodecode/lib/rc_commands/ishell.py +++ b/rhodecode/lib/rc_commands/ishell.py @@ -20,8 +20,7 @@ import click -from pyramid.paster import bootstrap -from pyramid.request import Request +from rhodecode.lib.pyramid_utils import bootstrap import pyramid.paster # imports, used in ipython shell @@ -45,8 +44,7 @@ or reset some user/system settings. def main(ini_path): pyramid.paster.setup_logging(ini_path) - request = Request.blank('/', base_url='https://rhodecode-app.com/') - with bootstrap(ini_path, request=request) as env: + with bootstrap(ini_path) as env: try: from IPython import embed diff --git a/rhodecode/lib/rc_commands/setup_rc.py b/rhodecode/lib/rc_commands/setup_rc.py --- a/rhodecode/lib/rc_commands/setup_rc.py +++ b/rhodecode/lib/rc_commands/setup_rc.py @@ -20,8 +20,7 @@ import click -from pyramid.paster import bootstrap -from pyramid.request import Request +from rhodecode.lib.pyramid_utils import bootstrap import pyramid.paster @@ -30,6 +29,5 @@ import pyramid.paster def main(ini_path): pyramid.paster.setup_logging(ini_path) - request = Request.blank('/', base_url='https://rhodecode-app.com/') - with bootstrap(ini_path, request=request) as env: + with bootstrap(ini_path) as env: print(env['request'].application_url) \ No newline at end of file diff --git a/rhodecode/lib/rc_commands/upgrade_db.py b/rhodecode/lib/rc_commands/upgrade_db.py --- a/rhodecode/lib/rc_commands/upgrade_db.py +++ b/rhodecode/lib/rc_commands/upgrade_db.py @@ -20,8 +20,7 @@ import click -from pyramid.paster import bootstrap -from pyramid.request import Request +from rhodecode.lib.pyramid_utils import bootstrap import pyramid.paster @@ -30,8 +29,7 @@ import pyramid.paster def main(ini_path): pyramid.paster.setup_logging(ini_path) - request = Request.blank('/', base_url='https://rhodecode-app.com/') - with bootstrap(ini_path, request=request) as env: + with bootstrap(ini_path) as env: print(env['request'].application_url)