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

Patch by Rafael Santos.
This commit is contained in:
R David Murray 2013-03-18 00:20:43 -04:00
commit f3a1b6efe0
3 changed files with 6 additions and 2 deletions

View File

@ -3,11 +3,12 @@
from xml.sax import make_parser, ContentHandler, \
SAXException, SAXReaderNotAvailable, SAXParseException
import unittest
try:
make_parser()
except SAXReaderNotAvailable:
# 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, \
XMLFilterBase
from xml.sax.expatreader import create_parser
@ -18,7 +19,6 @@ import os.path
import shutil
from test import support
from test.support import findfile, run_unittest
import unittest
TEST_XMLFILE = findfile("test.xml", subdir="xmltestdata")
TEST_XMLFILE_OUT = findfile("test.xml.out", subdir="xmltestdata")

View File

@ -1050,6 +1050,7 @@ Kevin Samborn
Adrian Sampson
James Sanders
Ilya Sandler
Rafael Santos
Mark Sapiro
Ty Sarna
Hugh Sasse

View File

@ -659,6 +659,9 @@ Issue #16880: Do not assume _imp.load_dynamic() is defined in the imp module.
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.
Initial patch by Thomas Wouters.