Fixed #1067 and #276 -- Added a {% spaceless %} tag, available in all templates

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1967 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 18 insertions, 0 deletions

diff --git a/django/core/template/defaulttags.py b/django/core/template/defaulttags.py
index 518498664d..daad1c2dfa 100644
--- a/django/core/template/defaulttags.py
+++ b/django/core/template/defaulttags.py
@@ -249,6 +249,14 @@ class NowNode(Node):
         df = DateFormat(datetime.now())
         return df.format(self.format_string)
 
+class SpacelessNode(Node):
+    def __init__(self, nodelist):
+        self.nodelist = nodelist
+
+    def render(self, context):
+        from django.utils.html import strip_spaces_between_tags
+        return strip_spaces_between_tags(self.nodelist.render(context).strip())
+
 class TemplateTagNode(Node):
     mapping = {'openblock': BLOCK_TAG_START,
                'closeblock': BLOCK_TAG_END,
@@ -726,6 +734,12 @@ def regroup(parser, token):
     return RegroupNode(target, expression, var_name)
 regroup = register.tag(regroup)
 
+def spaceless(parser, token):
+    nodelist = parser.parse(('endspaceless',))
+    parser.delete_first_token()
+    return SpacelessNode(nodelist)
+spaceless = register.tag(spaceless)
+
 #@register.tag
 def templatetag(parser, token):
     """
diff --git a/django/utils/html.py b/django/utils/html.py
index 730744c9e1..d89067106e 100644
--- a/django/utils/html.py
+++ b/django/utils/html.py
@@ -37,6 +37,10 @@ def strip_tags(value):
     "Returns the given HTML with all tags stripped"
     return re.sub(r'<[^>]*?>', '', value)
 
+def strip_spaces_between_tags(value):
+    "Returns the given HTML with spaces between tags stripped"
+    return re.sub(r'>\s+<', '><', value)
+
 def strip_entities(value):
     "Returns the given HTML with all entities (&something;) stripped"
     return re.sub(r'&(?:\w+|#\d);', '', value)