From 0d9a84e0d8ab4d726ad1fdf376771e596467893d Mon Sep 17 00:00:00 2001 From: Dirk Baechle Date: Sun, 21 Jun 2020 16:21:51 +0200 Subject: Fixed another bunch of 'bare except' errors. --- test/Docbook/basedir/htmlchunked/htmlchunked.py | 2 +- test/Docbook/basedir/htmlhelp/htmlhelp.py | 2 +- test/Docbook/basedir/slideshtml/slideshtml.py | 2 +- test/Docbook/basic/epub/epub.py | 2 +- test/Docbook/basic/html/html.py | 2 +- test/Docbook/basic/htmlchunked/htmlchunked.py | 2 +- test/Docbook/basic/htmlhelp/htmlhelp.py | 2 +- test/Docbook/basic/man/man.py | 2 +- test/Docbook/basic/pdf/pdf.py | 2 +- test/Docbook/basic/slideshtml/slideshtml.py | 2 +- test/Docbook/basic/slidespdf/slidespdf.py | 2 +- test/Docbook/basic/xinclude/xinclude.py | 2 +- test/Docbook/basic/xslt/xslt.py | 2 +- test/Docbook/dependencies/xinclude/xinclude.py | 2 +- test/Docbook/rootname/htmlchunked/htmlchunked.py | 2 +- test/Docbook/rootname/htmlhelp/htmlhelp.py | 2 +- test/Docbook/rootname/slideshtml/slideshtml.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/test/Docbook/basedir/htmlchunked/htmlchunked.py b/test/Docbook/basedir/htmlchunked/htmlchunked.py index 893761c..8822487 100644 --- a/test/Docbook/basedir/htmlchunked/htmlchunked.py +++ b/test/Docbook/basedir/htmlchunked/htmlchunked.py @@ -38,7 +38,7 @@ if not (sys.platform.startswith('linux') and try: import lxml -except: +except Exception: test.skip_test('Cannot find installed Python binding for lxml, skipping test.\n') test.dir_fixture('image') diff --git a/test/Docbook/basedir/htmlhelp/htmlhelp.py b/test/Docbook/basedir/htmlhelp/htmlhelp.py index 7fbc875..171fd57 100644 --- a/test/Docbook/basedir/htmlhelp/htmlhelp.py +++ b/test/Docbook/basedir/htmlhelp/htmlhelp.py @@ -38,7 +38,7 @@ if not (sys.platform.startswith('linux') and try: import lxml -except: +except Exception: test.skip_test('Cannot find installed Python binding for lxml, skipping test.\n') test.dir_fixture('image') diff --git a/test/Docbook/basedir/slideshtml/slideshtml.py b/test/Docbook/basedir/slideshtml/slideshtml.py index de3cd83..b4bdec3 100644 --- a/test/Docbook/basedir/slideshtml/slideshtml.py +++ b/test/Docbook/basedir/slideshtml/slideshtml.py @@ -38,7 +38,7 @@ if not (sys.platform.startswith('linux') and try: import lxml -except: +except Exception: test.skip_test('Cannot find installed Python binding for lxml, skipping test.\n') test.dir_fixture('image') diff --git a/test/Docbook/basic/epub/epub.py b/test/Docbook/basic/epub/epub.py index e2b37a1..ffbde4b 100644 --- a/test/Docbook/basic/epub/epub.py +++ b/test/Docbook/basic/epub/epub.py @@ -32,7 +32,7 @@ test = TestSCons.TestSCons() try: import lxml -except: +except Exception: test.skip_test('Cannot find installed Python binding for lxml, skipping test.\n') test.dir_fixture('image') diff --git a/test/Docbook/basic/html/html.py b/test/Docbook/basic/html/html.py index d6a3114..d445b2d 100644 --- a/test/Docbook/basic/html/html.py +++ b/test/Docbook/basic/html/html.py @@ -32,7 +32,7 @@ test = TestSCons.TestSCons() try: import lxml -except: +except Exception: test.skip_test('Cannot find installed Python binding for lxml, skipping test.\n') test.dir_fixture('image') diff --git a/test/Docbook/basic/htmlchunked/htmlchunked.py b/test/Docbook/basic/htmlchunked/htmlchunked.py index 71f6265..8839915 100644 --- a/test/Docbook/basic/htmlchunked/htmlchunked.py +++ b/test/Docbook/basic/htmlchunked/htmlchunked.py @@ -32,7 +32,7 @@ test = TestSCons.TestSCons() try: import lxml -except: +except Exception: test.skip_test('Cannot find installed Python binding for lxml, skipping test.\n') test.dir_fixture('image') diff --git a/test/Docbook/basic/htmlhelp/htmlhelp.py b/test/Docbook/basic/htmlhelp/htmlhelp.py index 37c4879..e49586e 100644 --- a/test/Docbook/basic/htmlhelp/htmlhelp.py +++ b/test/Docbook/basic/htmlhelp/htmlhelp.py @@ -32,7 +32,7 @@ test = TestSCons.TestSCons() try: import lxml -except: +except Exception: test.skip_test('Cannot find installed Python binding for lxml, skipping test.\n') test.dir_fixture('image') diff --git a/test/Docbook/basic/man/man.py b/test/Docbook/basic/man/man.py index d8cd716..843e82b 100644 --- a/test/Docbook/basic/man/man.py +++ b/test/Docbook/basic/man/man.py @@ -32,7 +32,7 @@ test = TestSCons.TestSCons() try: import lxml -except: +except Exception: test.skip_test('Cannot find installed Python binding for lxml, skipping test.\n') test.dir_fixture('image') diff --git a/test/Docbook/basic/pdf/pdf.py b/test/Docbook/basic/pdf/pdf.py index 1268fde..e9bae34 100644 --- a/test/Docbook/basic/pdf/pdf.py +++ b/test/Docbook/basic/pdf/pdf.py @@ -36,7 +36,7 @@ if not fop: try: import lxml -except: +except Exception: test.skip_test('Cannot find installed Python binding for lxml, skipping test.\n') test.dir_fixture('image') diff --git a/test/Docbook/basic/slideshtml/slideshtml.py b/test/Docbook/basic/slideshtml/slideshtml.py index ae9200f..2cfe3e8 100644 --- a/test/Docbook/basic/slideshtml/slideshtml.py +++ b/test/Docbook/basic/slideshtml/slideshtml.py @@ -38,7 +38,7 @@ if not (sys.platform.startswith('linux') and try: import lxml -except: +except Exception: test.skip_test('Cannot find installed Python binding for lxml, skipping test.\n') test.dir_fixture('image') diff --git a/test/Docbook/basic/slidespdf/slidespdf.py b/test/Docbook/basic/slidespdf/slidespdf.py index 9e8f603..32e2dc4 100644 --- a/test/Docbook/basic/slidespdf/slidespdf.py +++ b/test/Docbook/basic/slidespdf/slidespdf.py @@ -42,7 +42,7 @@ if not fop: try: import lxml -except: +except Exception: test.skip_test('Cannot find installed Python binding for lxml, skipping test.\n') test.dir_fixture('image') diff --git a/test/Docbook/basic/xinclude/xinclude.py b/test/Docbook/basic/xinclude/xinclude.py index 9074f0c..ea82521 100644 --- a/test/Docbook/basic/xinclude/xinclude.py +++ b/test/Docbook/basic/xinclude/xinclude.py @@ -32,7 +32,7 @@ test = TestSCons.TestSCons() try: import lxml -except: +except Exception: test.skip_test('Cannot find installed Python binding for lxml, skipping test.\n') test.dir_fixture('image') diff --git a/test/Docbook/basic/xslt/xslt.py b/test/Docbook/basic/xslt/xslt.py index 0185423..1633766 100644 --- a/test/Docbook/basic/xslt/xslt.py +++ b/test/Docbook/basic/xslt/xslt.py @@ -32,7 +32,7 @@ test = TestSCons.TestSCons() try: import lxml -except: +except Exception: test.skip_test('Cannot find installed Python binding for lxml, skipping test.\n') test.dir_fixture('image') diff --git a/test/Docbook/dependencies/xinclude/xinclude.py b/test/Docbook/dependencies/xinclude/xinclude.py index 15c9d6a..07b050d 100644 --- a/test/Docbook/dependencies/xinclude/xinclude.py +++ b/test/Docbook/dependencies/xinclude/xinclude.py @@ -32,7 +32,7 @@ test = TestSCons.TestSCons() try: import lxml -except: +except Exception: test.skip_test('Cannot find installed Python binding for lxml, skipping test.\n') test.dir_fixture('image') diff --git a/test/Docbook/rootname/htmlchunked/htmlchunked.py b/test/Docbook/rootname/htmlchunked/htmlchunked.py index cb2bb86..b40009a 100644 --- a/test/Docbook/rootname/htmlchunked/htmlchunked.py +++ b/test/Docbook/rootname/htmlchunked/htmlchunked.py @@ -38,7 +38,7 @@ if not (sys.platform.startswith('linux') and try: import lxml -except: +except Exception: test.skip_test('Cannot find installed Python binding for lxml, skipping test.\n') test.dir_fixture('image') diff --git a/test/Docbook/rootname/htmlhelp/htmlhelp.py b/test/Docbook/rootname/htmlhelp/htmlhelp.py index 45f9d7a..c6dbcbe 100644 --- a/test/Docbook/rootname/htmlhelp/htmlhelp.py +++ b/test/Docbook/rootname/htmlhelp/htmlhelp.py @@ -38,7 +38,7 @@ if not (sys.platform.startswith('linux') and try: import lxml -except: +except Exception: test.skip_test('Cannot find installed Python binding for lxml, skipping test.\n') test.dir_fixture('image') diff --git a/test/Docbook/rootname/slideshtml/slideshtml.py b/test/Docbook/rootname/slideshtml/slideshtml.py index 3220522..2d8500e 100644 --- a/test/Docbook/rootname/slideshtml/slideshtml.py +++ b/test/Docbook/rootname/slideshtml/slideshtml.py @@ -38,7 +38,7 @@ if not (sys.platform.startswith('linux') and try: import lxml -except: +except Exception: test.skip_test('Cannot find installed Python binding for lxml, skipping test.\n') test.dir_fixture('image') -- cgit v0.12