core: use common bootstrap for pyramid app

rhodecode/lib/rc_commands/ishell.py

@@ -1,61 +1,59 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2016-2017 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 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
 import os
 import sys
 import time
 import shutil
 import datetime
 from rhodecode.model.db import *
 
 welcome_banner = """Welcome to RhodeCode iShell.
 Type `exit` to exit the shell.
 iShell is interactive shell to interact directly with the
 internal RhodeCode APIs. You can rescue your lost password,
 or reset some user/system settings.
 """
 
 
 @click.command()
 @click.argument('ini_path', type=click.Path(exists=True))
 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
             from traitlets.config import Config
             cfg = Config()
             cfg.InteractiveShellEmbed.confirm_exit = False
             embed(config=cfg, banner1=welcome_banner)
         except ImportError:
             print('ipython installation required for ishell')
             sys.exit(-1)
 
 

rhodecode/lib/rc_commands/setup_rc.py

@@ -1,35 +1,33 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2016-2017 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import click
 
-from pyramid.paster import bootstrap
-from pyramid.request import Request
+from rhodecode.lib.pyramid_utils import bootstrap
 import pyramid.paster
 
 
 @click.command()
 @click.argument('ini_path', type=click.Path(exists=True))
 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

rhodecode/lib/rc_commands/upgrade_db.py

@@ -1,37 +1,35 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2016-2017 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import click
 
-from pyramid.paster import bootstrap
-from pyramid.request import Request
+from rhodecode.lib.pyramid_utils import bootstrap
 import pyramid.paster
 
 
 @click.command()
 @click.argument('ini_path', type=click.Path(exists=True))
 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)