Refactoring widget system with flake8

Matheus de Sousa Faria · Gust
1 parent a98dc763
Showing 6 changed files with 15 additions and 12 deletions Show diff stats
colab/utils/conf.py
colab/widgets/admin.py
colab/widgets/models.py
colab/widgets/tests/test_widget_manager.py
colab/widgets/views.py
colab/widgets/widget_manager.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
-from django.contrib import admin
+# from django.contrib import admin
 # Register your models here.
-from django.db import models
+# from django.db import models
 # Create your models here.
@@ -2,22 +2,25 @@ from django.test import TestCase
 from colab.widgets.widget_manager import WidgetManager, Widget
+
 class WidgetManagerTest(TestCase):
-    html_content = "<head><meta charset='UTF-8'></head><body><p>test</p></body>"
+    html_content = "<head><meta charset='UTF-8'></head><body><p>T</p></body>"
     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(), "<p>test</p>")
+        self.assertEqual(customWidget.get_body(), "<p>T</p>")
     def test_get_header(self):
         customWidget = self.custom_widget_instance(self.html_content)
-from django.shortcuts import render
+# from django.shortcuts import render
 # Create your views here.
 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]
	@@ -156,8 +156,7 @@ def load_widgets_settings():		@@ -156,8 +156,7 @@ def load_widgets_settings():
156	importlib.import_module(settings_module)	156	importlib.import_module(settings_module)
157		157
158	# Read settings from widgets.d	158	# Read settings from widgets.d
159	- settings_dir = os.getenv('COLAB_WIDGETS',
160	- '/etc/colab/widgets.d')	159	+ settings_dir = os.getenv('COLAB_WIDGETS', '/etc/colab/widgets.d')
161	logger.info('Widgets Settings directory: %s', settings_dir)	160	logger.info('Widgets Settings directory: %s', settings_dir)
162	sys.path = original_path	161	sys.path = original_path
163		162
1	-from django.contrib import admin	1	+# from django.contrib import admin
2		2
3	# Register your models here.	3	# Register your models here.
1	-from django.db import models	1	+# from django.db import models
2		2
3	# Create your models here.	3	# Create your models here.
1	-from django.shortcuts import render	1	+# from django.shortcuts import render
2		2
3	# Create your views here.	3	# Create your views here.