From: Jason Kirtland <jek@discorporate.us>
Date: Wed, 2 May 2007 20:12:33 +0000 (+0000)
Subject: - Use Python 2.5's built-in ElementTree if possible
X-Git-Tag: rel_0_3_8~62
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e80266338958c4cc0155c51f286a4b7ab088e6c0;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- Use Python 2.5's built-in ElementTree if possible
---

diff --git a/doc/build/read_markdown.py b/doc/build/read_markdown.py
index 363e7bf3e1..35df7a5ce7 100644
--- a/doc/build/read_markdown.py
+++ b/doc/build/read_markdown.py
@@ -9,9 +9,12 @@ import sys, re, os
 from toc import TOCElement
 
 try:
-    import elementtree.ElementTree as et
-except:
-    raise "This module requires ElementTree to run (http://effbot.org/zone/element-index.htm)"
+    import xml.etree.ElementTree as et
+except ImportError:
+    try:
+        import elementtree.ElementTree as et
+    except:
+        raise "This module requires ElementTree to run (http://effbot.org/zone/element-index.htm)"
 
 import markdown