pyramid: fixed some deprecated calls.

rhodecode/apps/debug_style/__init__.py

@@ -1,42 +1,50 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2016-2018 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/
 from rhodecode.apps._base import ADMIN_PREFIX
 from rhodecode.lib.utils2 import str2bool
 
 
-def debug_style_enabled(info, request):
-    return str2bool(request.registry.settings.get('debug_style'))
+class DebugStylePredicate(object):
+    def __init__(self, val, config):
+        self.val = val
 
+    def text(self):
+        return 'debug style route = %s' % self.val
+
+    phash = text
+
+    def __call__(self, info, request):
+        str2bool(request.registry.settings.get('debug_style'))
 
 def includeme(config):
+    config.add_route_predicate(
+        'debug_style', DebugStylePredicate)
+
     config.add_route(
         name='debug_style_home',
         pattern=ADMIN_PREFIX + '/debug_style',
-        custom_predicates=(debug_style_enabled,))
+        debug_style=True)
     config.add_route(
         name='debug_style_template',
         pattern=ADMIN_PREFIX + '/debug_style/t/{t_path}',
-        custom_predicates=(debug_style_enabled,))
+        debug_style=True)
 
     # Scan module for configuration decorators.
     config.scan('.views', ignore='.tests')
-
-
-

rhodecode/integrations/routes.py

@@ -1,230 +1,240 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2012-2018 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 logging
 
 from rhodecode.apps._base import ADMIN_PREFIX, add_route_requirements
 from rhodecode.lib.utils2 import safe_int
 from rhodecode.model.db import Repository, Integration, RepoGroup
 from rhodecode.integrations import integration_type_registry
 
 log = logging.getLogger(__name__)
 
 
+class ValidIntegrationPredicate(object):
+    def __init__(self, val, config):
+        self.val = val
+
+    def text(self):
+        return 'valid_integration_route = %s' % self.val
+
+    phash = text
+
+    def __call__(self, info, request):
+        integration_type = info['match']['integration']
+        integration_id = info['match'].get('integration_id')
+
+        if integration_type not in integration_type_registry:
+            return False
+
+        if integration_id:
+            if not safe_int(integration_id):
+                return False
+
+            integration = Integration.get(integration_id)
+            if not integration:
+                return False
+            if integration.integration_type != integration_type:
+                return False
+
+            # match types to repo or repo group
+            repo_name = info['match'].get('repo_name')
+            repo_group_name = info['match'].get('repo_group_name')
+            repo, repo_group = None, None
+            if repo_name:
+                repo = Repository.get_by_repo_name(repo_name)
+                if not repo:
+                    return False
+
+            if repo_group_name:
+                repo_group = RepoGroup.get_by_group_name(repo_group_name)
+                if not repo_group:
+                    return False
+
+            if repo and repo.repo_id != integration.repo_id:
+                return False
+            if repo_group and repo_group.group_id != integration.repo_group_id:
+                return False
+
+        return True
+
+
 def includeme(config):
