Changeset 9898 for trunk/src/gajim.py

Show
Ignore:
Timestamp:
07/08/08 20:49:51 (5 months ago)
Author:
steve-e
Message:

[Florob] Improved URL matching.

We don't match all valid URIs like blub:blaa but include common used (non)-urls like www.google.de

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/src/gajim.py

    r9894 r9898  
    22752275                # so http://be) will match http://be and http://be)be) will match http://be)be 
    22762276 
    2277                 prefixes = '|'.join((r'http://', r'https://', r'gopher://', r'news://', 
    2278                         r'ftp://', r'ed2k://', r'irc://', r'magnet:', r'sip:', r'www\.', 
    2279                         r'ftp\.')) 
     2277                legacy_prefixes = r"((?<=\()(www|ftp)\.([A-Za-z0-9\.\-_~:/\?#\[\]@!\$&'\(\)\*\+,;=]|%[A-Fa-f0-9]{2})+(?=\)))"\ 
     2278                                r"|((www|ftp)\.([A-Za-z0-9\.\-_~:/\?#\[\]@!\$&'\(\)\*\+,;=]|%[A-Fa-f0-9]{2})+"\ 
     2279                                r"\.([A-Za-z0-9\.\-_~:/\?#\[\]@!\$&'\(\)\*\+,;=]|%[A-Fa-f0-9]{2})+)" 
    22802280                # NOTE: it's ok to catch www.gr such stuff exist! 
    22812281 
    … …  
    22962296                latex = r'|\$\$[^$\\]*?([\]\[0-9A-Za-z()|+*/-]|[\\][\]\[0-9A-Za-z()|{}$])(.*?[^\\])?\$\$' 
    22972297 
    2298                 basic_pattern = links + '|' + mail 
     2298                basic_pattern = links + '|' + mail + '|' + legacy_prefixes 
    22992299 
    23002300                if gajim.config.get('use_latex'):