heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove tag delimiter configurability (#390), fixed pep-8 compliance

Browse Source 
Hardcode commas as tag delimiters per discussion in issue 390. Also
improved PEP-8'ness of the file while touching. Includes some improvements
suggested by gandaro.

Reviewed-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
This commit is contained in:
dunkyp 2012-11-06 13:32:48 +00:00 committed by Sebastian Spaeth
parent ee62c51d79
commit 36c7d93481
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mediagoblin/tools/text.py
View File

@ -38,13 +38,12 @@ HTML_CLEANER = Cleaner(
allow_tags=[ allow_tags=[
'div', 'b', 'i', 'em', 'strong', 'p', 'ul', 'ol', 'li', 'a', 'br', 'div', 'b', 'i', 'em', 'strong', 'p', 'ul', 'ol', 'li', 'a', 'br',
'pre', 'code'], 'pre', 'code'],
remove_unknown_tags=False, # can't be used with allow_tags remove_unknown_tags=False, # can't be used with allow_tags
safe_attrs_only=True, safe_attrs_only=True,
add_nofollow=True, # for now add_nofollow=True, # for now
host_whitelist=(), host_whitelist=(),
whitelist_tags=set([])) whitelist_tags=set([]))
TAGS_DELIMITER=',';
def clean_html(html): def clean_html(html):
# clean_html barfs on an empty string # clean_html barfs on an empty string
@ -68,8 +67,7 @@ def convert_to_tag_list_of_dicts(tag_string):
stripped_tag_string = u' '.join(tag_string.strip().split()) stripped_tag_string = u' '.join(tag_string.strip().split())
# Split the tag string into a list of tags # Split the tag string into a list of tags
for tag in stripped_tag_string.split( for tag in stripped_tag_string.split(','):
TAGS_DELIMITER):
# Ignore empty or duplicate tags # Ignore empty or duplicate tags
if tag.strip() and tag.strip() not in [t['name'] for t in taglist]: if tag.strip() and tag.strip() not in [t['name'] for t in taglist]:
@ -87,8 +85,9 @@ def media_tags_as_string(media_entry_tags):
""" """
media_tag_string = '' media_tag_string = ''
if media_entry_tags: if media_entry_tags:
media_tag_string = (TAGS_DELIMITER+u' ').join( media_tag_string = u', '.join(
[tag['name'] for tag in media_entry_tags]) [tag['name']
for tag in media_entry_tags])
return media_tag_string return media_tag_string
@ -107,7 +106,7 @@ def tag_length_validator(form, field):
if too_long_tags: if too_long_tags:
raise wtforms.ValidationError( raise wtforms.ValidationError(
TOO_LONG_TAG_WARNING % (mg_globals.app_config['tags_max_length'], \ TOO_LONG_TAG_WARNING % (mg_globals.app_config['tags_max_length'],
', '.join(too_long_tags))) ', '.join(too_long_tags)))