Django

Code

Show
Ignore:
Timestamp:
08/05/08 12:15:33 (5 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7978 to /django/trunk:1-8214

  • django/branches/gis/django/utils/html.py

    r7768 r8215  
    9595    nofollow_attr = nofollow and ' rel="nofollow"' or '' 
    9696    for i, word in enumerate(words): 
    97         match = punctuation_re.match(word) 
     97        match = None 
     98        if '.' in word or '@' in word or ':' in word: 
     99            match = punctuation_re.match(word) 
    98100        if match: 
    99101            lead, middle, trail = match.groups() 
    …… 
    103105                url = urlquote(middle, safe='/&=:;#?+*') 
    104106            elif middle.startswith('www.') or ('@' not in middle and \ 
    105                     len(middle) > 0 and middle[0] in string.ascii_letters + string.digits and \ 
     107                    middle and middle[0] in string.ascii_letters + string.digits and \ 
    106108                    (middle.endswith('.org') or middle.endswith('.net') or middle.endswith('.com'))): 
    107109                url = urlquote('http://%s' % middle, safe='/&=:;#?+*')