+    config.add_route_predicate(
+        'valid_integration', ValidIntegrationPredicate)
 
     # global integrations
     config.add_route('global_integrations_new',
                      ADMIN_PREFIX + '/integrations/new')
     config.add_view('rhodecode.integrations.views.GlobalIntegrationsView',
                     attr='new_integration',
                     renderer='rhodecode:templates/admin/integrations/new.mako',
                     request_method='GET',
                     route_name='global_integrations_new')
 
     config.add_route('global_integrations_home',
                      ADMIN_PREFIX + '/integrations')
     config.add_route('global_integrations_list',
                      ADMIN_PREFIX + '/integrations/{integration}')
     for route_name in ['global_integrations_home', 'global_integrations_list']:
         config.add_view('rhodecode.integrations.views.GlobalIntegrationsView',
                         attr='integration_list',
                         renderer='rhodecode:templates/admin/integrations/list.mako',
                         request_method='GET',
                         route_name=route_name)
 
     config.add_route('global_integrations_create',
                      ADMIN_PREFIX + '/integrations/{integration}/new',
-                     custom_predicates=(valid_integration,))
+                     valid_integration=True)
     config.add_route('global_integrations_edit',
                      ADMIN_PREFIX + '/integrations/{integration}/{integration_id}',
-                     custom_predicates=(valid_integration,))
+                     valid_integration=True)
 
     for route_name in ['global_integrations_create', 'global_integrations_edit']:
         config.add_view('rhodecode.integrations.views.GlobalIntegrationsView',
                         attr='settings_get',
                         renderer='rhodecode:templates/admin/integrations/form.mako',
                         request_method='GET',
                         route_name=route_name)
         config.add_view('rhodecode.integrations.views.GlobalIntegrationsView',
                         attr='settings_post',
                         renderer='rhodecode:templates/admin/integrations/form.mako',
                         request_method='POST',
                         route_name=route_name)
 
     # repo group integrations
     config.add_route('repo_group_integrations_home',
                      add_route_requirements('/{repo_group_name}/_settings/integrations'),
                      repo_group_route=True)
 
     config.add_view('rhodecode.integrations.views.RepoGroupIntegrationsView',
                     attr='integration_list',
                     renderer='rhodecode:templates/admin/integrations/list.mako',
                     request_method='GET',
                     route_name='repo_group_integrations_home')
 
     config.add_route('repo_group_integrations_new',
                      add_route_requirements('/{repo_group_name}/_settings/integrations/new'),
                      repo_group_route=True)
     config.add_view('rhodecode.integrations.views.RepoGroupIntegrationsView',
                     attr='new_integration',
                     renderer='rhodecode:templates/admin/integrations/new.mako',
                     request_method='GET',
                     route_name='repo_group_integrations_new')
 
     config.add_route('repo_group_integrations_list',
                      add_route_requirements('/{repo_group_name}/_settings/integrations/{integration}'),
                      repo_group_route=True,
-                     custom_predicates=(valid_integration,))
+                     valid_integration=True)
     config.add_view('rhodecode.integrations.views.RepoGroupIntegrationsView',
                     attr='integration_list',
                     renderer='rhodecode:templates/admin/integrations/list.mako',
                     request_method='GET',
                     route_name='repo_group_integrations_list')
 
     config.add_route('repo_group_integrations_create',
                      add_route_requirements('/{repo_group_name}/_settings/integrations/{integration}/new'),
                      repo_group_route=True,
-                     custom_predicates=(valid_integration,))
+                     valid_integration=True)
     config.add_view('rhodecode.integrations.views.RepoGroupIntegrationsView',
                     attr='settings_get',
                     renderer='rhodecode:templates/admin/integrations/form.mako',
                     request_method='GET',
                     route_name='repo_group_integrations_create')
     config.add_view('rhodecode.integrations.views.RepoGroupIntegrationsView',
                     attr='settings_post',
                     renderer='rhodecode:templates/admin/integrations/form.mako',
                     request_method='POST',
                     route_name='repo_group_integrations_create')
 
     config.add_route('repo_group_integrations_edit',
                      add_route_requirements('/{repo_group_name}/_settings/integrations/{integration}/{integration_id}'),
                      repo_group_route=True,
-                     custom_predicates=(valid_integration,))
+                     valid_integration=True)
 
     config.add_view('rhodecode.integrations.views.RepoGroupIntegrationsView',
                     attr='settings_get',
                     renderer='rhodecode:templates/admin/integrations/form.mako',
                     request_method='GET',
                     route_name='repo_group_integrations_edit')
     config.add_view('rhodecode.integrations.views.RepoGroupIntegrationsView',
                     attr='settings_post',
                     renderer='rhodecode:templates/admin/integrations/form.mako',
                     request_method='POST',
                     route_name='repo_group_integrations_edit')
 
     # repo integrations
     config.add_route('repo_integrations_home',
                      add_route_requirements('/{repo_name}/settings/integrations'),
                      repo_route=True)
     config.add_view('rhodecode.integrations.views.RepoIntegrationsView',
                     attr='integration_list',
                     request_method='GET',
                     renderer='rhodecode:templates/admin/integrations/list.mako',
                     route_name='repo_integrations_home')
 
     config.add_route('repo_integrations_new',
                      add_route_requirements('/{repo_name}/settings/integrations/new'),
                      repo_route=True)
     config.add_view('rhodecode.integrations.views.RepoIntegrationsView',
                     attr='new_integration',
                     renderer='rhodecode:templates/admin/integrations/new.mako',
                     request_method='GET',
                     route_name='repo_integrations_new')
 
     config.add_route('repo_integrations_list',
                      add_route_requirements('/{repo_name}/settings/integrations/{integration}'),
                      repo_route=True,
-                     custom_predicates=(valid_integration,))
+                     valid_integration=True)
     config.add_view('rhodecode.integrations.views.RepoIntegrationsView',
                     attr='integration_list',
                     request_method='GET',
                     renderer='rhodecode:templates/admin/integrations/list.mako',
                     route_name='repo_integrations_list')
 
     config.add_route('repo_integrations_create',
                      add_route_requirements('/{repo_name}/settings/integrations/{integration}/new'),
                      repo_route=True,
-                     custom_predicates=(valid_integration,))
+                     valid_integration=True)
     config.add_view('rhodecode.integrations.views.RepoIntegrationsView',
                     attr='settings_get',
                     renderer='rhodecode:templates/admin/integrations/form.mako',
                     request_method='GET',
                     route_name='repo_integrations_create')
     config.add_view('rhodecode.integrations.views.RepoIntegrationsView',
                     attr='settings_post',
                     renderer='rhodecode:templates/admin/integrations/form.mako',
                     request_method='POST',
                     route_name='repo_integrations_create')
 
     config.add_route('repo_integrations_edit',
                      add_route_requirements('/{repo_name}/settings/integrations/{integration}/{integration_id}'),
                      repo_route=True,
-                     custom_predicates=(valid_integration,))
+                     valid_integration=True)
     config.add_view('rhodecode.integrations.views.RepoIntegrationsView',
                     attr='settings_get',
                     renderer='rhodecode:templates/admin/integrations/form.mako',
                     request_method='GET',
                     route_name='repo_integrations_edit')
     config.add_view('rhodecode.integrations.views.RepoIntegrationsView',
                     attr='settings_post',
                     renderer='rhodecode:templates/admin/integrations/form.mako',
                     request_method='POST',
                     route_name='repo_integrations_edit')
-
-
-
-def valid_integration(info, request):
-    integration_type = info['match']['integration']
-    integration_id = info['match'].get('integration_id')
-
-    if integration_type not in integration_type_registry:
-        return False
-
-    if integration_id:
-        if not safe_int(integration_id):
-            return False
-
-        integration = Integration.get(integration_id)
-        if not integration:
-            return False
-        if integration.integration_type != integration_type:
-            return False
-
-        # match types to repo or repo group
-        repo_name = info['match'].get('repo_name')
-        repo_group_name = info['match'].get('repo_group_name')
-        repo, repo_group = None, None
-        if repo_name:
-            repo = Repository.get_by_repo_name(repo_name)
-            if not repo:
-                return False
-
-        if repo_group_name:
-            repo_group = RepoGroup.get_by_group_name(repo_group_name)
-            if not repo_group:
-                return False
-
-        if repo and repo.repo_id != integration.repo_id:
-            return False
-        if repo_group and repo_group.group_id != integration.repo_group_id:
-            return False
-
-    return True