plone / diazo

Diazo applies a static HTML theme to a dynamic website
http://diazo.org
Other
41 stars 26 forks source link

Newlines stripped with recent versions of libxml2/libxslt #27

Open rpatterson opened 10 years ago

rpatterson commented 10 years ago

The Plone coredev tests fail because newlines are being stripped on my laptop running Ubuntu Saucy and @davisagli's laptop as well but pass on Plone's Jenkins server. I downgraded my version of libxml2 to 2.8 and my version of libxslt to 1.1.26, the versions used on Plone's Jenkins server and in Ubuntu Quantal and confirmed that the tests then pass locally on my laptop.

Here are the failures when running under Ubuntu's Saucy libxml2 version 2.9 and libxslt version 1.1.28:

Running zope.testing.testrunner.layer.UnitTests tests:
  Set up zope.testing.testrunner.layer.UnitTests in 0.000 seconds.
--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/indent-off/output.html

+++ now

@@ -1,3 +1 @@

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><body><div id="target"><p>From the content</p></div></body></html>
-
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><body><div id="target"><p>From the content</p></div></body></html>

Failure in test testAll (diazo.tests.tests.Test-indent-off)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-drop-all-attributes-theme-conditional-5/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div id="alpha" dir="rtl">a</div>
-    <div id="beta">b</div>
-  </body>
+<body><h1>Title</h1><div id="alpha" dir="rtl">a</div><div id="beta">b</div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-drop-all-attributes-theme-conditional-5)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-drop-attribute-theme-conditional-2/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div id="alpha">a</div>
-    <div id="beta">b</div>
-  </body>
+<body><h1>Title</h1><div id="alpha">a</div><div id="beta">b</div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-drop-attribute-theme-conditional-2)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-replace-theme-children/output.html

+++ now

@@ -1,18 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div id="alpha">
-      <p id="one">one</p>
-    </div>
-    <div id="beta">
-      <p id="two">two</p>
-    </div>
-    <div id="delta">
-      <p id="three">
-        <span>three</span>
-      </p>
-    </div>
-  </body>
+<body><h1>Title</h1><div id="alpha"><p id="one">one</p></div><div id="beta"><p id="two">two</p></div><div id="delta"><p id="three"><span>three</span></p></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-replace-theme-children)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/conditional-rules-1/output.html

+++ now

@@ -1,16 +1,10 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Theming with portlets</title>
-  </head>
-  <body>
-    <div id="aaa">AAA</div>
-    <div id="portlet-wrapper"><h2 id="portlets-title">Portlets</h2>
+    <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <title>Theming with portlets</title>
+    </head>
+    <body><div id="aaa">AAA</div><div id="portlet-wrapper"><h2 id="portlets-title">Portlets</h2>
             <div id="portlets"><div class="portlet" id="portletA">Portlet A</div><div class="portlet" id="portletB">Portlet B</div></div>
-        <a id="manage-portlets-link" href="manage-portlets">Manage Portlets</a></div>
-    <div id="bbb">BBB</div>
-    <div id="footer" class="footer-with-portlets">Footer with portlets</div>
-  </body>
+        <a id="manage-portlets-link" href="manage-portlets">Manage Portlets</a></div><div id="bbb">BBB</div><div id="footer" class="footer-with-portlets">Footer with portlets</div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-conditional-rules-1)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/copy-xsl/output.html

+++ now

@@ -1,9 +1,8 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title id="something">Site : Page title</title>
-  </head>
-  <body></body>
+    <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <title id="something">Site : Page title</title>
+    </head>
+    <body></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-copy-xsl)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/absolute-prefix-ie-conditional-comments/output.html

+++ now

@@ -3,7 +3,7 @@

   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <title>Absolute prefix</title>
-<!--[if lte IE 6]>
+    <!--[if lte IE 6]>
     <style type="text/css">
       @import "/abs/foo.css";      
       @import url("/abs/foo.css");
@@ -13,21 +13,21 @@

       @import url('http://site.com/foo.css');
     </style>
     <![endif]-->
-<!--[if IE]>
+    <!--[if IE]>
     <link rel="stylesheet" href="/abs/foo.css" />
     <link rel="stylesheet" href="/abs/foo.css" />
     <link rel="stylesheet" href="/foo.css" />
     <link rel="stylesheet" href="/foo.css" />
     <link rel="stylesheet" href="http://site.com/foo.css" />
     <![endif]-->
-<!--[if lte IE 6]>
+    <!--[if lte IE 6]>
     <script type="text/javascript" src="/abs/foo.js"></script>
     <script type="text/javascript" src="/abs/foo.js"></script>
     <script type="text/javascript" src="/foo.js"></script>
     <script type="text/javascript" src="/foo.js"></script>
     <script type="text/javascript" src="http://site.com/foo.js"></script>
     <![endif]-->
-<!--
+    <!--
         <script type="text/javascript" src="not-this.js"></script>
     -->
   </head>

Failure in test testAll (diazo.tests.tests.Test-absolute-prefix-ie-conditional-comments)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/multi-theme-2/output.html

+++ now

@@ -1,10 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>This is theme 2</h1>
-    <div id="content">
-      <p>content</p>
-    </div>
-  </body>
+<body><h1>This is theme 2</h1><div id="content"><p>content</p></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-multi-theme-2)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/modify-theme/output.html

+++ now

@@ -1,14 +1,14 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Theme title</title>
+    <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <title>Theme title</title>
+    
         <style type="text/css">
             /* From the rules */
             body > h1 { color: red; }
         </style>
     </head>
-  <body>
-    <div>
+    <body><div>

         <div id="from-rules">From the rules</div>
         <!-- A comment from the rules -->
@@ -21,7 +21,6 @@

             <dt>One</dt><dd>1</dd><dt>Two</dt><dd>2</dd>
         </dl>

-      </div>
-  </body>
+      </div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-modify-theme)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-merge-multiple-if-true/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body class="bar foo one" dir="rtl" title="Body here">
-    <h1>Title</h1>
-    <div id="alpha"></div>
-    <div id="beta"></div>
-  </body>
+<body class="bar foo one" dir="rtl" title="Body here"><h1>Title</h1><div id="alpha"></div><div id="beta"></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-merge-multiple-if-true)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/if-path-3/output.html

