From e0dc6a6c8ed9a5f90520c636cc3a1a9353bae597 Mon Sep 17 00:00:00 2001 From: Sergio Oliveira Date: Thu, 13 Aug 2015 17:45:42 -0300 Subject: [PATCH] Removed PROXIED_APPS (replaced by COLAB_APPS) --- colab/plugins/gitlab/data_api.py | 2 +- colab/plugins/noosfero/data_api.py | 2 +- colab/plugins/utils/views.py | 2 +- colab/search/utils.py | 5 ++--- colab/settings.py | 4 ---- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/colab/plugins/gitlab/data_api.py b/colab/plugins/gitlab/data_api.py index 76deb13..c51ce7c 100644 --- a/colab/plugins/gitlab/data_api.py +++ b/colab/plugins/gitlab/data_api.py @@ -18,7 +18,7 @@ LOGGER = logging.getLogger('colab.plugin.gitlab') class GitlabDataAPI(ProxyDataAPI): def get_request_url(self, path, **kwargs): - proxy_config = settings.PROXIED_APPS.get(self.app_label, {}) + proxy_config = settings.COLAB_APPS.get(self.app_label, {}) upstream = proxy_config.get('upstream') kwargs['private_token'] = proxy_config.get('private_token') diff --git a/colab/plugins/noosfero/data_api.py b/colab/plugins/noosfero/data_api.py index 6fc9d7d..4916b13 100644 --- a/colab/plugins/noosfero/data_api.py +++ b/colab/plugins/noosfero/data_api.py @@ -18,7 +18,7 @@ LOGGER = logging.getLogger('colab.plugin.debug') class NoosferoDataAPI(ProxyDataAPI): def get_request_url(self, path, **kwargs): - proxy_config = settings.PROXIED_APPS.get(self.app_label, {}) + proxy_config = settings.COLAB_APPS.get(self.app_label, {}) upstream = proxy_config.get('upstream') kwargs['private_token'] = proxy_config.get('private_token') diff --git a/colab/plugins/utils/views.py b/colab/plugins/utils/views.py index 9b2cd24..e8e128a 100644 --- a/colab/plugins/utils/views.py +++ b/colab/plugins/utils/views.py @@ -13,7 +13,7 @@ class ColabProxyView(DiazoProxyView): @property def upstream(self): - proxy_config = settings.PROXIED_APPS.get(self.app_label, {}) + proxy_config = settings.COLAB_APPS.get(self.app_label, {}) return proxy_config.get('upstream') @property diff --git a/colab/search/utils.py b/colab/search/utils.py index ee545f4..e3d15b9 100644 --- a/colab/search/utils.py +++ b/colab/search/utils.py @@ -57,11 +57,10 @@ def get_collaboration_data(logged_user, filter_by_user=None): latest_results.extend(messages) - app_names = settings.PROXIED_APPS.keys() + app_names = settings.COLAB_APPS.keys() for app_name in app_names: - module = importlib \ - .import_module('colab.plugins.{}.models'.format(app_name)) + module = importlib.import_module('{}.models'.format(app_name)) for module_item_name in dir(module): module_item = getattr(module, module_item_name) diff --git a/colab/settings.py b/colab/settings.py index 181679d..1402680 100644 --- a/colab/settings.py +++ b/colab/settings.py @@ -258,7 +258,6 @@ locals().update(conf.load_py_settings()) locals().update(conf.load_colab_apps()) COLAB_APPS = locals().get('COLAB_APPS') or {} -PROXIED_APPS = {} for app_name, app in COLAB_APPS.items(): if 'dependencies' in app: @@ -269,9 +268,6 @@ for app_name, app in COLAB_APPS.items(): if app_name not in INSTALLED_APPS: INSTALLED_APPS += (app_name,) - if app.get('upstream'): - PROXIED_APPS[app_name.split('.')[-1]] = app - if 'middlewares' in app: for middleware in app.get('middlewares'): if middleware not in MIDDLEWARE_CLASSES: -- libgit2 0.21.2