Skip to content

Commit 8627b21

Browse files
ktaraszktarasz
committed
fix pep8
1 parent 6dd8b1a commit 8627b21

18 files changed

+203
-206
lines changed

‎quintagroup/seoptimizer/Extensions/Install.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def install(portal, reinstall=False):
2121
if reinstall:
2222
step = None
2323
profile_id = 'quintagroup.seoptimizer:default'
24-
steps_to_run = [s['id'] for s in \
24+
steps_to_run = [s['id'] for s in
2525
setup_tool.listUpgrades(profile_id, show_old=False)]
2626
for step_id in steps_to_run:
2727
step = _upgrade_registry.getUpgradeStep(profile_id, step_id)

‎quintagroup/seoptimizer/browser/keywords.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def validateKeywords(self):
3333
enc = getSiteEncoding(self.context)
3434
if text.lower().strip():
3535
keywords = filter(None, map(lambda x: safe_unicode(x.strip(), enc),
36-
text.lower().strip().split('\n')))
36+
text.lower().strip().split('\n')))
3737
else:
3838
return ts.utranslate(domain='quintagroup.seoptimizer',
3939
msgid=_(u'Keywords list is empty!'),
@@ -81,6 +81,6 @@ def validateKeywords(self):
8181
return ts.utranslate(domain='quintagroup.seoptimizer',
8282
msgid=_(u'number_keywords',
8383
default=u'Number of keywords at page:\n'
84-
'${result}',
84+
'${result}',
8585
mapping={'result': '\n'.join(result)}),
8686
context=self.context)

‎quintagroup/seoptimizer/browser/seo_configlet.py

+12-12
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class ISEOConfigletBaseSchema(Interface):
3030

3131
exposeDCMetaTags = Bool(
3232
title=_("label_exposeDCMetaTags",
33-
default='Expose <abbr title="Dublin Core">DC</abbr> ' \
33+
default='Expose <abbr title="Dublin Core">DC</abbr> '
3434
'meta tags'),
3535
description=_("description_seo_dc_metatags",
3636
default='Controls if <abbr title="Dublin Core">DC</abbr>'
@@ -52,8 +52,8 @@ class ISEOConfigletBaseSchema(Interface):
5252
types_seo_enabled = Tuple(
5353
title=_("label_content_type_title", default='Content Types'),
5454
description=_("description_seo_content_types",
55-
default='Select content types that will have SEO properties '
56-
'enabled.'),
55+
default='Select content types that will have SEO '
56+
'properties enabled.'),
5757
required=False,
5858
missing_value=tuple(),
5959
value_type=Choice(
@@ -63,8 +63,8 @@ class ISEOConfigletBaseSchema(Interface):
6363
title=_("label_default_custom_metatags",
6464
default='Default custom metatags.'),
6565
description=_("help_default_custom_metatags",
66-
default='Fill in custom metatag names (one per line) ' \
67-
'which will appear on qseo_properties edit tab. ' \
66+
default='Fill in custom metatag names (one per line) '
67+
'which will appear on qseo_properties edit tab. '
6868
'Example: "metaname|metacontent" or "metaname".'),
6969
required=False)
7070

@@ -73,8 +73,8 @@ class ISEOConfigletAdvancedSchema(Interface):
7373
custom_script = SourceText(
7474
title=_("label_custom_script", default=u'Header JavaScript'),
7575
description=_("help_custom_script",
76-
default=u"This JavaScript code will be included in "
77-
"the rendered HTML as entered in the page header."),
76+
default=u"This JavaScript code will be included in "
77+
"the rendered HTML as entered in the page header."),
7878
default=u'',
7979
required=False)
8080

@@ -97,10 +97,10 @@ class ISEOConfigletAdvancedSchema(Interface):
9797
title=_("label_external_keywords_test",
9898
default='External keywords check'),
9999
description=_("description_external_keywords_test",
100-
default='Make keywords test by opening context url as '
101-
'external resource with urllib2.openurl(). This is '
102-
'useful when xdv/Deliverance transformation is used '
103-
'on the site.'),
100+
default='Make keywords test by opening context url as '
101+
'external resource with urllib2.openurl(). This is '
102+
'useful when xdv/Deliverance transformation is used '
103+
'on the site.'),
104104
default=False,
105105
required=False)
106106

