Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Reverted parts of r17359 that could cause false positives in URL dete…

…ction, especially on file names.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17364 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 62766f42482f5071e7af1a806ae5c287f2332921 1 parent 19c544f
@aaugustin aaugustin authored
View
9 django/utils/html.py
@@ -21,7 +21,7 @@
unquoted_percents_re = re.compile(r'%(?![0-9A-Fa-f]{2})')
word_split_re = re.compile(r'(\s+)')
simple_url_re = re.compile(r'^https?://\w')
-simple_url_2_re = re.compile(r'^www\.|^(?!http)\w[^@]+\.(com|edu|gov|int|mil|net|org|[a-z]{2})$')
+simple_url_2_re = re.compile(r'^www\.|^(?!http)\w[^@]+\.(com|edu|gov|int|mil|net|org)$')
simple_email_re = re.compile(r'^\S+@\S+\.\S+$')
link_target_attribute_re = re.compile(r'(<a [^>]*?)target=[^\s>]+')
html_gunk_re = re.compile(r'(?:<br clear="all">|<i><\/i>|<b><\/b>|<em><\/em>|<strong><\/strong>|<\/?smallcaps>|<\/?uppercase>)', re.IGNORECASE)
@@ -125,10 +125,9 @@ def urlize(text, trim_url_limit=None, nofollow=False, autoescape=False):
Converts any URLs in text into clickable links.
Works on http://, https://, www. links, and also on links ending in one of
- the original seven gTLDs (.com, .edu, .gov, .int, .mil, .net, and .org) or
- a two-letter ccTLD. Links can have trailing punctuation (periods, commas,
- close-parens) and leading punctuation (opening parens) and it'll still do
- the right thing.
+ the original seven gTLDs (.com, .edu, .gov, .int, .mil, .net, and .org).
+ Links can have trailing punctuation (periods, commas, close-parens) and
+ leading punctuation (opening parens) and it'll still do the right thing.
If trim_url_limit is not None, the URLs in link text longer than this limit
will truncated to trim_url_limit-3 characters and appended with an elipsis.
View
16 docs/ref/templates/builtins.txt
@@ -2226,15 +2226,13 @@ urlize
Converts URLs in text into clickable links.
-This template tag works on several kinds of links:
-
-- links prefixed with ``http://``, ``https://``, or ``www.``. For example,
- ``http://goo.gl/aia1t`` will get converted but ``goo.gl/aia1t`` won't.
-- domain-only links ending in one of the original top level domains
- (``.com``, ``.edu``, ``.gov``, ``.int``, ``.mil``, ``.net``, and
- ``.org``). For example, ``djangoproject.com`` also gets converted.
-- domain-only links ending in a dot followed by two letters. This covers
- most country codes. For example, ``djangocon.eu`` still gets converted.
+This template tag works on links prefixed with ``http://``, ``https://``, or
+``www.``. For example, ``http://goo.gl/aia1t`` will get converted but
+``goo.gl/aia1t`` won't.
+
+It also supports domain-only links ending in one of the original top level
+domains (``.com``, ``.edu``, ``.gov``, ``.int``, ``.mil``, ``.net``, and
+``.org``). For example, ``djangoproject.com`` gets converted too.
.. versionchanged:: 1.4
View
2  tests/regressiontests/defaultfilters/tests.py
@@ -287,8 +287,6 @@ def test_urlize(self):
# Check urlize accepts more TLDs - see #16656
self.assertEqual(urlize('usa.gov'),
u'<a href="http://usa.gov" rel="nofollow">usa.gov</a>')
- self.assertEqual(urlize('europa.eu'),
- u'<a href="http://europa.eu" rel="nofollow">europa.eu</a>')
def test_wordcount(self):
self.assertEqual(wordcount(''), 0)
Please sign in to comment.
Something went wrong with that request. Please try again.