Skip to content

Commit

Permalink
Fix code analysis
Browse files Browse the repository at this point in the history
  • Loading branch information
@hvelarde
hvelarde committed Jan 29, 2018
1 parent c41be11 commit 66acd47
Show file tree
Hide file tree
Showing 8 changed files with 50 additions and 61 deletions.
13 changes: 7 additions & 6 deletions src/brasil/gov/vcge/at/extender.py
View file
Expand Up @@ -31,12 +31,13 @@ class VCGEExtender(object):
layer = IVCGEInstalado

fields = [
ExtensionLinesField('skos',
schemata='categorization',
vocabulary_factory='brasil.gov.vcge',
enforceVocabulary=True,
widget=AcMSW(label=_(u'VCGE'),
description=_(u'vcge_desc'),))
ExtensionLinesField(
'skos',
schemata='categorization',
vocabulary_factory='brasil.gov.vcge',
enforceVocabulary=True,
widget=AcMSW(label=_(u'VCGE'), description=_(u'vcge_desc')),
),
]

def __init__(self, context):
Expand Down
2 changes: 1 addition & 1 deletion src/brasil/gov/vcge/browser/viewlets.py
View file
Expand Up @@ -38,7 +38,7 @@ def skos(self):
'title': title,
'url': '{0}/@@search?{1}'.format(
self.nav_root_url,
params
params,
)})
return skos

Expand Down
25 changes: 11 additions & 14 deletions src/brasil/gov/vcge/dx/widget.py
View file
Expand Up @@ -76,21 +76,18 @@ def js(self):
context = self.context
form_url = context.absolute_url()
js_callback = self.js_callback_template.format(
**dict(id=self.id, name=self.name)
)
id=self.id, name=self.name)
return self.js_template.format(
**dict(
id=self.id,
name=self.name,
url=form_url,
minChars=self.minChars,
maxResults=self.maxResults,
mustMatch=str(self.mustMatch).lower(),
matchContains=str(self.matchContains).lower(),
formatItem=self.formatItem,
formatResult=self.formatResult,
js_callback=js_callback,
)
id=self.id,
name=self.name,
url=form_url,
minChars=self.minChars,
maxResults=self.maxResults,
mustMatch=str(self.mustMatch).lower(),
matchContains=str(self.matchContains).lower(),
formatItem=self.formatItem,
formatResult=self.formatResult,
js_callback=js_callback,
)

def vocab(self):
Expand Down
10 changes: 5 additions & 5 deletions src/brasil/gov/vcge/tests/test_behavior.py
View file
Expand Up @@ -69,10 +69,10 @@ def setUpContent(self):
o = api.content.create(
type=DEXTERITY_FTI_FOLDER,
container=portal,
id='content'
id='content',
)
i = IVCGE(o)
i.skos = [token, ]
i.skos = [token]
self.content = o

def setUp(self):
Expand All @@ -88,7 +88,7 @@ def setUp(self):
api.content.create(
type=DEXTERITY_FTI_FOLDER,
container=self.portal,
id='folder'
id='folder',
)
self.setUpContent()

Expand All @@ -99,7 +99,7 @@ def test_behavior_applied(self):

def test_content_information(self):
content = self.content
self.assertEqual(content.skos, [self.token, ])
self.assertEqual(content.skos, [self.token])


class TestViewlet(unittest.TestCase):
Expand All @@ -119,7 +119,7 @@ def setUpContent(self):
container=portal,
id='content',
)
o.skos = [token, ]
o.skos = [token]
self.content = o

def setUp(self):
Expand Down
30 changes: 12 additions & 18 deletions src/brasil/gov/vcge/tests/test_contentrules_action.py
View file
Expand Up @@ -39,23 +39,23 @@ def setUp(self):
self.folder = api.content.create(
type='Folder',
container=self.portal,
id='folder'
id='folder',
)
self.folder.skos = [self.term, ]
self.folder.skos = [self.term]
self.folder.reindexObject()

self.sub_folder = api.content.create(
type='Folder',
container=self.folder,
id='sub_folder'
id='sub_folder',
)

self.document = api.content.create(
type='Document',
container=self.folder,
id='a_document'
id='a_document',
)
self.document.setSubject(['Bar', ])
self.document.setSubject(['Bar'])
self.document.reindexObject()

o = PortalContent('cmf', 'CMF Content', '', '', '')
Expand Down Expand Up @@ -86,12 +86,12 @@ def test_invoke_add_view(self):
name=element.addview)

addview.createAndAdd(data={'same_as_parent': False,
'skos': [self.term, ]})
'skos': [self.term]})

e = rule.actions[0]
self.assertTrue(isinstance(e, VCGEAction))
self.assertEqual(False, e.same_as_parent)
self.assertEqual([self.term, ], e.skos)
self.assertEqual([self.term], e.skos)

