diff --git a/colab/utils/conf.py b/colab/utils/conf.py index 58f4a46..9f8daa8 100644 --- a/colab/utils/conf.py +++ b/colab/utils/conf.py @@ -156,8 +156,7 @@ def load_widgets_settings(): importlib.import_module(settings_module) # Read settings from widgets.d - settings_dir = os.getenv('COLAB_WIDGETS', - '/etc/colab/widgets.d') + settings_dir = os.getenv('COLAB_WIDGETS', '/etc/colab/widgets.d') logger.info('Widgets Settings directory: %s', settings_dir) sys.path = original_path diff --git a/colab/widgets/admin.py b/colab/widgets/admin.py index 8c38f3f..4185d36 100644 --- a/colab/widgets/admin.py +++ b/colab/widgets/admin.py @@ -1,3 +1,3 @@ -from django.contrib import admin +# from django.contrib import admin # Register your models here. diff --git a/colab/widgets/models.py b/colab/widgets/models.py index 71a8362..0b4331b 100644 --- a/colab/widgets/models.py +++ b/colab/widgets/models.py @@ -1,3 +1,3 @@ -from django.db import models +# from django.db import models # Create your models here. diff --git a/colab/widgets/tests/test_widget_manager.py b/colab/widgets/tests/test_widget_manager.py index 3f8a9a7..34a7535 100644 --- a/colab/widgets/tests/test_widget_manager.py +++ b/colab/widgets/tests/test_widget_manager.py @@ -2,22 +2,25 @@ from django.test import TestCase from colab.widgets.widget_manager import WidgetManager, Widget + class WidgetManagerTest(TestCase): - html_content = "

test

" + html_content = "

T

" widget_area = 'profile' widget_id = 'widget_id' def custom_widget_instance(self, content): + class CustomWidget(Widget): identifier = 'widget_id' + def generate_content(self, request=None): self.content = content return CustomWidget() def setUp(self): - WidgetManager.register_widget(self.widget_area, \ - self.custom_widget_instance(self.html_content)) + custom_widget = self.custom_widget_instance(self.html_content) + WidgetManager.register_widget(self.widget_area, custom_widget) def tearDown(self): WidgetManager.unregister_widget(self.widget_area, self.widget_id) @@ -38,7 +41,7 @@ class WidgetManagerTest(TestCase): customWidget = self.custom_widget_instance(self.html_content) customWidget.generate_content() - self.assertEqual(customWidget.get_body(), "

test

") + self.assertEqual(customWidget.get_body(), "

T

") def test_get_header(self): customWidget = self.custom_widget_instance(self.html_content) diff --git a/colab/widgets/views.py b/colab/widgets/views.py index 91ea44a..fd0e044 100644 --- a/colab/widgets/views.py +++ b/colab/widgets/views.py @@ -1,3 +1,3 @@ -from django.shortcuts import render +# from django.shortcuts import render # Create your views here. diff --git a/colab/widgets/widget_manager.py b/colab/widgets/widget_manager.py index 9a3ee98..eb8a88d 100644 --- a/colab/widgets/widget_manager.py +++ b/colab/widgets/widget_manager.py @@ -1,5 +1,6 @@ from django.utils.safestring import mark_safe + class Widget(object): identifier = None name = None @@ -36,21 +37,21 @@ class WidgetManager(object): @staticmethod def register_widget(category, widget): - if not WidgetManager.widget_categories.has_key(category): + if category not in WidgetManager.widget_categories: WidgetManager.widget_categories[category] = [] WidgetManager.widget_categories[category].append(widget) @staticmethod def unregister_widget(category, widget_identifier): - if WidgetManager.widget_categories.has_key(category): + if category in WidgetManager.widget_categories: for widget in WidgetManager.widget_categories[category]: if widget.identifier == widget_identifier: WidgetManager.widget_categories[category].remove(widget) @staticmethod def get_widgets(category, request=None): - if not WidgetManager.widget_categories.has_key(category): + if category not in WidgetManager.widget_categories: return [] widgets = WidgetManager.widget_categories[category] -- libgit2 0.21.2