+++ now

@@ -1,10 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div id="content">
-      <p>content</p>
-    </div>
-  </body>
+<body><h1>Title</h1><div id="content"><p>content</p></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-if-path-3)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/if-path-5/output.html

+++ now

@@ -1,10 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div id="content">
-      <p>content</p>
-    </div>
-  </body>
+<body><h1>Title</h1><div id="content"><p>content</p></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-if-path-5)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-drop-multi-attributes-theme/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div class="foo">a</div>
-    <div id="beta">b</div>
-  </body>
+<body><h1>Title</h1><div class="foo">a</div><div id="beta">b</div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-drop-multi-attributes-theme)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-if-merge/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <p id="one">one</p>
-    <div id="beta"></div>
-  </body>
+<body><h1>Title</h1><p id="one">one</p><div id="beta"></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-if-merge)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-drop-all-attributes-theme-conditional-3/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div id="alpha">a</div>
-    <div id="beta">b</div>
-  </body>
+<body><h1>Title</h1><div id="alpha">a</div><div id="beta">b</div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-drop-all-attributes-theme-conditional-3)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/absolute-prefix/output.html

+++ now

@@ -22,19 +22,6 @@

     <script type="text/javascript" src="/foo.js"></script>
     <script type="text/javascript" src="http://site.com/foo.js"></script>
   </head>
-  <body>
-    <img src="/abs/foo.jpg" />
-    <img src="/abs/foo.jpg" />
-    <img src="/foo.jpg" />
-    <img src="/foo.jpg" />
-    <img src="http://site.com/foo.jpg" />
-    <input type="submit" src="/abs/foo.jpg" />
-    <input type="submit" src="/abs/foo.jpg" />
-    <input type="submit" src="/foo.jpg" />
-    <input type="submit" src="/foo.jpg" />
-    <input type="submit" src="http://site.com/foo.jpg" />
-    <a href="/abs/foo.html">Link</a>
-    <a href="#foo">Anchor</a>
-  </body>
+  <body><img src="/abs/foo.jpg" /><img src="/abs/foo.jpg" /><img src="/foo.jpg" /><img src="/foo.jpg" /><img src="http://site.com/foo.jpg" /><input type="submit" src="/abs/foo.jpg" /><input type="submit" src="/abs/foo.jpg" /><input type="submit" src="/foo.jpg" /><input type="submit" src="/foo.jpg" /><input type="submit" src="http://site.com/foo.jpg" /><a href="/abs/foo.html">Link</a><a href="#foo">Anchor</a></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-absolute-prefix)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-copy-multi-attribute/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body class="foo" dir="rtl" title="Body here" id="thebody">
-    <h1>Title</h1>
-    <div id="alpha"></div>
-    <div id="beta"></div>
-  </body>
+<body class="foo" dir="rtl" title="Body here" id="thebody"><h1>Title</h1><div id="alpha"></div><div id="beta"></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-copy-multi-attribute)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-drop-all-attributes-theme-conditional-2/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div dir="rtl" id="alpha">a</div>
-    <div id="beta">b</div>
-  </body>
+<body><h1>Title</h1><div dir="rtl" id="alpha">a</div><div id="beta">b</div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-drop-all-attributes-theme-conditional-2)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/ssiwait/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>theme</h1>
-<!--#include  virtual="extra.html?;filter_xpath=//*[@id%20=%20'something']" wait="yes"-->
-<!--#include  virtual="fragment.html" wait="yes"-->
-  </body>
+    <body><h1>theme</h1><!--#include  virtual="extra.html?;filter_xpath=//*[@id%20=%20'something']" wait="yes"--><!--#include  virtual="fragment.html" wait="yes"--></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-ssiwait)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/comments/output.html

+++ now

@@ -1,15 +1,13 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title id="first">Ninth Theme Page Title</title>
-    <script id="second" src="second.js" type="text/javascript"></script>
-    <link id="third" rel="stylesheet" href="third.css" />
-<!--[if lte IE 6]>
+    <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <title id="first">Ninth Theme Page Title</title>
+        <script id="second" src="second.js" type="text/javascript"></script>
+        <link id="third" rel="stylesheet" href="third.css" />
+   <!--[if lte IE 6]>
        <script type="text/javascript" src="ie-only.js"></script>
    <![endif]-->
-    <link id="fourth" rel="stylesheet" href="fourth.css" />
-  </head>
-  <body></body>
+    <link id="fourth" rel="stylesheet" href="fourth.css" /></head>
+    <body></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-comments)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/if-path-4/output.html

+++ now

@@ -1,10 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div id="content">
-      <p>content</p>
-    </div>
-  </body>
+<body><h1>Title</h1><div id="content"><p>content</p></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-if-path-4)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/absolute-prefix-disabled/output.html

+++ now

@@ -22,18 +22,6 @@

     <script type="text/javascript" src="/foo.js"></script>
     <script type="text/javascript" src="http://site.com/foo.js"></script>
   </head>
-  <body>
-    <img src="foo.jpg" />
-    <img src="./foo.jpg" />
-    <img src="../foo.jpg" />
-    <img src="/foo.jpg" />
-    <img src="http://site.com/foo.jpg" />
-    <input type="submit" src="foo.jpg" />
-    <input type="submit" src="./foo.jpg" />
-    <input type="submit" src="../foo.jpg" />
-    <input type="submit" src="/foo.jpg" />
-    <input type="submit" src="http://site.com/foo.jpg" />
-    <a href="foo.html">Link</a>
-  </body>
+  <body><img src="foo.jpg" /><img src="./foo.jpg" /><img src="../foo.jpg" /><img src="/foo.jpg" /><img src="http://site.com/foo.jpg" /><input type="submit" src="foo.jpg" /><input type="submit" src="./foo.jpg" /><input type="submit" src="../foo.jpg" /><input type="submit" src="/foo.jpg" /><input type="submit" src="http://site.com/foo.jpg" /><a href="foo.html">Link</a></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-absolute-prefix-disabled)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-if/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <p id="one">one</p>
-    <div id="beta"></div>
-  </body>
+<body><h1>Title</h1><p id="one">one</p><div id="beta"></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-if)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-drop-attribute-content/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <p>one</p>
-    <div id="beta">b</div>
-  </body>
+<body><h1>Title</h1><p>one</p><div id="beta">b</div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-drop-attribute-content)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/update-namespace-3/output.html

