Permalink
Browse files

Fixed #6965 -- Sped up the urlize and urlizetrunc filters. A nice pat…

…ch from Andrew Badr.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7985 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 67eeb72 commit c09351aec63f004f89befa4752b386f2a2a3a63c @malcolmt malcolmt committed Jul 19, 2008
Showing with 4 additions and 2 deletions.
  1. +4 −2 django/utils/html.py
View
@@ -94,15 +94,17 @@ def urlize(text, trim_url_limit=None, nofollow=False, autoescape=False):
words = word_split_re.split(force_unicode(text))
nofollow_attr = nofollow and ' rel="nofollow"' or ''
for i, word in enumerate(words):
- match = punctuation_re.match(word)
+ match = None
+ if '.' in word or '@' in word or ':' in word:
+ match = punctuation_re.match(word)
if match:
lead, middle, trail = match.groups()
# Make URL we want to point to.
url = None
if middle.startswith('http://') or middle.startswith('https://'):
url = urlquote(middle, safe='/&=:;#?+*')
elif middle.startswith('www.') or ('@' not in middle and \
- len(middle) > 0 and middle[0] in string.ascii_letters + string.digits and \
+ middle and middle[0] in string.ascii_letters + string.digits and \
(middle.endswith('.org') or middle.endswith('.net') or middle.endswith('.com'))):
url = urlquote('http://%s' % middle, safe='/&=:;#?+*')
elif '@' in middle and not ':' in middle and simple_email_re.match(middle):

0 comments on commit c09351a

Please sign in to comment.