senselab/codekasten
4
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

improve link detection (enclosed in braces)

Browse source
This commit is contained in:
lars 2010-05-10 09:13:39 +00:00
parent a445d1f6cd
commit c6fe7356bf
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
wortschlucker/src/wortschlucker.py
View file

@ -81,7 +81,7 @@ class ContentSubmission(sqlobject.SQLObject):
short_name = url.split("/")[2] short_name = url.split("/")[2]
return """%s<a href="%s">%s</a>%s""" % (prefix, url, short_name, suffix) return """%s<a href="%s">%s</a>%s""" % (prefix, url, short_name, suffix)
# surround all urls with html markup # surround all urls with html markup
mark_links = re.sub(r"(\A|\s)(https?://[\w/\?\.\#=;,]*)(\s|\Z)", get_link_markup, self.content) mark_links = re.sub(r"(\A|\s|\()(https?://[\w/\?\.\#=;,_\-]*)(\)|\s|\Z)", get_link_markup, self.content)
markup = genshi.input.HTML(mark_links) | genshi.filters.HTMLSanitizer() markup = genshi.input.HTML(mark_links) | genshi.filters.HTMLSanitizer()
# the markup is now marked as "safe" -> genshi will output it literally # the markup is now marked as "safe" -> genshi will output it literally
return markup return markup
@ -596,6 +596,7 @@ def render_poll_admin(poll, add_related, del_related):
return render("poll_admin_details.html", **value_dict) return render("poll_admin_details.html", **value_dict)
@bobo.query('/:poll_hash') @bobo.query('/:poll_hash')
@bobo.query('/:poll_hash/')
def show_one_poll(poll_hash=None, add_related=None, del_related=None): def show_one_poll(poll_hash=None, add_related=None, del_related=None):
value_dict = get_default_values() value_dict = get_default_values()
poll_id = get_poll_id(poll_hash) poll_id = get_poll_id(poll_hash)