+++ now

@@ -1,14 +1,9 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>theme</h1>
-    <div id="main"> Blah
+    <body><h1>theme</h1><div id="main"> Blah
             <div id="core" class="content">content</div>
-        </div>
-    <h2>theme</h2>
-    <div id="portlets">
+        </div><h2>theme</h2><div id="portlets">
             <div id="portlet-wrapper"><div id="portlet" class="content">portlet</div></div>
-        </div>
-  </body>
+        </div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-update-namespace-3)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-before-both-children/output.html

+++ now

@@ -1,12 +1,10 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <div>
+  <body><div>
       <h1>Title</h1>
       <div id="alpha">onetext</div>
       <div id="beta">two<span>b</span></div>
       <div id="delta"><span>three</span><span>d</span></div>
-    </div>
-  </body>
+    </div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-before-both-children)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/drop-theme-children/output.html

+++ now

@@ -1,7 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <div id="pagecontent"></div>
-  </body>
+  <body><div id="pagecontent"></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-drop-theme-children)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-drop-attribute-theme-conditional-1/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div>a</div>
-    <div id="beta">b</div>
-  </body>
+<body><h1>Title</h1><div>a</div><div id="beta">b</div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-drop-attribute-theme-conditional-1)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-before/output.html

+++ now

@@ -1,10 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <p id="one">one</p>
-    <div id="alpha"></div>
-    <div id="beta"></div>
-  </body>
+<body><h1>Title</h1><p id="one">one</p><div id="alpha"></div><div id="beta"></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-before)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/style-script-quoting-2/output.html

+++ now

@@ -1,14 +1,13 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Theme Title</title>
-    <script type="text/javascript">
+    <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <title>Theme Title</title>
+        <script type="text/javascript">
             <!--
             var x = '<div>';
             //-->
         </script>
-    <script type="text/javascript">
+        <script type="text/javascript">
             // <![CDATA[
             var y = '<div>';
             // ]]>
@@ -17,15 +16,11 @@

         <!--
         var a = '<div>';
         //-->
-    </script>
-    <script type="text/javascript">
+    </script><script type="text/javascript">
         // <![CDATA[
         var b = '<div>';
         // ]]>
-    </script>
-  </head>
-  <body>
-    <h1>Title</h1>
-  </body>
+    </script></head>
+    <body><h1>Title</h1></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-style-script-quoting-2)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-replace-content-children/output.html

+++ now

@@ -1,12 +1,10 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <div>
+<body><div>
     <h1>Title</h1>
     one
     two
     <span>three</span>
-  </div>
-  </body>
+  </div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-replace-content-children)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-drop-all-attributes-content/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <p>one</p>
-    <div id="beta">b</div>
-  </body>
+<body><h1>Title</h1><p>one</p><div id="beta">b</div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-drop-all-attributes-content)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/drop-content-comment/output.html

+++ now

@@ -1,8 +1,8 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Content</title>
-  </head>
+    <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <title>Content</title>
+        
+    </head>
 </html>

Failure in test testAll (diazo.tests.tests.Test-drop-content-comment)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-drop-all-attributes-theme-conditional-4/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div id="alpha">a</div>
-    <div id="beta">b</div>
-  </body>
+<body><h1>Title</h1><div id="alpha">a</div><div id="beta">b</div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-drop-all-attributes-theme-conditional-4)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-copy-attribute-not-exists/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body class="bar" dir="rtl" title="Body here" id="thebody">
-    <h1>Title</h1>
-    <div id="alpha"></div>
-    <div id="beta"></div>
-  </body>
+<body class="bar" dir="rtl" title="Body here" id="thebody"><h1>Title</h1><div id="alpha"></div><div id="beta"></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-copy-attribute-not-exists)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-merge-separator/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div id="alpha-one"></div>
-    <div id="beta"></div>
-  </body>
+<body><h1>Title</h1><div id="alpha-one"></div><div id="beta"></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-merge-separator)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-if-custom-param/output.html

+++ now

@@ -1,10 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <p id="one">one</p>
-    <div id="beta"></div>
-    <p id="two">two</p>
-  </body>
+<body><h1>Title</h1><p id="one">one</p><div id="beta"></div><p id="two">two</p></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-if-custom-param)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/allow-curly-brackets/output.html

+++ now

@@ -1,11 +1,8 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title id="something" data-json="{ diazo: 'test' }">
-      <title>A Deeper Look At diazo</title>
-    </title>
-  </head>
-  <body></body>
+    <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <title id="something" data-json="{ diazo: 'test' }"><title>A Deeper Look At diazo</title></title>
+    </head>
+    <body></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-allow-curly-brackets)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-drop-all-attributes-theme/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div>a</div>
-    <div id="beta">b</div>
-  </body>
+<body><h1>Title</h1><div>a</div><div id="beta">b</div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-drop-all-attributes-theme)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/replace-after/output.html

+++ now

@@ -1,13 +1,8 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Replace and after</title>
-  </head>
-  <body>
-    <h2>Smaller Title</h2>
-    <p> content </p>
-    <div id="footer">Footer</div>
-  </body>
+    <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <title>Replace and after</title>
+    </head>
+    <body><h2>Smaller Title</h2><p> content </p><div id="footer">Footer</div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-replace-after)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-replace-content-conditional-2/output.html

+++ now

@@ -1,15 +1,11 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div id="breadcrumbs">
+<body><h1>Title</h1><div id="breadcrumbs">
           <span id="you-are-here">You are here</span>
           <span class="crumb">foo</span>
           <span class="crumb">bar</span>
