From 041a491df724e8c6a78e00c3229e0b1ab2066625 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 3 May 2009 10:36:27 +0200
Subject: [PATCH 1/3] Remove testing leftover.

---
 doc/concepts.rst | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/doc/concepts.rst b/doc/concepts.rst
index 8d108b98e..e6d5fa026 100644
--- a/doc/concepts.rst
+++ b/doc/concepts.rst
@@ -19,9 +19,6 @@ such a document name.
 Examples for document names are ``index``, ``library/zipfile``, or
 ``reference/datamodel/types``.  Note that there is no leading slash.
 
---option           Option.
---very-long        Opitomn.
-
 
 The TOC tree
 ------------

From e02e828cbe85cec91dfa17b7603422bbc0a53e75 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 10 May 2009 20:56:50 +0200
Subject: [PATCH 2/3] #150: Fix display of the "sphinxdoc" theme on Internet
 Explorer versions 6 and 7.

---
 CHANGES                                      | 3 +++
 sphinx/themes/basic/static/basic.css         | 9 ---------
 sphinx/themes/default/static/default.css_t   | 9 +++++++++
 sphinx/themes/sphinxdoc/static/sphinxdoc.css | 4 ----
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/CHANGES b/CHANGES
index c34603a6f..392ea6b7c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
 Release 0.6.2 (in development)
 ==============================
 
+* #150: Fix display of the "sphinxdoc" theme on Internet Explorer
+  versions 6 and 7.
+
 * #146: Don't fail to generate LaTeX when the user has an active
   ``.docutils`` configuration.
 
diff --git a/sphinx/themes/basic/static/basic.css b/sphinx/themes/basic/static/basic.css
index ed737d3ba..68cae4fc6 100644
--- a/sphinx/themes/basic/static/basic.css
+++ b/sphinx/themes/basic/static/basic.css
@@ -5,15 +5,6 @@
 
 /* -- main layout ----------------------------------------------------------- */
 
-div.documentwrapper {
-    float: left;
-    width: 100%;
-}
-
-div.bodywrapper {
-    margin: 0 0 0 230px;
-}
-
 div.clearer {
     clear: both;
 }
diff --git a/sphinx/themes/default/static/default.css_t b/sphinx/themes/default/static/default.css_t
index ab2aeb0c1..a363167a8 100644
--- a/sphinx/themes/default/static/default.css_t
+++ b/sphinx/themes/default/static/default.css_t
@@ -20,6 +20,15 @@ div.document {
     background-color: {{ theme_sidebarbgcolor }};
 }
 
+div.documentwrapper {
+    float: left;
+    width: 100%;
+}
+
+div.bodywrapper {
+    margin: 0 0 0 230px;
+}
+
 div.body {
     background-color: {{ theme_bgcolor }};
     color: {{ theme_textcolor }};
diff --git a/sphinx/themes/sphinxdoc/static/sphinxdoc.css b/sphinx/themes/sphinxdoc/static/sphinxdoc.css
index 1d11e8b9a..75b2ae0f9 100644
--- a/sphinx/themes/sphinxdoc/static/sphinxdoc.css
+++ b/sphinx/themes/sphinxdoc/static/sphinxdoc.css
@@ -25,10 +25,6 @@ body {
     min-width: 740px;
 }
 
-div.documentwrapper {
-    float: none;
-}
-
 div.document {
     background-color: white;
     text-align: left;

From ef01782f42aaacadb50cc702584c0317f2d6ce54 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 10 May 2009 20:59:08 +0200
Subject: [PATCH 3/3] #157: fix make check.

---
 Makefile                          | 2 +-
 sphinx/ext/inheritance_diagram.py | 1 +
 sphinx/writers/html.py            | 5 +++--
 tests/test_markup.py              | 3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 108ed96dc..dbe7c36e2 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ all: clean-pyc check test
 check:
 	@$(PYTHON) utils/check_sources.py -i sphinx/style/jquery.js \
 		-i sphinx/pycode/pgen2 -i sphinx/util/smartypants.py \
-		-i doc/_build -i ez_setup.py -i tests/path.py .
+		-i doc/_build -i ez_setup.py -i tests/path.py -i tests/coverage.py .
 
 clean: clean-pyc clean-patchfiles
 
diff --git a/sphinx/ext/inheritance_diagram.py b/sphinx/ext/inheritance_diagram.py
index dd8af234d..9c037c998 100644
--- a/sphinx/ext/inheritance_diagram.py
+++ b/sphinx/ext/inheritance_diagram.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """
     sphinx.ext.inheritance_diagram
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/sphinx/writers/html.py b/sphinx/writers/html.py
index 79b2fcc55..81df395bd 100644
--- a/sphinx/writers/html.py
+++ b/sphinx/writers/html.py
@@ -472,10 +472,11 @@ class HTMLTranslator(BaseTranslator):
                                  u'title="%s">\u00B6</a>' %
                                  _('Permalink to this headline'))
             elif close_tag.startswith('</a></h'):
-                self.body.append(u'</a><a class="headerlink" href="#%s" ' % aname +
+                self.body.append(u'</a><a class="headerlink" href="#%s" ' %
+                                 aname +
                                  u'title="%s">\u00B6' %
                                  _('Permalink to this headline'))
-                
+
         BaseTranslator.depart_title(self, node)
 
     def unknown_visit(self, node):
diff --git a/tests/test_markup.py b/tests/test_markup.py
index 28ec17f56..77f2016ed 100644
--- a/tests/test_markup.py
+++ b/tests/test_markup.py
@@ -111,7 +111,8 @@ def test_inline():
 
 def test_latex_escaping():
     # correct escaping in normal mode
-    yield verify, u'Γ\\\\∞$', None, ur'\(\Gamma\)\textbackslash{}\(\infty\)\$'
+    yield (verify, u'Γ\\\\∞$', None,
+                   ur'\(\Gamma\)\textbackslash{}\(\infty\)\$')
     # in verbatim code fragments
     yield (verify, u'::\n\n @Γ\\∞$[]', None,
            u'\\begin{Verbatim}[commandchars=@\\[\\]]\n'