Mercurial > p > roundup > code
diff roundup/cgi/templating.py @ 4010:797eacd945af
add tests for and fix alex's examples
| author | Richard Jones <richard@users.sourceforge.net> |
|---|---|
| date | Mon, 01 Sep 2008 01:45:33 +0000 |
| parents | e335ce40d6c8 |
| children | a73bac81eda2 |
line wrap: on
line diff
--- a/roundup/cgi/templating.py Mon Sep 01 01:37:00 2008 +0000 +++ b/roundup/cgi/templating.py Mon Sep 01 01:45:33 2008 +0000 @@ -1249,10 +1249,11 @@ (?P<url> ( (ht|f)tp(s?):// # protocol - ([\w]+:\w+@)? # username/password - ([\w\-]+\.)+ # hostname - [\w]{2,5} # TLD + ([\w]+(:\w+)?@)? # username/password + ([\w\-]+) # hostname + ((\.[\w-]+)+)? # .domain.etc | # ... or ... + ([\w]+(:\w+)?@)? # username/password www\. # "www." ([\w\-]+\.)+ # hostname [\w]{2,5} # TLD