-      </div>
-    <div id="source-content">
+      </div><div id="source-content">
             <p>foo</p>
-      </div>
-  </body>
+      </div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-replace-content-conditional-2)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/ssi/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>theme</h1>
-<!--#include  virtual="extra.html?;filter_xpath=//*[@id%20=%20'something']"-->
-<!--#include  virtual="fragment.html"-->
-  </body>
+    <body><h1>theme</h1><!--#include  virtual="extra.html?;filter_xpath=//*[@id%20=%20'something']"--><!--#include  virtual="fragment.html"--></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-ssi)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/if-path-7/output.html

+++ now

@@ -1,10 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div id="content">
-      <p>content</p>
-    </div>
-  </body>
+<body><h1>Title</h1><div id="content"><p>content</p></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-if-path-7)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/multi-theme-variable-1/output.html

+++ now

@@ -1,10 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>This is theme 1</h1>
-    <div id="content">
-      <p>content</p>
-    </div>
-  </body>
+<body><h1>This is theme 1</h1><div id="content"><p>content</p></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-multi-theme-variable-1)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/style-script-quoting-1/output.html

+++ now

@@ -1,28 +1,20 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Theme Title</title>
-    <style type="text/css">
+    <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <title>Theme Title</title>
+        <style type="text/css">
             /* From the theme */
             body > h1 { color: red; }
         </style>
-    <script type="text/javascript">
+        <script type="text/javascript">
             var x = '<div>';
         </script>
     <style type="text/css">
         /* From the content */
         div > p { color: blue; } 
-    </style>
-  </head>
-  <body>
-    <h1>Title</h1>
-    <div id="content">
-      <p>Some text</p>
-    </div>
-    <script type="text/javascript">
+    </style></head>
+    <body><h1>Title</h1><div id="content"><p>Some text</p></div><script type="text/javascript">
             var y = '<span>';
-        </script>
-  </body>
+        </script></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-style-script-quoting-1)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-replace-content/output.html

+++ now

@@ -1,15 +1,11 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div id="breadcrumbs">
+<body><h1>Title</h1><div id="breadcrumbs">
           <span id="prompt">Location:</span>
           <span class="crumb">foo</span>
           <span class="crumb">bar</span>
-      </div>
-    <div id="source-content">
+      </div><div id="source-content">
             <p>foo</p>
-      </div>
-  </body>
+      </div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-replace-content)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-after/output.html

+++ now

@@ -1,10 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div id="alpha"></div>
-    <p id="one">one</p>
-    <div id="beta"></div>
-  </body>
+<body><h1>Title</h1><div id="alpha"></div><p id="one">one</p><div id="beta"></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-after)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-drop-all-attributes-theme-conditional-1/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div>a</div>
-    <div id="beta">b</div>
-  </body>
+<body><h1>Title</h1><div>a</div><div id="beta">b</div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-drop-all-attributes-theme-conditional-1)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-after-theme-children/output.html

+++ now

@@ -1,18 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div id="alpha">text<p id="one">one</p></div>
-    <div id="beta">
-      <span>b</span>
-      <p id="two">two</p>
-    </div>
-    <div id="delta">
-      <span>d</span>
-      <p id="three">
-        <span>three</span>
-      </p>
-    </div>
-  </body>
+<body><h1>Title</h1><div id="alpha">text<p id="one">one</p></div><div id="beta"><span>b</span><p id="two">two</p></div><div id="delta"><span>d</span><p id="three"><span>three</span></p></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-after-theme-children)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-before-content-children/output.html

+++ now

@@ -1,12 +1,10 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <div>
+  <body><div>
       <h1>Title</h1>
       one<div id="alpha">text</div>
       two<div id="beta"><span>b</span></div>
       <span>three</span><div id="delta"><span>d</span></div>
-    </div>
-  </body>
+    </div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-before-content-children)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-if-not/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div id="alpha"></div>
-    <p id="two">two</p>
-  </body>
+<body><h1>Title</h1><div id="alpha"></div><p id="two">two</p></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-if-not)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-drop-and-replace-messages/output.html

+++ now

@@ -1,13 +1,8 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div class="message">top message</div>
-    <div class="message">inside message</div>
-    <div id="source-content">
+<body><h1>Title</h1><div class="message">top message</div><div class="message">inside message</div><div id="source-content">

             <p>foo</p>
-      </div>
-  </body>
+      </div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-drop-and-replace-messages)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/drop-content/output.html

+++ now

@@ -1,14 +1,8 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Second Theme Page Title</title>
-  </head>
-  <body>
-    <div id="pagecontent">
-      <h1>A Deeper Look....at...diazo</h1>
-      <p>And some content.</p>
-    </div>
-  </body>
+    <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <title>Second Theme Page Title</title>
+    </head>
+    <body><div id="pagecontent"><h1>A Deeper Look....at...diazo</h1><p>And some content.</p></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-drop-content)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/path-param-1/output.html

+++ now

@@ -1,10 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div id="content">
-      <p>content</p>
-    </div>
-  </body>
+<body><h1>Title</h1><div id="content"><p>content</p></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-path-param-1)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-if-not-content/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div id="alpha"></div>
-    <p id="two">two</p>
-  </body>
+<body><h1>Title</h1><div id="alpha"></div><p id="two">two</p></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-if-not-content)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/if-path-1/output.html

+++ now

@@ -1,10 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div id="content">
-      <p>content</p>
-    </div>
-  </body>
+<body><h1>Title</h1><div id="content"><p>content</p></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-if-path-1)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-replace-content-conditional-1/output.html

+++ now

@@ -1,15 +1,11 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div id="breadcrumbs">
+<body><h1>Title</h1><div id="breadcrumbs">
           <span id="prompt">Location:</span>
           <span class="crumb">foo</span>
           <span class="crumb">bar</span>
-      </div>
-    <div id="source-content">
+      </div><div id="source-content">
             <p>foo</p>
