diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2010-12-11 18:28:08 -0500 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2010-12-11 18:28:08 -0500 |
| commit | 77850390ffe6579eadfbb9e0e593433b1ed9db80 (patch) | |
| tree | f076c227b57b262659de6bde96c1742254079901 | |
| parent | cb0d04e45aae9d08a653acc7da29fb87fe81b3cb (diff) | |
| download | askbot-77850390ffe6579eadfbb9e0e593433b1ed9db80.tar.gz askbot-77850390ffe6579eadfbb9e0e593433b1ed9db80.tar.bz2 askbot-77850390ffe6579eadfbb9e0e593433b1ed9db80.zip | |
once again fixed the autolinker
| -rw-r--r-- | askbot/__init__.py | 2 | ||||
| -rw-r--r-- | askbot/utils/markup.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/askbot/__init__.py b/askbot/__init__.py index 92943c5c..7ddf59e5 100644 --- a/askbot/__init__.py +++ b/askbot/__init__.py @@ -19,4 +19,4 @@ def get_version(): """returns version of the askbot app this version is meaningful for pypi only """ - return '0.6.44' + return '0.6.45' diff --git a/askbot/utils/markup.py b/askbot/utils/markup.py index be9e9575..dcdfc5a4 100644 --- a/askbot/utils/markup.py +++ b/askbot/utils/markup.py @@ -7,7 +7,7 @@ from markdown2 import Markdown URL_RE = re.compile("((?<!href=['\"])|(?<!src=['\"]))((http|https|ftp)\://([a-zA-Z0-9\.\-]+(\:[a-zA-Z0-9\.&%\$\-]+)*@)*((25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9])\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[0-9])|localhost|([a-zA-Z0-9\-]+\.)*[a-zA-Z0-9\-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(\:[0-9]+)*(/($|[a-zA-Z0-9\.\,\?\'\\\+&%\$#\=~_\-]+))*)") LINK_PATTERNS = [ - (URL_RE, r'\1'), + (URL_RE, r'\2'), ] def get_parser(): |