From 0df474c8ff6feda95506b26e5ea6f352a1b518ba Mon Sep 17 00:00:00 2001
From: Sam Ruby <rubys@intertwingly.net>
Date: Tue, 14 Nov 2006 10:28:40 -0500
Subject: [PATCH] Support backlevel versions of Python

---
 docs/installation.html | 18 +++++++++++++-----
 planet/__init__.py     |  3 ++-
 planet/spider.py       |  4 ++--
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/docs/installation.html b/docs/installation.html
index 9994984..6a668d1 100644
--- a/docs/installation.html
+++ b/docs/installation.html
@@ -69,7 +69,7 @@ right directory.</p></li>
 <p>Build your own themes, templates, or filters!  And share!</p></li>
 </ol>
 
-<h3>Mac OS X and Fink Instructions</h3>
+<h3 id="macosx">Mac OS X and Fink Instructions</h3>
 
 <p>
 The <a href="http://fink.sourceforge.net/">Fink Project</a> packages
@@ -101,12 +101,20 @@ not yet ported to the newer python so Venus will be less featureful.
         may want to explicitly specify <code>python2.4</code>.</p></li>
 </ol>
 
-<h3>Ubuntu Linux (Edgy Eft) instructions</h3>
+<h3 id="ubuntu">Ubuntu Linux (Edgy Eft) instructions</h3>
 
 <p>Before starting, issue the following command:</p>
-<ul>
-<li><code>sudo apt-get install bzr python2.4-librdf</code></li>
-</ul>
+
+<blockquote><pre>sudo apt-get install bzr python2.4-librdf</pre></blockquote>
+
+<h3 id="python22">Python 2.2 instructions</h3>
+
+<p>If you are running Python 2.2, you may also need to install <a href="http://pyxml.sourceforge.net/">pyxml</a>.  If the
+following runs without error, you do <b>not</b> have the problem.</p>
+<blockquote><pre>python -c "__import__('xml.dom.minidom').dom.minidom.parseString('&lt;entry xml:lang=\"en\"/&gt;')"</pre></blockquote>
+<p>Installation of pyxml varies by platform.  For Ubuntu Linux (Dapper Drake), issue the following command:</p>
+
+<blockquote><pre>sudo apt-get install python2.2-xml</pre></blockquote>
 
 </body>
 </html>
diff --git a/planet/__init__.py b/planet/__init__.py
index 6be34ed..0902bd8 100644
--- a/planet/__init__.py
+++ b/planet/__init__.py
@@ -16,10 +16,11 @@ def getLogger(level, format):
 
     try:
         import logging
+        logging.basicConfig(format=format)
     except:
         import compat_logging as logging
+        logging.basicConfig(format=format)
 
-    logging.basicConfig(format=format)
     logging.getLogger().setLevel(logging.getLevelName(level))
     logger = logging.getLogger("planet.runner")
     try:
diff --git a/planet/spider.py b/planet/spider.py
index aff3884..72f339c 100644
--- a/planet/spider.py
+++ b/planet/spider.py
@@ -260,7 +260,7 @@ def spiderFeed(feed, only_if_new=0):
 
         # apply any filters
         xdoc = reconstitute.reconstitute(data, entry)
-        output = xdoc.toxml('utf-8')
+        output = xdoc.toxml().encode('utf-8')
         xdoc.unlink()
         for filter in config.filters(feed):
             output = shell.run(filter, output, mode="filter")
@@ -320,7 +320,7 @@ def spiderFeed(feed, only_if_new=0):
     xdoc=minidom.parseString('''<feed xmlns:planet="%s"
       xmlns="http://www.w3.org/2005/Atom"/>\n''' % planet.xmlns)
     reconstitute.source(xdoc.documentElement,data.feed,data.bozo,data.version)
-    write(xdoc.toxml('utf-8'), filename(sources, feed))
+    write(xdoc.toxml().encode('utf-8'), filename(sources, feed))
     xdoc.unlink()
 
 def spiderPlanet(only_if_new = False):