-      </div>
-  </body>
+      </div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-replace-content-conditional-1)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-if-path/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <p id="one">one</p>
-    <div id="beta"></div>
-  </body>
+<body><h1>Title</h1><p id="one">one</p><div id="beta"></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-if-path)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/conditional-rules-2/output.html

+++ now

@@ -1,9 +1,8 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Theming with portlets</title>
-  </head>
-  <body></body>
+    <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <title>Theming with portlets</title>
+    </head>
+    <body></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-conditional-rules-2)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/replace/output.html

+++ now

@@ -1,9 +1,8 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>A Deeper Look At diazo</title>
-  </head>
-  <body></body>
+    <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <title>A Deeper Look At diazo</title>
+    </head>
+    <body></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-replace)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-copy-all-attributes-conditional-2/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body class="bar" dir="rtl" title="Body here">
-    <h1>Title</h1>
-    <div id="alpha"></div>
-    <div id="beta"></div>
-  </body>
+<body class="bar" dir="rtl" title="Body here"><h1>Title</h1><div id="alpha"></div><div id="beta"></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-copy-all-attributes-conditional-2)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/if-path-6/output.html

+++ now

@@ -1,10 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div id="content">
-      <p>content</p>
-    </div>
-  </body>
+<body><h1>Title</h1><div id="content"><p>content</p></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-if-path-6)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/copy/output.html

+++ now

@@ -1,11 +1,8 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title id="something">
-      <title>A Deeper Look At diazo</title>
-    </title>
-  </head>
-  <body></body>
+    <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <title id="something"><title>A Deeper Look At diazo</title></title>
+    </head>
+    <body></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-copy)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-copy-all-attributes-conditional-3/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body class="foo" dir="ltr" title="Body here" id="thebody">
-    <h1>Title</h1>
-    <div id="alpha"></div>
-    <div id="beta"></div>
-  </body>
+<body class="foo" dir="ltr" title="Body here" id="thebody"><h1>Title</h1><div id="alpha"></div><div id="beta"></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-copy-all-attributes-conditional-3)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/append/output.html

+++ now

@@ -1,12 +1,10 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title id="first">Second Theme Page Title</title>
-    <script id="second" src="second.js" type="text/javascript"></script>
-    <link id="third" rel="stylesheet" href="third.css" />
-    <link id="fourth" rel="stylesheet" href="fourth.css" />
-  </head>
-  <body></body>
+    <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <title id="first">Second Theme Page Title</title>
+        <script id="second" src="second.js" type="text/javascript"></script>
+        <link id="third" rel="stylesheet" href="third.css" />
+    <link id="fourth" rel="stylesheet" href="fourth.css" /></head>
+    <body></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-append)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/if-path-2/output.html

+++ now

@@ -1,10 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div id="content">
-      <p>content</p>
-    </div>
-  </body>
+<body><h1>Title</h1><div id="content"><p>content</p></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-if-path-2)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/multi-theme-5/output.html

+++ now

@@ -1,10 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>This is theme 2</h1>
-    <div id="content">
-      <p>content</p>
-    </div>
-  </body>
+<body><h1>This is theme 2</h1><div id="content"><p>content</p></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-multi-theme-5)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-replace-content-content-children/output.html

+++ now

@@ -1,15 +1,11 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div id="breadcrumbs">
+<body><h1>Title</h1><div id="breadcrumbs">
           <span id="you-are-here">Location:</span>
           <span class="crumb">foo</span>
           <span class="crumb">bar</span>
-      </div>
-    <div id="source-content">
+      </div><div id="source-content">
             <p>foo</p>
-      </div>
-  </body>
+      </div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-replace-content-content-children)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-strip-if-theme/output.html

+++ now

@@ -1,5 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body><h1>Title</h1>alpha<div id="beta">beta</div></body>
+<body><h1>Title</h1>alpha<div id="beta">beta</div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-strip-if-theme)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-strip-if-content/output.html

+++ now

@@ -1,5 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body><h1>Title</h1>one<p id="two">two</p></body>
+<body><h1>Title</h1>one<p id="two">two</p></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-strip-if-content)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-replace-content-content-children-conditional-2/output.html

+++ now

@@ -1,15 +1,11 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div id="breadcrumbs">
+<body><h1>Title</h1><div id="breadcrumbs">
           <span id="you-are-here"><b>You</b> are <b>here</b></span>
           <span class="crumb">foo</span>
           <span class="crumb">bar</span>
-      </div>
-    <div id="source-content">
+      </div><div id="source-content">
             <p>foo</p>
-      </div>
-  </body>
+      </div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-replace-content-content-children-conditional-2)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/prepend-append/output.html

+++ now

@@ -1,13 +1,10 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <link id="veryfirst" rel="stylesheet" href="veryfirst.css" />
-    <title id="first">Second Theme Page Title</title>
-    <script id="second" src="second.js" type="text/javascript"></script>
-    <link id="third" rel="stylesheet" href="third.css" />
-    <link id="last" rel="stylesheet" href="last.css" />
-  </head>
-  <body></body>
+    <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><link id="veryfirst" rel="stylesheet" href="veryfirst.css" />
+        <title id="first">Second Theme Page Title</title>
+        <script id="second" src="second.js" type="text/javascript"></script>
+        <link id="third" rel="stylesheet" href="third.css" />
+    <link id="last" rel="stylesheet" href="last.css" /></head>
+    <body></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-prepend-append)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-drop-and-replace-portlets/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div class="portlet" id="navigation">Navigation</div>
-    <div class="portlet" id="help">Help</div>
-  </body>
+<body><h1>Title</h1><div class="portlet" id="navigation">Navigation</div><div class="portlet" id="help">Help</div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-drop-and-replace-portlets)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/css-xpath-child-selectors/output.html

+++ now

@@ -1,22 +1,16 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Pseudo classes and complex selectors</title>
-  </head>
-  <body>
-    <div>
-      <div class="replace">Someting very great from last content's DIV</div>
-    </div>
-    <div>
+    <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <title>Pseudo classes and complex selectors</title>
+    </head>
+    <body><div><div class="replace">Someting very great from last content's DIV</div></div><div>
             <span>Third Marker</span>