@@ -173,7 +173,7 @@ def _toFieldValue(self, input):
173173

174174
def _toFormValue(self, value):
175175
if value == self.context.missing_value or \
176-
value == self.context._type():
176+
value == self.context._type():
177177
return self._missing
178178
else:
179179
return u'\r\n'.join(list(value))

‎quintagroup/seoptimizer/browser/viewlets.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def render(self):
3131
TEMPLATE = '<meta name="%s" content="%s"/>'
3232
enc = getSiteEncoding(self.context)
3333
sfuncd = lambda x, enc=enc: safe_unicode(x, enc)
34-
return u'\n'.join([TEMPLATE % tuple(map(sfuncd, (k, v))) \
34+
return u'\n'.join([TEMPLATE % tuple(map(sfuncd, (k, v)))
3535
for k, v in self.listMetaTags().items()])
3636

3737
def listMetaTags(self):
@@ -47,7 +47,7 @@ def listMetaTags(self):
4747
use_all = seo_global.exposeDCMetaTags
4848
adapter = IMappingMetaTags(self.context, None)
4949
mapping_metadata = adapter and adapter.getMappingMetaTags() \
50-
or SortedDict()
50+
or SortedDict()
5151

5252
if not use_all:
5353
metadata_names = 'DC.description' in mapping_metadata and \
@@ -97,10 +97,10 @@ def listMetaTags(self):
9797

9898
# Special cases
9999
if accessor == 'Description' and \
100-
not 'description' in metadata_names:
100+
not 'description' in metadata_names:
101101
result['description'] = escape(value)
102102
elif accessor == 'Subject' and \
103-
not 'keywords' in metadata_names:
103+
not 'keywords' in metadata_names:
104104
result['keywords'] = escape(value)
105105

106106
if accessor not in ('Description', 'Subject'):
@@ -129,8 +129,8 @@ def listMetaTags(self):
129129

130130
# Filter out DWIMish artifacts on effective / expiration dates
131131
if effective is not None and \
132-
effective > FLOOR_DATE and \
133-
effective != created:
132+
effective > FLOOR_DATE and \
133+
effective != created:
134134
eff_str = effective.Date()
135135
else:
136136
eff_str = ''
@@ -146,7 +146,7 @@ def listMetaTags(self):
146146
# add custom meta tags (added from qseo tab by user)
147147
# for given context and default from configlet
148148
custom_meta_tags = seo_context and \
149-
seo_context['seo_customMetaTags'] or []
149+
seo_context['seo_customMetaTags'] or []
150150
for tag in custom_meta_tags:
151151
if tag['meta_content']:
152152
result[tag['meta_name']] = escape(tag['meta_content'])
@@ -164,7 +164,7 @@ def update(self):
164164
self.context_state = getMultiAdapter((self.context, self.request),
165165
name=u'plone_context_state')
166166
self.seo_context = getMultiAdapter((self.context, self.request),
167-
name=u'seo_context')
167+
name=u'seo_context')
168168

169169
self.override_title = self.seo_context['has_seo_title']
170170
self.has_comments = self.seo_context['has_html_comment']

‎quintagroup/seoptimizer/browser/views.py

+23-23
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
from quintagroup.canonicalpath.interfaces import ICanonicalLink
1515
from quintagroup.canonicalpath.adapters import PROPERTY_LINK \
16-
as CANONICAL_PROPERTY
16+
as CANONICAL_PROPERTY
1717

1818
from quintagroup.seoptimizer.browser.seo_configlet import ISEOConfigletSchema
1919
from quintagroup.seoptimizer import SeoptimizerMessageFactory as _
@@ -62,23 +62,23 @@ def _getSEOTags(self):
6262
"seo_html_comment": self.getSEOProperty('qSEO_html_comment',
6363
default=''),
6464
"seo_noframes": self.getSEOProperty('qSEO_noframes',
65-
default=''),
65+
default=''),
6666
"meta_keywords": self.getSEOProperty('qSEO_keywords',
6767
'Subject', ()),
6868
"seo_keywords": self.getSEOProperty('qSEO_keywords', default=()),
6969
"seo_canonical": self.getSEOProperty(CANONICAL_PROPERTY),
7070
# Add test properties
7171
"has_seo_title": self.context.hasProperty('qSEO_title'),
7272
"has_seo_robots": self.context.hasProperty('qSEO_robots'),
73-
"has_seo_description": \
74-
self.context.hasProperty('qSEO_description'),
75-
"has_seo_distribution": \
76-
self.context.hasProperty('qSEO_distribution'),
73+
"has_seo_description":
74+
self.context.hasProperty('qSEO_description'),
75+
"has_seo_distribution":
76+
self.context.hasProperty('qSEO_distribution'),
7777
"has_html_comment": self.context.hasProperty('qSEO_html_comment'),
7878
"has_noframes": self.context.hasProperty('qSEO_noframes'),
7979
"has_seo_keywords": self.context.hasProperty('qSEO_keywords'),
8080
"has_seo_canonical": self.context.hasProperty(CANONICAL_PROPERTY),
81-
}
81+
}
8282
#seotags["seo_nonEmptylocalMetaTags"] = \
8383
# bool(seotags["seo_localCustomMetaTags"])
8484
return seotags
@@ -116,8 +116,8 @@ def seo_customMetaTags(self):
116116
lnames = set(map(lambda x: x['meta_name'], loc))
117117
# Get untouch global, override global in custom
118118
# and new custom meta tags
119-
untouchglob = [t for t in glob \
120-
if t['meta_name'] in list(gnames - lnames)]
119+
untouchglob = [t for t in glob
120+
if t['meta_name'] in list(gnames - lnames)]
121121
return untouchglob + loc
122122

