Ticket #4657: urlize_trunc.2.patch

django/utils/html.py

@@ -57 +57 @@
-    www. links. Links can have trailing punctuation (periods, commas, close-parens)
-    and leading punctuation (opening parens) and it'll still do the right thing.
-
-will be limited to
-trim_url_limit character
+longer than this limit
+will truncated to trim_url_limit-3 characters and appended with an elipsi
-
-    If nofollow is True, the URLs in link text will get a rel="nofollow" attribute.
-    """
-(x[:limit] + (len(x) >=limit and '...' or '')) 
+len(x) > limit and ('%s...' % x[:max(0, limit-3)])
-    words = word_split_re.split(text)
-    nofollow_attr = nofollow and ' rel="nofollow"' or ''
-    for i, word in enumerate(words):

docs/templates.txt

@@ -1266 +1266 @@
-urlizetrunc
-~~~~~~~~~~~
-
-
+
+
-
-**Argument:** Length to truncate URLs to
-

tests/regressiontests/defaultfilters/tests.py

@@ -121 +121 @@
-'<a href="http://short.com/" rel="nofollow">http://short.com/</a>'
-
->>> urlizetrunc('http://www.google.co.uk/search?hl=en&q=some+long+url&btnG=Search&meta=', 20)
-co.
+
-
+# Check truncating of URIs which are the exact length
+>>> uri = 'http://31characteruri.com/test/'
+>>> len(uri)
+31
+>>> urlizetrunc(uri, 31)
+'<a href="http://31characteruri.com/test/" rel="nofollow">http://31characteruri.com/test/</a>'
+>>> urlizetrunc(uri, 30)
+'<a href="http://31characteruri.com/test/" rel="nofollow">http://31characteruri.com/t...</a>'
+
->>> wordcount('')
-0
-