-            <ul><li>first</li>
+            <ul>
+                <li>first</li>
                 <li>second</li>
                 <li><span class="replace">new item from content</span></li>
                 <li>fourth</li>
-            </ul></div>
-    <div>Third Marker</div>
-    <div>Fourth marker</div>
-  </body>
+            </ul>
+        </div><div>Third Marker</div><div>Fourth marker</div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-css-xpath-child-selectors)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-before-theme-children/output.html

+++ now

@@ -1,18 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div id="alpha"><p id="one">one</p>text</div>
-    <div id="beta">
-      <p id="two">two</p>
-      <span>b</span>
-    </div>
-    <div id="delta">
-      <p id="three">
-        <span>three</span>
-      </p>
-      <span>d</span>
-    </div>
-  </body>
+<body><h1>Title</h1><div id="alpha"><p id="one">one</p>text</div><div id="beta"><p id="two">two</p><span>b</span></div><div id="delta"><p id="three"><span>three</span></p><span>d</span></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-before-theme-children)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-if-content/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <p id="one">one</p>
-    <div id="beta"></div>
-  </body>
+<body><h1>Title</h1><p id="one">one</p><div id="beta"></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-if-content)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-copy-all-attributes-multiple-rules-unconditional/output.html

+++ now

@@ -1,11 +1,9 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <div id="thebody" class="foo" dir="ltr" title="Content div here">
+  <body><div id="thebody" class="foo" dir="ltr" title="Content div here">
       <h1>Title</h1>
       <div id="alpha"></div>
       <div id="beta"></div>
-    </div>
-  </body>
+    </div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-copy-all-attributes-multiple-rules-unconditional)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/entities/output.html

+++ now

@@ -1,14 +1,9 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <p>The theme is parsed as HTML so entities like   and — are understood.</p>
-    <p>The content is parsed as HTML so entities like   and — are understood.</p>
-    <p>The rules are parsed as XML, this means that:</p>
-    <ul>
+    <body><p>The theme is parsed as HTML so entities like   and — are understood.</p><p>The content is parsed as HTML so entities like   and — are understood.</p><p>The rules are parsed as XML, this means that:</p><ul>
             <li>The predefined XML entities are always available: ", &amp;, ', &lt;, &gt;.</li>
             <li>Other entities must be explicitly declared in the doctype, as they are here for   and —.</li>
             <li><a href="http://en.wikipedia.org/wiki/List_of_XML_and_HTML_character_entity_references">More on character entity references</a></li>
-        </ul>
-  </body>
+        </ul></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-entities)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/conditional-content-rules-with-variable/output.html

+++ now

@@ -1,7 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <p>This compiles</p>
-  </body>
+  <body><p>This compiles</p></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-conditional-content-rules-with-variable)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/conditional-drop-in-append-1/output.html

+++ now

@@ -1,14 +1,9 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>theme</h1>
-    <div id="primary">
-      <p>Duis autem vel eum iriure dolor in hendrerit in vulputate velit
+    <body><h1>theme</h1><div id="primary"><p>Duis autem vel eum iriure dolor in hendrerit in vulputate velit
             esse molestie consequat, vel illum dolore eu feugiat nulla
             facilisis at vero eros et accumsan et iusto odio dignissim qui
             blandit praesent luptatum zzril delenit augue duis dolore te
-            feugait nulla facilisi.</p>
-    </div>
-  </body>
+            feugait nulla facilisi.</p></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-conditional-drop-in-append-1)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/multi-theme-1/output.html

+++ now

@@ -1,10 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>This is theme 1</h1>
-    <div id="content">
-      <p>content</p>
-    </div>
-  </body>
+<body><h1>This is theme 1</h1><div id="content"><p>content</p></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-multi-theme-1)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/comments-outside-root-tag/output.html

+++ now

@@ -5,8 +5,7 @@

 <!--[if gt IE 8]><!-->
 <html xmlns="http://www.w3.org/1999/xhtml" class="no-js" lang="en" xml:lang="en">
 <!--<![endif]-->
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <title>A Deeper Look At diazo</title>
   </head>
   <body></body>

Failure in test testAll (diazo.tests.tests.Test-comments-outside-root-tag)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-drop-multi-attributes-content/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <p class="foo">one</p>
-    <div id="beta">b</div>
-  </body>
+<body><h1>Title</h1><p class="foo">one</p><div id="beta">b</div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-drop-multi-attributes-content)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/document-includes/output.html

+++ now

@@ -1,33 +1,20 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>External includes</title>
-  </head>
-  <body>
-    <div id="external1">
+    <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <title>External includes</title>
+    </head>
+    <body><div id="external1">
             ONE
-        </div>
-    <div id="external2">
+        </div><div id="external2">
             TWO
-        </div>
-    <div id="external3">
+        </div><div id="external3">
             THREE
-        </div>
-    <div id="marker2">
-      <div id="external4">
+        </div><div id="marker2"><div id="external4">
             FOUR
-        </div>
-      <div id="external5">
+        </div><div id="external5">
             FIVE
-        </div>
-      <div id="external6">
+        </div><div id="external6">
             SIX
-        </div>
-    </div>
-    <h2>Smaller Title</h2>
-    <p> content </p>
-    <div id="footer">Footer</div>
-  </body>
+        </div></div><h2>Smaller Title</h2><p> content </p><div id="footer">Footer</div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-document-includes)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-copy-all-attributes-multiple-rules-conditional-1/output.html

+++ now

@@ -1,11 +1,9 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <div id="thebody" class="bar" dir="ltr" title="Theme here">
+  <body><div id="thebody" class="bar" dir="ltr" title="Theme here">
       <h1>Title</h1>
       <div id="alpha"></div>
       <div id="beta"></div>
-    </div>
-  </body>
+    </div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-copy-all-attributes-multiple-rules-conditional-1)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/empty-xmlns/output.html

+++ now

