From c6fe7356bfc5ab187e5bcae2580ad8adda3780d4 Mon Sep 17 00:00:00 2001 From: lars Date: Mon, 10 May 2010 09:13:39 +0000 Subject: [PATCH] improve link detection (enclosed in braces) --- wortschlucker/src/wortschlucker.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wortschlucker/src/wortschlucker.py b/wortschlucker/src/wortschlucker.py index accac48..dd41d87 100755 --- a/wortschlucker/src/wortschlucker.py +++ b/wortschlucker/src/wortschlucker.py @@ -81,7 +81,7 @@ class ContentSubmission(sqlobject.SQLObject): short_name = url.split("/")[2] return """%s%s%s""" % (prefix, url, short_name, suffix) # 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() # the markup is now marked as "safe" -> genshi will output it literally return markup @@ -596,6 +596,7 @@ def render_poll_admin(poll, add_related, del_related): return render("poll_admin_details.html", **value_dict) @bobo.query('/:poll_hash') +@bobo.query('/:poll_hash/') def show_one_poll(poll_hash=None, add_related=None, del_related=None): value_dict = get_default_values() poll_id = get_poll_id(poll_hash)