Merge pull request #4 from markvl/issue2

This commit fixes a lot of flake8 errors (issue #2).

src/mpdg/govbr/faleconosco/__init__.py

@@ -1,12 +1,9 @@
 # -*- coding: utf-8 -*-
 """Init and utils."""
-
-from zope.i18nmessageid import MessageFactory
-
+from mpdg.govbr.faleconosco import config
 from Products.Archetypes import atapi
 from Products.CMFCore.utils import ContentInit
-
-from mpdg.govbr.faleconosco import config
+from zope.i18nmessageid import MessageFactory
 
 
 MessageFactory = MessageFactory('mpdg.govbr.faleconosco')

src/mpdg/govbr/faleconosco/browser/arquivarmensagemview.py

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 from five import grok
-from Products.CMFCore.interfaces import ISiteRoot
 from mpdg.govbr.faleconosco.browser.utilities import FaleConoscoAdminRequired
 from plone import api
+from Products.CMFCore.interfaces import ISiteRoot
 from Products.statusmessages.interfaces import IStatusMessage
 
+
 grok.templatedir('templates')
 
 
@@ -23,7 +24,7 @@ def update(self):
  return self._back_to_admin()
 
  catalog = api.portal.get_tool(name='portal_catalog')
- brain  = catalog.searchResults(UID=uids)
+ brain = catalog.searchResults(UID=uids)
 
  if brain:
 
@@ -48,7 +49,7 @@ def update(self):
 
  def _back_to_admin(self):
 
- p_url  = api.portal.get().absolute_url()
+ p_url = api.portal.get().absolute_url()
  target = '{0}/@@fale-conosco-admin'.format(p_url)
 
  return self.request.response.redirect(target)

src/mpdg/govbr/faleconosco/browser/categoriachartsview.py

@@ -1,18 +1,14 @@
 # -*- coding: utf-8 -*-
 # -*- coding: iso-8859-1 -*
 # from __future__ import unicode_literals
-import operator
-import random
-import unicodedata 
-import re
-from unidecode import unidecode
-from unicodedata import normalize
-
 from five import grok
 from plone import api
 from Products.CMFCore.interfaces import ISiteRoot
 
-from mpdg.govbr.faleconosco.browser import falecategorizar
+import operator
+import random
+import unicodedata
+
 
 grok.templatedir('templates')
 
@@ -24,7 +20,6 @@ class CategoriaChartsView(grok.View):
  grok.name('categoria-charts-view')
  grok.require('zope2.View')
  grok.context(ISiteRoot)
-
 
  def update(self):
  qtd_get = int(self.request.form.get('qtd', 10))
@@ -95,7 +90,7 @@ def get_tags_list(self):
  tags = self._filter_tags()
  result = []
  for tag, v in tags:
- 
+
  result.append(tag)
  return result
 
@@ -168,8 +163,6 @@ def gera_cor(self):
  """
  result = []
  for elem in range(0, self.qtd):
- cor = '#{:02x}{:02x}{:02x}'.format(*map(lambda x: random.randint(0, 255), range(0,10)))
+ cor = '#{:02x}{:02x}{:02x}'.format(*map(lambda x: random.randint(0, 255), range(0, 10)))
  result.append(cor)
  return result
-
-

src/mpdg/govbr/faleconosco/browser/confirmacaoview.py

@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
 from five import grok
-from zope.interface import Interface
+from mpdg.govbr.faleconosco.browser.utilities import get_fale_config
+from mpdg.govbr.faleconosco.browser.utilities import transform_message
 from plone import api
-from mpdg.govbr.faleconosco.browser.utilities import transform_message, get_fale_config
+from zope.interface import Interface
+
 
 grok.templatedir('templates')
 
@@ -21,10 +23,10 @@ def get_portal_url(self):
  def get_message(self):
  nome = self.request.form['nome']
  email = self.request.form['email']
- mensagem = self.request.form ['mensagem']
+ mensagem = self.request.form['mensagem']
  text = get_fale_config('enviar_email_form')
- assunto= self.request.form['assunto']
- msg = transform_message(text, nome, email, mensagem,assunto)
+ assunto = self.request.form['assunto']
+ msg = transform_message(text, nome, email, mensagem, assunto)
  return {
  'msg': msg,
  'email': email

src/mpdg/govbr/faleconosco/browser/desarquivarmensagem.py

@@ -1,15 +1,16 @@
 # -*- coding: utf-8 -*-
 from five import grok
-from Products.CMFCore.interfaces import ISiteRoot
 from mpdg.govbr.faleconosco.browser.utilities import FaleConoscoAdminRequired
+from mpdg.govbr.faleconosco.browser.utilities import FluxoMensagensView
 from plone import api
+from Products.CMFCore.interfaces import ISiteRoot
 from Products.statusmessages.interfaces import IStatusMessage
-from mpdg.govbr.faleconosco.browser.utilities import FluxoMensagensView
+
 
 grok.templatedir('templates')
 
 
-class DesarquivarMensagemView(FaleConoscoAdminRequired, FluxoMensagensView ,grok.View):
+class DesarquivarMensagemView(FaleConoscoAdminRequired, FluxoMensagensView, grok.View):
  """docstring for ClassName"""
  grok.name('desarquivar-mensagem')
  grok.require('zope2.View')
@@ -18,37 +19,36 @@ class DesarquivarMensagemView(FaleConoscoAdminRequired, FluxoMensagensView ,grok
  def assunto(self):
  # fazer busca e retornar assunto da msg
  catalog = api.portal.get_tool(name='portal_catalog')
- brain  = catalog.searchResults(UID=self.uids)
+ brain = catalog.searchResults(UID=self.uids)
  if brain:
- form  = brain[0].getObject()
+ form = brain[0].getObject()
  mensagem = form.getAssunto()
  return mensagem
 
- def update(self): 
+ def update(self):
  uids = self.request.form.get('uids')
  if not uids:
  self.message('Você não pode acessar a página diretamente')
  return self._back_to_admin()
 
  catalog = api.portal.get_tool(name='portal_catalog')
- brain  = catalog.searchResults(UID=uids)
+ brain = catalog.searchResults(UID=uids)
 
  if brain:
 
  obj = brain[0].getObject()
- obj.setArquivado(False) # Verificar se este valor está sendo passado corretamente.
+ obj.setArquivado(False)  # Verificar se este valor está sendo passado corretamente.
  import transaction; transaction.commit()
  # obj.reindexObject()
  catalog.reindexObject(obj)
  self.message('Mensagem desarquivada com sucesso')
- return self._back_to_admin() 
+ return self._back_to_admin()
 
  else:
 
  self.message('Mensagem não pode ser encontrada')
  return self._back_to_admin()
 
-
  def _back_to_admin(self):
  p_url = api.portal.get().absolute_url()
  target = '{0}/@@mensagens-arquivadas-admin'.format(p_url)
@@ -57,4 +57,4 @@ def _back_to_admin(self):
  def message(self, mensagem):
  messages = IStatusMessage(self.request)
  messages.add(mensagem, type='info')
- return
+ return

src/mpdg/govbr/faleconosco/browser/encaminharadminview.py

@@ -1,26 +1,27 @@
 # -*- encoding: utf-8 -*-
+from datetime import datetime
 from five import grok
+from mpdg.govbr.faleconosco.browser.utilities import FaleConoscoAdminRequired
+from mpdg.govbr.faleconosco.browser.utilities import FluxoMensagensView
 from plone import api
+from plone.autoform import directives
+from plone.directives import form
+from plone.i18n.normalizer import idnormalizer
+from plone.registry.interfaces import IRegistry
 from Products.CMFCore.interfaces import ISiteRoot
 from Products.statusmessages.interfaces import IStatusMessage
-from plone.directives import form
-from plone.supermodel import model
-from zope import schema
 from z3c.form import button
-from plone.autoform import directives
-from plone.registry.interfaces import IRegistry
+from zope import schema
 from zope.component import getUtility
-from mpdg.govbr.faleconosco.browser.utilities import FaleConoscoAdminRequired
-from plone.i18n.normalizer import idnormalizer
-from datetime import datetime
-from mpdg.govbr.faleconosco.browser.utilities import FluxoMensagensView
+
 
 grok.templatedir('templates')
 
+
 class IEncaminharAdminForm(form.Schema):
- directives.mode(uids="hidden")
- uids  = schema.TextLine(title=u"UIDS", required=True)
- mensagem  = schema.Text(title=u"Mensagem:", required=True)
+ directives.mode(uids='hidden')
+ uids = schema.TextLine(title=u'UIDS', required=True)
+ mensagem = schema.Text(title=u'Mensagem:', required=True)
 
 
 @form.default_value(field=IEncaminharAdminForm['uids'])
@@ -37,25 +38,25 @@ class EncaminharAdminView(FaleConoscoAdminRequired, FluxoMensagensView, form.Sch
  # Quem pode acessar
  grok.context(ISiteRoot)
 
- schema  = IEncaminharAdminForm
+ schema = IEncaminharAdminForm
  ignoreContext = True
- label  = u"Encaminhar a mensagem para o administrador do Fale Conosco."
+ label = u'Encaminhar a mensagem para o administrador do Fale Conosco.'
 
  def responsavel(self):
 
  # fazer busca e retornar assunto da msg
  catalog = api.portal.get_tool(name='portal_catalog')
- brain  = catalog.searchResults(UID=self.uids)
+ brain = catalog.searchResults(UID=self.uids)
 
  if brain:
 
- form  = brain[0].getObject()
+ form = brain[0].getObject()
  oldresponsavel = form.getResponsavel()
  return oldresponsavel
 
  def _back_to_admin(self, message=None):
 
- portal_url  = api.portal.get().absolute_url()
+ portal_url = api.portal.get().absolute_url()
  fale_conosco = '{0}/@@fale-conosco-admin/'.format(portal_url)
 
  if message:
@@ -72,20 +73,18 @@ def get_adm_fale(self):
  adm_fale = registry.records['mpdg.govbr.faleconosco.controlpanel.IFaleSettings.admfale'].value
  return adm_fale
 
-
  def update(self):
  self.uids = self.request.form.get('form.widgets.uids') or self.request.form.get('uids')
-  # Retira as opões de edição da página.(Barrinha verde)
+ # Retira as opões de edição da página.(Barrinha verde)
  self.request.set('disable_border', True)
 
-
  if self.uids:
 
- uids  = self.uids.split(',')
+ uids = self.uids.split(',')
  catalog = api.portal.get_tool(name='portal_catalog')
 
- search  = catalog.searchResults(
- UID = uids
+ search = catalog.searchResults(
+ UID=uids
  )
 
  lista = []
@@ -112,7 +111,6 @@ def update(self):
 
  # Cria um botão no formulario
  @button.buttonAndHandler(u'Enviar')
-
  def handleApply(self, action):
 
  data, errors = self.extractData()
@@ -123,37 +121,36 @@ def handleApply(self, action):
  return
 
  responsavel = self.get_adm_fale()
- mensagem  = data['mensagem']
- catalog  = api.portal.get_tool(name='portal_catalog')
- uids  = self.uids.split(',')
- brain  = catalog.searchResults(UID=uids)
+ mensagem = data['mensagem']
+ catalog = api.portal.get_tool(name='portal_catalog')
+ uids = self.uids.split(',')
+ brain = catalog.searchResults(UID=uids)
 
  for item in brain:
 
- obj  = item.getObject()
+ obj = item.getObject()
  old_resp = self.responsavel()
  obj.setResponsavel(responsavel)
  obj.reindexObject()
 
  nome = responsavel
- id  = idnormalizer.normalize(nome) + \
+ id = idnormalizer.normalize(nome) + \
  '-' + str(datetime.now().microsecond)
- pt  = api.portal.get_tool(name='portal_types')
+ pt = api.portal.get_tool(name='portal_types')
  type_info = pt.getTypeInfo('Mensagem')
- child  = type_info._constructInstance(obj, id)
+ child = type_info._constructInstance(obj, id)
  child.setTitle(nome)
  child.setNome(responsavel)
  child.setMensagem(mensagem)
  child.setResponsavel(old_resp)
  child.reindexObject()
 
- api.content.transition(obj = obj,  transition = 'encaminhar')
- api.content.transition(obj = child,transition = 'encaminhar')
+ api.content.transition(obj=obj, transition='encaminhar')
+ api.content.transition(obj=child, transition='encaminhar')
 
  return self._back_to_admin(u'Mensagem encaminhada!')
 
  @button.buttonAndHandler(u'Descartar')
-
  def handleCancel(self, action):
 
  return self._back_to_admin(u'Mensagem descartada')
@@ -162,9 +159,9 @@ def assunto(self):
  # fazer busca e retornar assunto da msg
 
  catalog = api.portal.get_tool(name='portal_catalog')
- brain  = catalog.searchResults(UID=self.uids)
+ brain = catalog.searchResults(UID=self.uids)
 
  if brain:
- form  = brain[0].getObject()
+ form = brain[0].getObject()
  mensagem = form.getAssunto()
  return mensagem