From 09894873b358904e4639eaf11f84cf6011de5030 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Thu, 19 Jan 2012 15:50:09 -0800 Subject: Handle URLs wrapped with quotes in changelog messages. The quotes are not part of the URL. Signed-off-by: Robin H. Johnson --- web/lib/changelog_formatter.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/lib/changelog_formatter.py b/web/lib/changelog_formatter.py index 76a6661..35dc5d7 100644 --- a/web/lib/changelog_formatter.py +++ b/web/lib/changelog_formatter.py @@ -47,8 +47,8 @@ re_email2 = re.compile(r'([^@ ]+)@gentoo.org') re_file = re.compile(r'([\+-]?)(\S+)([:,]|[:,]$)') re_bugid = re.compile(r'([Bb][uU][gG]\s+?#?)(\d+)') re_url_base = '(https?://[^\s/)>]+(?:/[\S]+)?)' -re_url = re.compile("([\s<(]*)"+re_url_base+"([\s>)]+?.?|$)?") -re_url_notend = re.compile(r'[\s.)>]+$') +re_url = re.compile("([\s<(]*)"+re_url_base+"([\s>)\"']+?.?|$)?") +re_url_notend = re.compile(r'[\s.)>\'"]+$') def _pretty_changelog_pass1(cat, pn, changelog): """Changelog prettification, pass1: replace text with markers""" -- cgit v1.2.3-65-gdbad