some refactoring for clearest code

django_th/tests/test_models_and_services.py

@@ -44,8 +44,8 @@ def create_userservice(self, token="AZERTY12345"):
     def test_userservice(self):
         u = self.create_userservice()
         self.assertTrue(isinstance(u, UserService))
-        self.assertEqual(u.show(), "User Service %s %s %s" %
-                        (u.user, u.token, u.name))
+        self.assertEqual(u.show(), "User Service %s %s %s" % (u.user, u.token,
+                                                              u.name))
 
     """
         Form - works with python 2.7.x - fails with python 3.4.0
@@ -72,9 +72,11 @@ class ServicesActivatedTest(TestCase):
     """
         ServicesActivated Model
     """
-    def create_servicesactivated(self, name='ServiceRss', status=True,
-                                 auth_required=False,
-                                 description='RSS Feeds Service'):
+    def create_servicesactivated(self):
+        name = 'ServiceRss'
+        status = True
+        auth_required = False
+        description = 'RSS Feeds Service'
         return ServicesActivated.objects.create(name=name, status=status,
                                                 auth_required=auth_required,
                                                 description=description)
@@ -123,8 +125,10 @@ def create_triggerservice(self, date_created="20130610",
     def test_triggerservice(self):
         t = self.create_triggerservice()
         self.assertTrue(isinstance(t, TriggerService))
-        self.assertEqual(t.show(), "My Service %s %s %s %s" %
-                        (t.provider, t.consumer, t.description, t.user))
+        self.assertEqual(t.show(), "My Service %s %s %s %s" % (t.provider,
+                                                               t.consumer,
+                                                               t.description,
+                                                               t.user))
 
     """
         Form

django_th/tests/test_views.py

@@ -11,35 +11,34 @@
 class TriggerEditedTemplateViewTestCase(unittest.TestCase):
 
     def test_get(self):
-        template_name = "triggers/thanks_trigger.html"
+        template = "triggers/thanks_trigger.html"
         # Setup request and view.
         request = RequestFactory().get('/th/trigger/edit/thanks')
-        view = TriggerEditedTemplateView.as_view(template_name=template_name)
+        view = TriggerEditedTemplateView.as_view(template_name=template)
         sentence = 'Your trigger has been successfully modified'
         # Run.
         response = view(request)
         # Check.
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(
-            response.template_name[0], 'triggers/thanks_trigger.html')
+        self.assertEqual(response.template_name[0],
+                         'triggers/thanks_trigger.html')
         self.assertEqual(response.context_data['sentence'], sentence)
 
 
 class TriggerDeletedTemplateViewTestCase(unittest.TestCase):
 
     def test_get(self):
-        template_name = "triggers/thanks_trigger.html"
+        template = "triggers/thanks_trigger.html"
         # Setup request and view.
         request = RequestFactory().get('/th/trigger/delete/thanks')
-        view = TriggerDeletedTemplateView.as_view(
-            template_name=template_name)
+        view = TriggerDeletedTemplateView.as_view(template_name=template)
         sentence = 'Your trigger has been successfully deleted'
         # Run.
         response = view(request)
         # Check.
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(
-            response.template_name[0], 'triggers/thanks_trigger.html')
+        self.assertEqual(response.template_name[0],
+                         'triggers/thanks_trigger.html')
         self.assertEqual(response.context_data['sentence'], sentence)
 
 
@@ -61,9 +60,7 @@ def test_context_data(self):
         in context.
         """
         # Setup name.
-        triggers_enabled = 0
-        triggers_disabled = 0
-        services_activated = 0
+        triggers_enabled = triggers_disabled = services_activated = 0
         queryset = TriggerService.objects.all()
 
         # Setup request and view.

django_th/tests/test_views_userservices.py

@@ -8,14 +8,14 @@
 from django_th.models import UserService
 from django_th.tests.test_views import setup_view
 
+
 class UserServiceAddedTemplateViewTestCase(unittest.TestCase):
 
     def test_get(self):
-        template_name = 'services/thanks_service.html'
+        template = 'services/thanks_service.html'
         # Setup request and view.
         request = RequestFactory().get('/th/service/add/thanks')
-        view = UserServiceAddedTemplateView.as_view(
-            template_name=template_name)
+        view = UserServiceAddedTemplateView.as_view(template_name=template)
         sentence = 'Your service has been successfully created'
         # Run.
         response = view(request)
@@ -29,11 +29,10 @@ def test_get(self):
 class UserServiceDeletedTemplateViewTestCase(unittest.TestCase):
 
     def test_get(self):
-        template_name = 'services/thanks_service.html'
+        template = 'services/thanks_service.html'
         # Setup request and view.
         request = RequestFactory().get('/th/service/delete/thanks')
-        view = UserServiceDeletedTemplateView.as_view(
-            template_name=template_name)
+        view = UserServiceDeletedTemplateView.as_view(template_name=template)
         sentence = 'Your service has been successfully deleted'
         # Run.
         response = view(request)
@@ -72,12 +71,16 @@ def test_context_data(self):
 
         if request.user.is_authenticated():
             nb_user_service = nb_service = 20
-            context, action = self.get_action_context(context, nb_user_service, nb_service)
+            context, action = self.get_action_context(context,
+                                                      nb_user_service,
+                                                      nb_service)
             self.assertEqual(context['action'], action)
 
             nb_user_service = 19
             nb_service = 20
-            context, action = self.get_action_context(context, nb_user_service, nb_service)
+            context, action = self.get_action_context(context,
+                                                      nb_user_service,
+                                                      nb_service)
             self.assertEqual(context['action'], action)
 
     def get_action_context(self, context, nb_user_service, nb_service):