Changeset 9852

Show
Ignore:
Timestamp:
06/27/08 12:50:09 (5 months ago)
Author:
jim++
Message:

[erlehmann] Fixed regular URL matching expressions for "-".

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/src/gajim.py

    r9848 r9852  
    22662266 
    22672267                #FIXME: recognize xmpp: and treat it specially 
    2268  
    2269                 links = r"((?<=\()[A-Za-z][A-Za-z0-9+.-]*:"\ 
    2270                         r"([A-Za-z0-9+\.-_~:/\?#\[\]@!\$&'\(\)\*\+,;=]|%[A-Fa-f0-9]{2})+"\ 
    2271                         r"(?=\)))|([A-Za-z][A-Za-z0-9+.-]*:([A-Za-z0-9+\.-_~:/\?#\[\]@!\$&'\(\)\*\+,;=]|%[A-Fa-f0-9]{2})+)" 
     2268                links = r"((?<=\()[A-Za-z][A-Za-z0-9\+\.\-]*:"\ 
     2269                        r"([A-Za-z0-9\.\-_~:/\?#\[\]@!\$&'\(\)\*\+,;=]|%[A-Fa-f0-9]{2})+"\ 
     2270                        r"(?=\)))|([A-Za-z][A-Za-z0-9\+\.\-]*:([A-Za-z0-9\.\-_~:/\?#\[\]@!\$&'\(\)\*\+,;=]|%[A-Fa-f0-9]{2})+)" 
     2271 
    22722272                #2nd one: at_least_one_char@at_least_one_char.at_least_one_char 
    22732273                mail = r'\bmailto:\S*[^\s\W]|' r'\b\S+@\S+\.\S*[^\s\W]'