diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-11-19 20:10:53 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-11-19 20:10:53 (GMT) |
| commit | c9a9417f487beeddbf0af4e253fab3c1545207f4 (patch) | |
| tree | ae78647d50be5a62dfb3829302ef64b8e2a516f3 /Lib/test | |
| parent | 92165e6af78968d6bad2f8a7d070aa06fea8b4dd (diff) | |
| download | cpython-c9a9417f487beeddbf0af4e253fab3c1545207f4.zip cpython-c9a9417f487beeddbf0af4e253fab3c1545207f4.tar.gz cpython-c9a9417f487beeddbf0af4e253fab3c1545207f4.tar.bz2 | |
Merged revisions 86533 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r86533 | antoine.pitrou | 2010-11-19 21:07:52 +0100 (ven., 19 nov. 2010) | 3 lines
Fix test_ssl_presence when ssl is not present
........
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_xmlrpc.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_xmlrpc.py b/Lib/test/test_xmlrpc.py index 7236947..c864940 100644 --- a/Lib/test/test_xmlrpc.py +++ b/Lib/test/test_xmlrpc.py @@ -146,8 +146,8 @@ class XMLRPCTestCase(unittest.TestCase): def test_ssl_presence(self): try: import ssl - except: - have_ssl = False + except ImportError: + has_ssl = False else: has_ssl = True try: |