# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2017-06-06 11:35:05
# Node ID 33dbb29331ee931bffcac2fd9d542f6d0493f923
# Parent  ac2220646acb4c616d06c9a1dd5754b23c692ba7

pyramid: removed pylons reference from apps.

- this can be completly removed from those views as they are pyramid only.

diff --git a/rhodecode/apps/admin/views/open_source_licenses.py b/rhodecode/apps/admin/views/open_source_licenses.py
--- a/rhodecode/apps/admin/views/open_source_licenses.py
+++ b/rhodecode/apps/admin/views/open_source_licenses.py
@@ -21,7 +21,7 @@
 import collections
 import logging
 
-from pylons import tmpl_context as c
+
 from pyramid.view import view_config
 
 from rhodecode.apps._base import BaseAppView
@@ -34,15 +34,21 @@ log = logging.getLogger(__name__)
 
 class OpenSourceLicensesAdminSettingsView(BaseAppView):
 
+    def load_default_context(self):
+        c = self._get_local_tmpl_context()
+        self._register_global_c(c)
+        return c
+
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     @view_config(
         route_name='admin_settings_open_source', request_method='GET',
         renderer='rhodecode:templates/admin/settings/settings.mako')
     def open_source_licenses(self):
+        c = self.load_default_context()
         c.active = 'open_source'
         c.navlist = navigation_list(self.request)
         c.opensource_licenses = collections.OrderedDict(
             sorted(read_opensource_licenses().items(), key=lambda t: t[0]))
 
-        return {}
+        return self._get_template_context(c)
diff --git a/rhodecode/apps/admin/views/sessions.py b/rhodecode/apps/admin/views/sessions.py
--- a/rhodecode/apps/admin/views/sessions.py
+++ b/rhodecode/apps/admin/views/sessions.py
@@ -20,7 +20,6 @@
 
 import logging
 
-from pylons import tmpl_context as c
 from pyramid.view import view_config
 from pyramid.httpexceptions import HTTPFound
 
@@ -37,6 +36,11 @@ log = logging.getLogger(__name__)
 
 
 class AdminSessionSettingsView(BaseAppView):
+    def load_default_context(self):
+        c = self._get_local_tmpl_context()
+
+        self._register_global_c(c)
+        return c
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
@@ -44,6 +48,8 @@ class AdminSessionSettingsView(BaseAppVi
         route_name='admin_settings_sessions', request_method='GET',
         renderer='rhodecode:templates/admin/settings/settings.mako')
     def settings_sessions(self):
+        c = self.load_default_context()
+
         c.active = 'sessions'
         c.navlist = navigation_list(self.request)
 
@@ -59,7 +65,7 @@ class AdminSessionSettingsView(BaseAppVi
         c.session_expired_count = c.session_model.get_expired_count(
             older_than_seconds)
 
-        return {}
+        return self._get_template_context(c)
 
     @LoginRequired()
     @CSRFRequired()
diff --git a/rhodecode/apps/admin/views/system_info.py b/rhodecode/apps/admin/views/system_info.py
--- a/rhodecode/apps/admin/views/system_info.py
+++ b/rhodecode/apps/admin/views/system_info.py
@@ -22,7 +22,6 @@ import logging
 import urllib2
 import packaging.version
 
-from pylons import tmpl_context as c
 from pyramid.view import view_config
 
 import rhodecode
@@ -39,6 +38,10 @@ log = logging.getLogger(__name__)
 
 
 class AdminSystemInfoSettingsView(BaseAppView):
+    def load_default_context(self):
+        c = self._get_local_tmpl_context()
+        self._register_global_c(c)
+        return c
 
     @staticmethod
     def get_update_data(update_url):
@@ -64,6 +67,7 @@ class AdminSystemInfoSettingsView(BaseAp
         renderer='rhodecode:templates/admin/settings/settings.mako')
     def settings_system_info(self):
         _ = self.request.translate
+        c = self.load_default_context()
 
         c.active = 'system'
         c.navlist = navigation_list(self.request)
@@ -164,7 +168,7 @@ class AdminSystemInfoSettingsView(BaseAp
             else:
                 self.request.session.flash(
                     'You are not allowed to do this', queue='warning')
-        return {}
+        return self._get_template_context(c)
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
@@ -173,6 +177,7 @@ class AdminSystemInfoSettingsView(BaseAp
         renderer='rhodecode:templates/admin/settings/settings_system_update.mako')
     def settings_system_info_check_update(self):
         _ = self.request.translate
+        c = self.load_default_context()
 
         update_url = self.get_update_url()
 
@@ -201,4 +206,4 @@ class AdminSystemInfoSettingsView(BaseAp
             c.should_upgrade = True
         c.important_notices = latest['general']
 
-        return {}
+        return self._get_template_context(c)
diff --git a/rhodecode/apps/channelstream/views.py b/rhodecode/apps/channelstream/views.py
--- a/rhodecode/apps/channelstream/views.py
+++ b/rhodecode/apps/channelstream/views.py
@@ -30,8 +30,6 @@ Channel Stream controller for rhodecode
 import logging
 import uuid
 
-from pylons import tmpl_context as c
-from pyramid.settings import asbool
 from pyramid.view import view_config
 from webob.exc import HTTPBadRequest, HTTPForbidden, HTTPBadGateway
 
@@ -46,7 +44,6 @@ from rhodecode.lib.channelstream import 
     update_history_from_logs,
     STATE_PUBLIC_KEYS)
 from rhodecode.lib.auth import NotAnonymous
-from rhodecode.lib.utils2 import str2bool
 
 log = logging.getLogger(__name__)
 
@@ -82,7 +79,7 @@ class ChannelstreamView(object):
             log.error('Incorrect permissions for requested channels')
             raise HTTPForbidden()
 
-        user = c.rhodecode_user
+        user = self._rhodecode_user
         if user.user_id:
             user_data = get_user_data(user.user_id)
         else:
@@ -95,7 +92,7 @@ class ChannelstreamView(object):
                 'display_name': None,
                 'display_link': None,
             }
-        user_data['permissions'] = c.rhodecode_user.permissions
+        user_data['permissions'] = self._rhodecode_user.permissions
         payload = {
             'username': user.username,
             'user_state': user_data,