def test_invoke_edit_view(self):
element = getUtility(IRuleAction,
Expand All @@ -104,26 +104,20 @@ def test_invoke_edit_view(self):
def test_summary_parent_vcge(self):
e = VCGEAction()
e.same_as_parent = True
self.assertEqual(
e.summary,
u'Aplica termos da pasta no conteúdo.'
)
self.assertEqual(e.summary, u'Aplica termos da pasta no conteúdo.')

def test_summary_with_vcge(self):
from plone.app.contentrules import PloneMessageFactory as _
e = VCGEAction()
e.skos = [self.term, ]
e.skos = [self.term]
msg = _(u'Aplica os termos ${skos}',
mapping=dict(skos=' or '.join(e.skos)))
self.assertEqual(
e.summary,
msg
)
self.assertEqual(e.summary, msg)

def test_execute_with_vcge(self):
e = VCGEAction()
e.same_as_parent = False
e.skos = ['http://vocab.e.gov.br/2011/03/vcge#governo', ]
e.skos = ['http://vocab.e.gov.br/2011/03/vcge#governo']

ex = getMultiAdapter((self.folder, e,
DummyEvent(self.sub_folder)),
Expand All @@ -147,7 +141,7 @@ def test_execute_same_as_parent(self):
def test_execute_object_without_vcge(self):
e = VCGEAction()
e.same_as_parent = False
e.skos = ['http://vocab.e.gov.br/2011/03/vcge#governo', ]
e.skos = ['http://vocab.e.gov.br/2011/03/vcge#governo']
o = self.folder['cmf']
ex = getMultiAdapter((self.folder, e,
DummyEvent(o)),
Expand Down
23 changes: 10 additions & 13 deletions src/brasil/gov/vcge/tests/test_contentrules_condition.py
View file
Expand Up @@ -38,16 +38,16 @@ def setUp(self):
self.folder = api.content.create(
type='Folder',
container=self.portal,
id='folder'
id='folder',
)
self.folder.skos = [self.term, ]
self.folder.skos = [self.term]

self.sub_folder = api.content.create(
type='Folder',
container=self.folder,
id='sub_folder'
id='sub_folder',
)
self.sub_folder.skos = ['http://vocab.e.gov.br/2011/03/vcge#governo', ]
self.sub_folder.skos = ['http://vocab.e.gov.br/2011/03/vcge#governo']
o = PortalContent('cmf', 'CMF Content', '', '', '')
self.folder._setObject('cmf', o, suppress_events=True)

Expand All @@ -71,11 +71,11 @@ def test_invoke_add_view(self):
addview = getMultiAdapter((adding, self.portal.REQUEST),
name=element.addview)

addview.createAndAdd(data={'skos': [self.term, ]})
addview.createAndAdd(data={'skos': [self.term]})

e = rule.conditions[0]
self.assertTrue(isinstance(e, VCGECondition))
self.assertEqual([self.term, ], e.skos)
self.assertEqual([self.term], e.skos)

def test_invoke_edit_view(self):
element = getUtility(IRuleCondition,
Expand All @@ -92,17 +92,14 @@ def test_summary_empty_vcge(self):
def test_summary_with_vcge(self):
from plone.app.contentrules import PloneMessageFactory as _
e = VCGECondition()
e.skos = [self.term, ]
e.skos = [self.term]
msg = _(u'VCGE contém ${skos}',
mapping=dict(skos=' or '.join(e.skos)))
self.assertEqual(
e.summary,
msg
)
self.assertEqual(e.summary, msg)

def test_execute(self):
e = VCGECondition()
e.skos = [self.term, ]
e.skos = [self.term]

ex = getMultiAdapter((self.portal, e, DummyEvent(self.folder)),
IExecutable)
Expand Down Expand Up @@ -132,7 +129,7 @@ def test_execute_empty(self):

def test_execute_object_without_vcge(self):
e = VCGECondition()
e.skos = [self.term, ]
e.skos = [self.term]

ex = getMultiAdapter((self.folder, e,
DummyEvent(self.folder['cmf'])),
Expand Down
4 changes: 2 additions & 2 deletions src/brasil/gov/vcge/tests/test_setup.py
View file
Expand Up @@ -44,13 +44,13 @@ def test_installed(self):
'{0} not installed'.format(PROJECTNAME))

def test_dependencies_installed(self):
for product in ['raptus.autocompletewidget', ]:
for product in ['raptus.autocompletewidget']:
self.assertTrue(self.qi.isProductInstalled(product),
'{0} not installed'.format(product))

@unittest.skipIf(not HAS_DEXTERITY, '"dexterity" extra not included')
def test_dx_dependencies_installed(self):
for product in ['plone.app.dexterity', ]:
for product in ['plone.app.dexterity']:
self.assertTrue(self.qi.isProductInstalled(product),
'{0} not installed'.format(product))

Expand Down
4 changes: 2 additions & 2 deletions src/brasil/gov/vcge/tests/test_viewlet.py
View file
Expand Up @@ -26,9 +26,9 @@ def setUpContent(self):
o = api.content.create(
type='Document',
container=portal,
id='doc'
id='doc',
)
o.Schema().getField('skos').set(o, [token, ])
o.Schema().getField('skos').set(o, [token])
self.content = o

def setUp(self):
Expand Down

0 comments on commit 66acd47

Please sign in to comment.