@@ -1,15 +1,12 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>A Deeper Look At diazo</title>
-  </head>
-  <body>
-    <div id="wrapper" class="foo">
+    <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <title>A Deeper Look At diazo</title>
+    </head>
+    <body><div id="wrapper" class="foo">
             <div id="content">
                 <p>boo bar baz</p>
             </div>
-        </div>
-  </body>
+        </div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-empty-xmlns)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

Error in test testAll (diazo.tests.tests.Test-esi)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 120, in testAll
    processor = etree.XSLT(ct)
  File "xslt.pxi", line 404, in lxml.etree.XSLT.__init__ (src/lxml/lxml.etree.c:123027)
XSLTParseError: xsl:attribute: The attribute name 'xmlns' is not allowed.

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/update-namespace-2/output.html

+++ now

@@ -1,14 +1,9 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>theme</h1>
-    <div id="main"> Blah
+    <body><h1>theme</h1><div id="main"> Blah
             <div id="core" class="content">content</div>
-        </div>
-    <h2>theme</h2>
-    <div id="portlets">
+        </div><h2>theme</h2><div id="portlets">
             <div id="portlet-wrapper"><div id="portlet" class="content">portlet</div></div>
-        </div>
-  </body>
+        </div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-update-namespace-2)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/drop-theme-comment/output.html

+++ now

@@ -1,7 +1,7 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-</head>
+    <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        
+    </head>
 </html>

Failure in test testAll (diazo.tests.tests.Test-drop-theme-comment)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-strip-content/output.html

+++ now

@@ -1,5 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body><h1>Title</h1>one<div id="beta"></div></body>
+<body><h1>Title</h1>one<div id="beta"></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-strip-content)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-after-both-children/output.html

+++ now

@@ -1,13 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div id="alpha">textone</div>
-    <div id="beta"><span>b</span>two</div>
-    <div id="delta">
-      <span>d</span>
-      <span>three</span>
-    </div>
-  </body>
+<body><h1>Title</h1><div id="alpha">textone</div><div id="beta"><span>b</span>two</div><div id="delta"><span>d</span><span>three</span></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-after-both-children)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-replace-content-content-children-conditional-1/output.html

+++ now

@@ -1,15 +1,11 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div id="breadcrumbs">
+<body><h1>Title</h1><div id="breadcrumbs">
           <span id="you-are-here">Location:</span>
           <span class="crumb">foo</span>
           <span class="crumb">bar</span>
-      </div>
-    <div id="source-content">
+      </div><div id="source-content">
             <p>foo</p>
-      </div>
-  </body>
+      </div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-replace-content-content-children-conditional-1)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-drop-attribute-theme/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div>a</div>
-    <div id="beta">b</div>
-  </body>
+<body><h1>Title</h1><div>a</div><div id="beta">b</div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-drop-attribute-theme)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-copy-all-attributes-conditional-1/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body class="foo" dir="ltr" title="Body here" id="thebody">
-    <h1>Title</h1>
-    <div id="alpha"></div>
-    <div id="beta"></div>
-  </body>
+<body class="foo" dir="ltr" title="Body here" id="thebody"><h1>Title</h1><div id="alpha"></div><div id="beta"></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-copy-all-attributes-conditional-1)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-strip-theme/output.html

+++ now

@@ -1,6 +1,6 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body><h1>Title</h1>
+<body><h1>Title</h1>
   alpha
   <div id="beta">beta</div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-strip-theme)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-if-not-path/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div id="alpha"></div>
-    <p id="two">two</p>
-  </body>
+<body><h1>Title</h1><div id="alpha"></div><p id="two">two</p></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-if-not-path)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/if-path-8/output.html

+++ now

@@ -1,8 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div id="content"></div>
-  </body>
+<body><h1>Title</h1><div id="content"></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-if-path-8)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-after-content-children/output.html

+++ now

@@ -1,12 +1,10 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <div>
+<body><div>
     <h1>Title</h1>
     <div id="alpha">text</div>one
     <div id="beta"><span>b</span></div>two
     <div id="delta"><span>d</span></div><span>three</span>
-  </div>
-  </body>
+  </div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-after-content-children)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-merge/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body class="bar foo" dir="rtl" title="Body here">
-    <h1>Title</h1>
-    <div id="alpha"></div>
-    <div id="beta"></div>
-  </body>
+<body class="bar foo" dir="rtl" title="Body here"><h1>Title</h1><div id="alpha"></div><div id="beta"></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-merge)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/conditional-drop-in-append-2/output.html

+++ now

@@ -1,16 +1,9 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>theme</h1>
-    <div id="primary">
-      <h1 class="title">Test Header</h1>
-      <div id="byline">test by-line info</div>
-      <p>Duis autem vel eum iriure dolor in hendrerit in vulputate velit
+    <body><h1>theme</h1><div id="primary"><h1 class="title">Test Header</h1><div id="byline">test by-line info</div><p>Duis autem vel eum iriure dolor in hendrerit in vulputate velit
             esse molestie consequat, vel illum dolore eu feugiat nulla
             facilisis at vero eros et accumsan et iusto odio dignissim qui
             blandit praesent luptatum zzril delenit augue duis dolore te
-            feugait nulla facilisi.</p>
-    </div>
-  </body>
+            feugait nulla facilisi.</p></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-conditional-drop-in-append-2)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/prepend/output.html

+++ now

@@ -1,12 +1,10 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <link id="fourth" rel="stylesheet" href="fourth.css" />
-    <title id="first">Second Theme Page Title</title>
-    <script id="second" src="second.js" type="text/javascript"></script>
-    <link id="third" rel="stylesheet" href="third.css" />
-  </head>
-  <body></body>
+    <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><link id="fourth" rel="stylesheet" href="fourth.css" />
+        <title id="first">Second Theme Page Title</title>
+        <script id="second" src="second.js" type="text/javascript"></script>
+        <link id="third" rel="stylesheet" href="third.css" />
+    </head>
+    <body></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-prepend)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-merge-multiple/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body class="bar foo one" dir="rtl" title="Body here">
-    <h1>Title</h1>
-    <div id="alpha"></div>
-    <div id="beta"></div>
-  </body>
+<body class="bar foo one" dir="rtl" title="Body here"><h1>Title</h1><div id="alpha"></div><div id="beta"></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-merge-multiple)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-replace/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <p id="one">one</p>
-    <div id="beta"></div>
-  </body>
+<body><h1>Title</h1><p id="one">one</p><div id="beta"></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-replace)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-notheme-nomatch/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <p id="one">one</p>
-    <div id="beta"></div>
-  </body>
+<body><h1>Title</h1><p id="one">one</p><div id="beta"></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-notheme-nomatch)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/multi-theme-4/output.html

