Commit a846f5ac authored by R David Murray's avatar R David Murray

#17448: Make test_sax skip if there are no xml parsers.

Patch by Rafael Santos.
parent dd246171
...@@ -3,11 +3,12 @@ ...@@ -3,11 +3,12 @@
from xml.sax import make_parser, ContentHandler, \ from xml.sax import make_parser, ContentHandler, \
SAXException, SAXReaderNotAvailable, SAXParseException SAXException, SAXReaderNotAvailable, SAXParseException
import unittest
try: try:
make_parser() make_parser()
except SAXReaderNotAvailable: except SAXReaderNotAvailable:
# don't try to test this module if we cannot create a parser # don't try to test this module if we cannot create a parser
raise ImportError("no XML parsers available") raise unittest.SkipTest("no XML parsers available")
from xml.sax.saxutils import XMLGenerator, escape, unescape, quoteattr, \ from xml.sax.saxutils import XMLGenerator, escape, unescape, quoteattr, \
XMLFilterBase XMLFilterBase
from xml.sax.expatreader import create_parser from xml.sax.expatreader import create_parser
...@@ -18,7 +19,6 @@ import os.path ...@@ -18,7 +19,6 @@ import os.path
import shutil import shutil
from test import support from test import support
from test.support import findfile, run_unittest from test.support import findfile, run_unittest
import unittest
TEST_XMLFILE = findfile("test.xml", subdir="xmltestdata") TEST_XMLFILE = findfile("test.xml", subdir="xmltestdata")
TEST_XMLFILE_OUT = findfile("test.xml.out", subdir="xmltestdata") TEST_XMLFILE_OUT = findfile("test.xml.out", subdir="xmltestdata")
......
...@@ -947,6 +947,7 @@ Rich Salz ...@@ -947,6 +947,7 @@ Rich Salz
Kevin Samborn Kevin Samborn
Adrian Sampson Adrian Sampson
Ilya Sandler Ilya Sandler
Rafael Santos
Mark Sapiro Mark Sapiro
Ty Sarna Ty Sarna
Hugh Sasse Hugh Sasse
......
...@@ -967,6 +967,9 @@ Extension Modules ...@@ -967,6 +967,9 @@ Extension Modules
Tests Tests
----- -----
- Issue #17448: test_sax now skips if there are no xml parsers available
instead of raising an ImportError.
- Issue #11420: make test suite pass with -B/DONTWRITEBYTECODE set. - Issue #11420: make test suite pass with -B/DONTWRITEBYTECODE set.
Initial patch by Thomas Wouters. Initial patch by Thomas Wouters.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment