Fixed flake8

Rodrigo Siqueira de Melo · Sergio Oliveira
1 parent 080cb1eb
Showing 10 changed files with 22 additions and 18 deletions Show diff stats
colab/accounts/views.py
colab/home/context_processors.py
colab/plugins/mezuro/__init__.py
colab/plugins/mezuro/admin.py
colab/plugins/mezuro/apps.py
colab/plugins/mezuro/models.py
colab/plugins/mezuro/tests.py
colab/plugins/mezuro/views.py
colab/search/forms.py
colab/search/tests.py
 # encoding: utf-8
 from collections import OrderedDict
-from django.conf import settings
 from django.contrib import messages
-from django.db import transaction
 from django.db.models import Count
 from django.contrib.auth import get_user_model
 from django.utils.translation import ugettext as _
-from django.shortcuts import render, redirect, get_object_or_404
+from django.shortcuts import render, redirect
 from django.core.urlresolvers import reverse
 from django.core.exceptions import PermissionDenied
-from django.views.generic import DetailView, UpdateView, TemplateView
+from django.views.generic import DetailView, UpdateView
 from django.http import Http404
 from colab.super_archives.models import (EmailAddress,
@@ -18,8 +16,7 @@ from colab.super_archives.models import (EmailAddress,
 from colab.search.utils import get_collaboration_data, get_visible_threads
 from colab.accounts.models import User
-from .forms import (UserCreationForm, UserForm, ListsForm,
-                    UserUpdateForm)
+from .forms import (UserCreationForm, ListsForm, UserUpdateForm)
 from .utils import mailman
@@ -25,4 +25,3 @@ def ribbon(request):
             'url': getattr(settings, 'RIBBON_URL', url),
         }
     }
-
-default_app_config = 'colab.plugins.mezuro.apps.ProxyMezuroAppConfig'
 \ No newline at end of file
+
+
+default_app_config = 'colab.plugins.mezuro.apps.ProxyMezuroAppConfig'
-from django.contrib import admin
+# from django.contrib import admin
 # Register your models here.
-from django.utils.translation import ugettext_lazy as _
+# from django.utils.translation import ugettext_lazy as _
 from ..utils.apps import ColabProxiedAppConfig
+
 class ProxyMezuroAppConfig(ColabProxiedAppConfig):
     name = 'colab.plugins.mezuro'
     verbose_name = 'Mezuro Proxy'
-from django.db import models
+# from django.db import models
 # Create your models here.
-from django.test import TestCase
+# from django.test import TestCase
 # Create your tests here.
 from ..utils.views import ColabProxyView
+
 class MezuroProxyView(ColabProxyView):
     app_label = 'mezuro'
     diazo_theme_template = 'proxy/mezuro.html'
@@ -107,10 +107,11 @@ class ColabSearchForm(SearchForm):
                 # http://wiki.apache.org/solr/FunctionQuery#Date_Boosting
                 'bf': 'recip(ms(NOW/HOUR,modified),3.16e-11,1,1)^10',
             }
+            hayString = 'haystack.backends.whoosh_backend.WhooshEngine'
+            if settings.HAYSTACK_CONNECTIONS['default']['ENGINE'] != hayString:
+                        sqs = sqs.filter(content=AltParser(
+                                         'edismax', q, **dismax_opts))
-            if settings.HAYSTACK_CONNECTIONS['default']['ENGINE'] != \
-            'haystack.backends.whoosh_backend.WhooshEngine':
-                sqs = sqs.filter(content=AltParser('edismax', q, **dismax_opts))
             else:
                 sqs = sqs.filter(content=AutoQuery(q))
@@ -21,11 +21,14 @@ class SearchViewTest(TestCase):
         self.assertEqual(3,  len(thread_list))
-        condition = any('This is a repply to Thread 1 on list A' in t.description for t in thread_list)
+        condition = any('This is a repply to Thread 1 on list A' in
+                        t.description for t in thread_list)
         self.assertTrue(condition)
-        condition = any('This is a repply to Thread 1 on list B' in t.description for t in thread_list)
+        condition = any('This is a repply to Thread 1 on list B' in
+                        t.description for t in thread_list)
         self.assertTrue(condition)
-        condition = any('This is a repply to Thread 1 on list C' in t.description for t in thread_list)
+        condition = any('This is a repply to Thread 1 on list C' in
+                        t.description for t in thread_list)
         self.assertTrue(condition)
     def test_search_account_by_firstName(self):
	@@ -25,4 +25,3 @@ def ribbon(request):		@@ -25,4 +25,3 @@ def ribbon(request):
25	'url': getattr(settings, 'RIBBON_URL', url),	25	'url': getattr(settings, 'RIBBON_URL', url),
26	}	26	}
27	}	27	}
28	-
1	-default_app_config = 'colab.plugins.mezuro.apps.ProxyMezuroAppConfig'
2	\ No newline at end of file	1	\ No newline at end of file
		2	+
		3	+
		4	+default_app_config = 'colab.plugins.mezuro.apps.ProxyMezuroAppConfig'
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.utils.translation import ugettext_lazy as _	1	+# from django.utils.translation import ugettext_lazy as _
2	from ..utils.apps import ColabProxiedAppConfig	2	from ..utils.apps import ColabProxiedAppConfig
3		3
		4	+
4	class ProxyMezuroAppConfig(ColabProxiedAppConfig):	5	class ProxyMezuroAppConfig(ColabProxiedAppConfig):
5	name = 'colab.plugins.mezuro'	6	name = 'colab.plugins.mezuro'
6	verbose_name = 'Mezuro Proxy'	7	verbose_name = 'Mezuro Proxy'
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.test import TestCase	1	+# from django.test import TestCase
2		2
3	# Create your tests here.	3	# Create your tests here.
1	from ..utils.views import ColabProxyView	1	from ..utils.views import ColabProxyView
2		2
		3	+
3	class MezuroProxyView(ColabProxyView):	4	class MezuroProxyView(ColabProxyView):
4	app_label = 'mezuro'	5	app_label = 'mezuro'
5	diazo_theme_template = 'proxy/mezuro.html'	6	diazo_theme_template = 'proxy/mezuro.html'