diff --git a/scour/scour.py b/scour/scour.py index ef9c7be..b27cce5 100644 --- a/scour/scour.py +++ b/scour/scour.py @@ -56,7 +56,7 @@ import re import sys import time import xml.dom.minidom -from xml.dom import Node +from xml.dom import Node, NotFoundErr from collections import namedtuple from decimal import Context, Decimal, InvalidOperation, getcontext @@ -3619,7 +3619,7 @@ def scourXmlFile(filename, options=None): for node in all_nodes: try: node.setIdAttribute('id') - except: + except NotFoundErr: pass return doc diff --git a/testscour.py b/testscour.py index 50ad4e3..060b095 100755 --- a/testscour.py +++ b/testscour.py @@ -66,7 +66,7 @@ class EmptyOptions(unittest.TestCase): try: scourString(self.MINIMAL_SVG, options) fail = False - except: + except Exception: fail = True self.assertEqual(fail, False, 'Exception when calling "scourString" with empty options object') @@ -76,7 +76,7 @@ class EmptyOptions(unittest.TestCase): try: scourXmlFile('unittests/minimal.svg', options) fail = False - except: + except Exception: fail = True self.assertEqual(fail, False, 'Exception when calling "scourXmlFile" with empty options object') @@ -91,7 +91,7 @@ class EmptyOptions(unittest.TestCase): try: start(options, input, output) fail = False - except: + except Exception: fail = True sys.stdout = stdout_temp @@ -109,7 +109,7 @@ class InvalidOptions(unittest.TestCase): try: scourXmlFile('unittests/ids-to-strip.svg', options) fail = False - except: + except Exception: fail = True self.assertEqual(fail, False, 'Exception when calling Scour with invalid options')