+++ now

@@ -1,10 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>This is theme 1</h1>
-    <div id="content">
-      <p>content</p>
-    </div>
-  </body>
+<body><h1>This is theme 1</h1><div id="content"><p>content</p></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-multi-theme-4)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-copy-all-attributes/output.html

+++ now

@@ -1,11 +1,9 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <div id="thebody" class="foo" dir="ltr" title="Body here">
+  <body><div id="thebody" class="foo" dir="ltr" title="Body here">
       <h1>Title</h1>
       <div id="alpha"></div>
       <div id="beta"></div>
-    </div>
-  </body>
+    </div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-copy-all-attributes)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-copy-attribute-exists/output.html

+++ now

@@ -1,9 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body class="foo" dir="rtl" title="Body here">
-    <h1>Title</h1>
-    <div id="alpha"></div>
-    <div id="beta"></div>
-  </body>
+<body class="foo" dir="rtl" title="Body here"><h1>Title</h1><div id="alpha"></div><div id="beta"></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-copy-attribute-exists)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/path-param-2/output.html

+++ now

@@ -1,8 +1,5 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Title</h1>
-    <div id="content"></div>
-  </body>
+<body><h1>Title</h1><div id="content"></div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-path-param-2)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-copy-all-attributes-href/output.html

+++ now

@@ -1,11 +1,9 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <div id="thebody" class="foo" dir="ltr" title="Body here">
+  <body><div id="thebody" class="foo" dir="ltr" title="Body here">
       <h1>Title</h1>
       <div id="alpha"></div>
       <div id="beta"></div>
-    </div>
-  </body>
+    </div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-copy-all-attributes-href)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

--- /opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/v1-replace-both-children/output.html

+++ now

@@ -1,12 +1,10 @@

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <div>
+  <body><div>
       <h1>Title</h1>
       <div id="alpha">one</div>
       <div id="beta">two</div>
       <div id="delta"><span>three</span></div>
-    </div>
-  </body>
+    </div></body>
 </html>

Failure in test testAll (diazo.tests.tests.Test-v1-replace-both-children)
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/opt/src/eggs/diazo-1.0.5-py2.7.egg/diazo/tests/tests.py", line 167, in testAll
    assert old == new, "output.html has CHANGED"
AssertionError: output.html has CHANGED

  Ran 180 tests with 109 failures and 1 errors in 1.043 seconds.
Tearing down left over layers:
  Tear down zope.testing.testrunner.layer.UnitTests in 0.000 seconds.
rpatterson commented 10 years ago

I should also note that the tests still failed when I downgraded only libxslt to 1.1.26 but left libxml2 at 2.9.

tisto commented 10 years ago

I think this issue has been fixed with https://github.com/plone/diazo/pull/29. Please re-open the issue if necessary.

rpatterson commented 10 years ago

@tisto The tests pass after my changes, but it seems like a false pass. When I inspect the Diazo output in those tests I still see the whitespace stripped which doesn't seem like what we want since it would make the Diazo output unreadable for developers or themers trying to debug or inspect their HTML.

rpatterson commented 10 years ago

Example pdb session in the tests:

 testAll (diazo.tests.tests.Test-v1-drop-all-attributes-theme-conditional-5)> /opt/src/diazo/lib/diazo/tests/tests.py(162)testAll()
-> if not xml_compare(etree.fromstring(old.strip()), etree.fromstring(new.strip())):
(Pdb) print new
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<body><h1>Title</h1><div id="alpha" dir="rtl">a</div><div id="beta">b</div></body>
</html>

(Pdb) print old
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
  <body>
    <h1>Title</h1>
    <div id="alpha" dir="rtl">a</div>
    <div id="beta">b</div>
  </body>
</html>
tisto commented 10 years ago

Yeah, I am aware of that problem. The xml_compare function operates on trees, so it completely ignores any whitespace between the nodes. If you want to make it work for your pdb example you would have to deal with whitespace again (which was our problem in the first place). We could run a pretty print on both HTML fragments before comparing them in xml_compare. This way pdb would print out something that is easier to compare for developers.

lrowe commented 10 years ago

Pretty printing for debugging diazo itself is a nice to have but not a show stopper, but whitespace can effect browser rendering. It looks like https://github.com/plone/diazo/tree/master/lib/diazo/tests/indent-off is the only test with pretty-print = false. It may need special attention here to ensure the test is still testing the important behaviour.

rpatterson commented 10 years ago

I'm not quite sure what you're both saying here. Are you saying the whitespace stripping in the test doesn't happen when Diazo is processing HTML in real deployments under these versions of libxml2/libxslt? I'm saying that if it does strip white space in real deployments under these versions, then this is a bug somewhere and a ticket should be open somewhere.

On Fri, Jun 20, 2014 at 1:53 AM, Laurence Rowe notifications@github.com wrote:

Pretty printing for debugging diazo itself is a nice to have but not a show stopper, but whitespace can effect browser rendering. It looks like https://github.com/plone/diazo/tree/master/lib/diazo/tests/indent-off is the only test with pretty-print = false. It may need special attention here to ensure the test is still testing the important behaviour.

— Reply to this email directly or view it on GitHub https://github.com/plone/diazo/issues/27#issuecomment-46649853.

adrianwhite commented 9 years ago

As far as I can tell none of the above tests cases include checking whitespace remains between elements (as noted in #25) should this also be part of these test or am I barking up the wrong tree here?

adrianwhite commented 9 years ago

I've just noticed that the comment previous to my last one was over a year old. This may no longer be an issue.