From dcd51ed7832daf0151596cf103e3c33ca16e5360 Mon Sep 17 00:00:00 2001 From: Dirk Baechle Date: Sun, 21 Jun 2020 00:31:32 +0200 Subject: Replaced 'bare excepts', now catching Exception. --- SCons/Tool/docbook/__init__.py | 14 ++++++++------ bin/SConsDoc.py | 6 ------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/SCons/Tool/docbook/__init__.py b/SCons/Tool/docbook/__init__.py index c3a4610..504c853 100644 --- a/SCons/Tool/docbook/__init__.py +++ b/SCons/Tool/docbook/__init__.py @@ -55,7 +55,7 @@ db_xsl_folder = 'docbook-xsl-1.76.1' has_lxml = True try: import lxml -except: +except Exception: has_lxml = False # Set this to True, to prefer xsltproc over lxml @@ -301,8 +301,9 @@ def __build_lxml(target, source, env): try: with open(str(target[0]), "wb") as of: of.write(etree.tostring(result, encoding="utf-8", pretty_print=True)) - except: - pass + except Exception as e: + print("ERROR: Failed to write {}".format(str(target[0]))) + print(e) return None @@ -342,8 +343,9 @@ def __xinclude_lxml(target, source, env): try: doc.write(str(target[0]), xml_declaration=True, encoding="UTF-8", pretty_print=True) - except: - pass + except Exception as e: + print("ERROR: Failed to write {}".format(str(target[0]))) + print(e) return None @@ -627,7 +629,7 @@ def DocbookMan(env, target, source=None, *args, **kw): for ref in node.getElementsByTagName('refname'): outfiles.append(__get_xml_text(ref)+'.'+volnum) - except: + except Exception: # Use simple regex parsing with open(__ensure_suffix(str(s),'.xml'), 'r') as f: content = f.read() diff --git a/bin/SConsDoc.py b/bin/SConsDoc.py index d0c79ae..a2daa55 100644 --- a/bin/SConsDoc.py +++ b/bin/SConsDoc.py @@ -117,12 +117,6 @@ import sys import copy import importlib -# Do we have lxml? -try: - import lxml -except ImportError: - raise ImportError("Failed to import lxml") - try: from lxml import etree except ImportError: -- cgit v0.12