123123
def seo_globalWithoutLocalCustomMetaTags(self):
@@ -140,7 +140,7 @@ def seo_localCustomMetaTags(self):
140140
context = aq_inner(self.context)
141141
for property, value in context.propertyItems():
142142
if property.startswith(property_prefix) and \
143-
property[len(property_prefix):]:
143+
property[len(property_prefix):]:
144144
result.append({'meta_name': property[len(property_prefix):],
145145
'meta_content': value})
146146
return result
@@ -156,8 +156,8 @@ def seo_globalCustomMetaTags(self):
156156
name_value = tag.split(SEPERATOR)
157157
if name_value[0]:
158158
result.append({'meta_name': name_value[0],
159-
'meta_content': len(name_value) == 2 and \
160-
name_value[1] or ''})
159+
'meta_content': len(name_value) == 2 and
160+
name_value[1] or ''})
161161
return result
162162

163163
# Not used
@@ -211,8 +211,8 @@ def manageSEOProps(self, **kw):
211211
context = aq_inner(self.context)
212212
state = ''
213213
delete_list, seo_overrides_keys, seo_keys = [], [], []
214-
seo_items = dict([(k[len(SEO_PREFIX):], v) \
215-
for k, v in kw.items() if k.startswith(SEO_PREFIX)])
214+
seo_items = dict([(k[len(SEO_PREFIX):], v)
215+
for k, v in kw.items() if k.startswith(SEO_PREFIX)])
216216
for key in seo_items.keys():
217217
if key.endswith(SUFFIX):
218218
seo_overrides_keys.append(key[:-len(SUFFIX)])
@@ -223,7 +223,7 @@ def manageSEOProps(self, **kw):
223223
self.manageSEOCustomMetaTagsProperties(**kw)
224224
else:
225225
if seo_key in seo_overrides_keys and \
226-
seo_items.get(seo_key + SUFFIX):
226+
seo_items.get(seo_key + SUFFIX):
227227
seo_value = seo_items[seo_key]
228228
if seo_key == 'canonical':
229229
try:
@@ -233,8 +233,8 @@ def manageSEOProps(self, **kw):
233233
state = "'%s' - wrong canonical url" % str(e)
234234
else:
235235
t_value = 'string'
236-
if type(seo_value) == type([]) or \
237-
type(seo_value) == type(()):
236+
if isinstance(seo_value, list) or \
237+
isinstance(seo_value, tuple):
238238
t_value = 'lines'
239239
state = self.setProperty(PROP_PREFIX + seo_key,
240240
seo_value, type=t_value)
@@ -263,7 +263,7 @@ def delAllSEOCustomMetaTagsProperties(self):
263263
delete_list = []
264264
for property, value in context.propertyItems():
265265
if property.startswith(PROP_CUSTOM_PREFIX) and \
266-
not property == PROP_CUSTOM_PREFIX:
266+
not property == PROP_CUSTOM_PREFIX:
267267
delete_list.append(property)
268268
if delete_list:
269269
context.manage_delProperties(delete_list)
@@ -279,13 +279,13 @@ def updateSEOCustomMetaTagsProperties(self, custommetatags):
279279
if name_value[0]:
280280
globalCustomMetaTags.append(
281281
{'meta_name': name_value[0],
282-
'meta_content': len(name_value) > 1 and \
283-
name_value[1] or ''})
282+
'meta_content': len(name_value) > 1 and
283+
name_value[1] or ''})
284284
for tag in custommetatags:
285285
meta_name, meta_content = tag['meta_name'], tag['meta_content']
286286
if meta_name:
287-
if not [gmt for gmt in globalCustomMetaTags \
288-
if (gmt['meta_name'] == meta_name and \
287+
if not [gmt for gmt in globalCustomMetaTags
288+
if (gmt['meta_name'] == meta_name and
289289
gmt['meta_content'] == meta_content)]:
290290
self.setProperty('%s%s' % (PROP_CUSTOM_PREFIX, meta_name),
291291
meta_content)
@@ -343,7 +343,7 @@ def __call__(self):
343343
msgtype = "error"
344344
else:
345345
# Cancel
346-
msg = _('seoproperties_canceled', default=u'No content SEO ' \
346+
msg = _('seoproperties_canceled', default=u'No content SEO '
347347
'properties have been changed.')
348348

349349
context.plone_utils.addPortalMessage(msg, msgtype)

‎quintagroup/seoptimizer/setuphandlers.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ def removeActions(site):
1414
"""
1515
types_tool = getToolByName(site, 'portal_types')
1616
for ptype in types_tool.objectValues():
17-
idxs = [idx_act[0] for idx_act in enumerate(ptype.listActions()) \
18-
if idx_act[1].id == 'seo_properties']
17+
idxs = [idx_act[0] for idx_act in enumerate(ptype.listActions())
18+
if idx_act[1].id == 'seo_properties']
1919
if idxs:
2020
ptype.deleteActions(idxs)
2121
msg_delete = "Deleted \"SEO Properties\" action for %s type."

‎quintagroup/seoptimizer/tests/testBugs.py

+14-14
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ def set_title(self, title='', title_override=0, comment='',
3333
request = portal.REQUEST
3434
view = portal.restrictedTraverse('@@plone')
3535
manager = getMultiAdapter((fp, request, view), IViewletManager,
36-
name=u'plone.htmlhead')
36+
name=u'plone.htmlhead')
3737

3838
directlyProvides(request, IPloneSEOLayer)
3939
viewlet = getMultiAdapter((fp, request, view, manager), IViewlet,
40-
name=u'plone.htmlhead.title')
40+
name=u'plone.htmlhead.title')
4141

4242
form_data = {'seo_title': title,
4343
'seo_title_override:int': title_override,
@@ -97,17 +97,17 @@ def test_bug_20_at_plone_org(self):
9797
view = portal.restrictedTraverse('@@plone')
9898

9999
manager = getMultiAdapter((fp, request, view), IViewletManager,
100-
name=u'plone.htmlhead')
100+
name=u'plone.htmlhead')
101101
viewlet = getMultiAdapter((fp, request, view, manager), IViewlet,
102-
name=u'plone.htmlhead.title')
102+
name=u'plone.htmlhead.title')
103103
viewlet.update()
104104
old_title = viewlet.render()
105105

106106
# add IPloneSEOLayer
107107
directlyProvides(request, IPloneSEOLayer)
108108

109109
viewlet = getMultiAdapter((fp, request, view, manager), IViewlet,
110-
name=u'plone.htmlhead.title')
110+
name=u'plone.htmlhead.title')
111111
viewlet.update()
112112
new_title = viewlet.render()
113113

@@ -193,8 +193,8 @@ def test_bug_custom_metatags_update(self):
193193
# with seo-context-properties view
194194
seo_context_props.updateSEOCustomMetaTagsProperties([])
195195
except IndexError:
196-
self.fail("Error in calculating of default tag value, when only "\
197-
"tag name set in default_custom_metatags property of "\
196+
self.fail("Error in calculating of default tag value, when only "
197+
"tag name set in default_custom_metatags property of "
198198
"the configlet.")
199199

200200

@@ -207,9 +207,9 @@ def afterSetUp(self):
207207
test_pswd = 'pswd'
208208
uf = self.portal.acl_users
209209
uf.userFolderAddUser(member_id, test_pswd,
210-
['Member'], [])
210+
['Member'], [])
211211
uf.userFolderAddUser(editor_id, test_pswd,
212-
['Member', 'Editor'], [])
212+
['Member', 'Editor'], [])
213213

214214
self.member_auth = '%s:%s' % (member_id, test_pswd)
215215
self.editor_auth = '%s:%s' % (editor_id, test_pswd)
@@ -229,9 +229,9 @@ def test_not_break(self):
229229

230230
def test_tab_visibility(self):
231231
"""Only Editor can view seo tab"""
232-
rexp = re.compile('<a\s+[^>]*' \
233-
'href="[a-zA-Z0-9\:\/_-]*/@@seo-context-properties"[^>]*>'\
234-
'\s*SEO Properties\s*</a>', re.I | re.S)
232+
rexp = re.compile('<a\s+[^>]*href="[a-zA-Z0-9\:\/_-]*'
233+
'/@@seo-context-properties"[^>]*>'
234+
'\s*SEO Properties\s*</a>', re.I | re.S)
235235
# Anonymous: NO SEO Properties link
236236
res = self.publish(path=self.portal_url).getBody()
237237
self.assertEqual(rexp.search(res), None)
@@ -250,12 +250,12 @@ def test_tab_access(self):
250250
# Anonymous: can NOT ACCESS
251251
headers = self.publish(path=test_url).headers
252252
self.assert_('Unauthorized' in headers.get('bobo-exception-type', ""),
253-
"No 'Unauthorized' exception rised for Anonymous on " \
253+
"No 'Unauthorized' exception rised for Anonymous on "
254254
"'@@seo-context-properties' view")
255255
# Member: can NOT ACCESS
256256
self.publish(path=test_url, basic=self.member_auth).headers
257257
self.assert_('Unauthorized' in headers.get('bobo-exception-type', ""),
258-
"No 'Unauthorized' exception rised for Member on " \
258+
"No 'Unauthorized' exception rised for Member on "
259259
"'@@seo-context-properties' view")
260260
# Editor: CAN Access
261261
res = self.publish(path=test_url, basic=self.editor_auth)

0 commit comments

Comments
 (0)