annabunches/hrafn
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More adjustments to the regular expressions - hopefully they catch all the correct characters now.

Browse Source
This commit is contained in:
Anna 2010-06-02 10:39:14 -04:00
parent 124a7411e2
commit 4a31261482
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
twitterwidgets.py
View File

@ -472,10 +472,10 @@ class TweetBox(gtk.HBox):
new_text = re.sub(r'"([^;]*?)( |$)', r'"\1\2', new_text) new_text = re.sub(r'"([^;]*?)( |$)', r'"\1\2', new_text)
if gtk.gtk_version[0] > 2 or (gtk.gtk_version[0] == 2 and gtk.gtk_version[1] >= 18): if gtk.gtk_version[0] > 2 or (gtk.gtk_version[0] == 2 and gtk.gtk_version[1] >= 18):
# Make URLs into links # Make URLs into links
new_text = re.sub(r"(http://.*?)([^0-9a-zA-Z.~/_?&-]|$)", r'<a href="\1">\1</a>\2', new_text) new_text = re.sub(r"(http://.*?)([^0-9a-zA-Z.~/_?=&-]|$)", r'<a href="\1">\1</a>\2', new_text)
# Make @ or # refs into links, to be used internally # Make @ or # refs into links, to be used internally
new_text = re.sub(r'@(.*?)([^0-9a-zA-Z\'_]|$)', self._make_user_link, new_text) new_text = re.sub(r'@(.*?)([^0-9a-zA-Z_]|$)', self._make_user_link, new_text)
new_text = re.sub(r'#(.*?)([^0-9a-zA-Z\'_-]|$)', self._make_hashtag_link, new_text) new_text = re.sub(r'#(.*?)([ ;,.:]|$)', self._make_hashtag_link, new_text)
self.text.set_markup(new_text) self.text.set_markup(new_text)
# If this is in reply to something, set appropriate label # If this is in reply to something, set appropriate label