Merge branch 'xakz-extends-regexp-matching'

firecat53 · Nov 30, 2014 · 3d1255c · 3d1255c
2 parents b790eaa + 823bbf2
commit 3d1255c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/urlscan/urlscan.py b/urlscan/urlscan.py
@@ -243,8 +243,8 @@ def handle_entityref(self, name):
             # added above.
             self.handle_data('&%s;' % name)
 
-urlinternalpattern = r'[{}a-zA-Z/\-_0-9%?&.=:;+,#~]'
-urltrailingpattern = r'[{}a-zA-Z/\-_0-9%&=+#]'
+urlinternalpattern = r'[{}()@a-zA-Z/\-_0-9%?&.=:;+,#~]'
+urltrailingpattern = r'[{}()@a-zA-Z/\-_0-9%&=+#]'
 httpurlpattern = (r'(?:(https?|file)://' + urlinternalpattern +
                   r'*' + urltrailingpattern + r')')
 # Used to guess that blah.blah.blah.TLD is a URL.