summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2013-03-18 04:18:12 (GMT)
committerR David Murray <rdmurray@bitdance.com>2013-03-18 04:18:12 (GMT)
commita846f5ace80977f922e8295441afc668910fc894 (patch)
treeb45f7a564a9900c02bc7cfd02c9e855dd98ac6b6
parentdd246171e483afa21f12e2a961a461e0d5119ea3 (diff)
downloadcpython-a846f5ace80977f922e8295441afc668910fc894.zip
cpython-a846f5ace80977f922e8295441afc668910fc894.tar.gz
cpython-a846f5ace80977f922e8295441afc668910fc894.tar.bz2
#17448: Make test_sax skip if there are no xml parsers.
Patch by Rafael Santos.
-rw-r--r--Lib/test/test_sax.py4
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
3 files changed, 6 insertions, 2 deletions
diff --git a/Lib/test/test_sax.py b/Lib/test/test_sax.py
index bfa7d72..3efd972 100644
--- a/Lib/test/test_sax.py
+++ b/Lib/test/test_sax.py
@@ -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")
diff --git a/Misc/ACKS b/Misc/ACKS
index d8533c4..b5c8059 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -947,6 +947,7 @@ Rich Salz
Kevin Samborn
Adrian Sampson
Ilya Sandler
+Rafael Santos
Mark Sapiro
Ty Sarna
Hugh Sasse
diff --git a/Misc/NEWS b/Misc/NEWS
index c9c854d..af22318 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -967,6 +967,9 @@ Extension Modules
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.