diff options
| author | William Deegan <bill@baddogconsulting.com> | 2020-09-21 23:56:09 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2020-09-21 23:56:09 (GMT) |
| commit | ea642040eca864aaeac25da013cce9fd875489f0 (patch) | |
| tree | 598683129995080d80836ee16c58d881cd1e7e25 /SCons/JobTests.py | |
| parent | b0b370d20b55a7b1296f6ecbb3d45e9eb076bc1c (diff) | |
| parent | f57194667c8d8e8a3bfbfd3bd807b177758d1751 (diff) | |
| download | SCons-ea642040eca864aaeac25da013cce9fd875489f0.zip SCons-ea642040eca864aaeac25da013cce9fd875489f0.tar.gz SCons-ea642040eca864aaeac25da013cce9fd875489f0.tar.bz2 | |
Merge branch 'mwichmann-autoflake' into master
Diffstat (limited to 'SCons/JobTests.py')
| -rw-r--r-- | SCons/JobTests.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/SCons/JobTests.py b/SCons/JobTests.py index 7fc969b..33ad3f9 100644 --- a/SCons/JobTests.py +++ b/SCons/JobTests.py @@ -211,7 +211,7 @@ class Taskmaster: try: import threading self.guard = threading.Lock() - except: + except ImportError: self.guard = DummyLock() # keep track of the order tasks are begun in @@ -255,7 +255,7 @@ class ParallelTestCase(unittest.TestCase): try: import threading - except: + except ImportError: raise NoThreadsException() taskmaster = Taskmaster(num_tasks, self, RandomTask) |