Add SAXReaderNotAvailable, and use it to distinguish between an

ImportError, and a missing driver.

2 files changed, 19 insertions, 2 deletions

diff --git a/Lib/test/output/test_sax b/Lib/test/output/test_sax
index 53c5f97..d2ccf88 100644
--- a/Lib/test/output/test_sax
+++ b/Lib/test/output/test_sax
@@ -14,6 +14,7 @@ Passed test_expat_inpsource_sysid
 Passed test_expat_nsattrs_empty
 Passed test_expat_nsattrs_wattr
 Passed test_filter_basic
+Passed test_make_parser
 Passed test_nsattrs_empty
 Passed test_nsattrs_wattr
 Passed test_xmlgen_basic
@@ -22,4 +23,4 @@ Passed test_xmlgen_content_escape
 Passed test_xmlgen_ignorable
 Passed test_xmlgen_ns
 Passed test_xmlgen_pi
-23 tests, 0 failures
+24 tests, 0 failures
diff --git a/Lib/test/test_sax.py b/Lib/test/test_sax.py
index 1760eb2..b3576ab 100644
--- a/Lib/test/test_sax.py
+++ b/Lib/test/test_sax.py
@@ -2,10 +2,15 @@
 # regression test for SAX 2.0
 # $Id$
 
+from xml.sax import make_parser, ContentHandler
+try:
+    make_parser()
+except xml.sax.SAXReaderNotAvailable:
+    # don't try to test this module if we cannot create a parser
+    raise ImportError("no XML parsers available")
 from xml.sax.saxutils import XMLGenerator, escape, XMLFilterBase
 from xml.sax.expatreader import create_parser
 from xml.sax.xmlreader import InputSource, AttributesImpl, AttributesNSImpl
-from xml.sax.handler import ContentHandler
 from cStringIO import StringIO
 from test_support import verbose, TestFailed, findfile
 
@@ -41,6 +46,17 @@ def test_escape_all():
 def test_escape_extra():
     return escape("Hei på deg", {"å" : "å"}) == "Hei på deg"
 
+def test_make_parser():
+    try:
+        # Creating a parser should succeed - it should fall back
+        # to the expatreader
+        p = make_parser(['xml.parsers.no_such_parser'])
+    except:
+        return 0
+    else:
+        return p
+
+
 # ===== XMLGenerator
 
 start = '<?xml version="1.0" encoding="iso-8859-1"?>\n'