From: Michael R. Crusoe <crusoe@debian.org>
Subject: Fix fatal pytest.skip usage
Forwarded: https://github.com/dib-lab/khmer/pull/1917
--- khmer.orig/tests/khmer_tst_utils.py
+++ khmer/tests/khmer_tst_utils.py
@@ -187,7 +187,7 @@
             status = _runscript(scriptname, sandbox=sandbox)
         except SystemExit as err:
             status = err.code
-        except:  # pylint: disable=bare-except
+        except (OSError, ValueError, TypeError):
             traceback.print_exc(file=sys.stderr)
             status = -1
     finally:
--- khmer.orig/scripts/extract-paired-reads.py
+++ khmer/scripts/extract-paired-reads.py
@@ -167,7 +167,7 @@
     paired_fp.close()
 
     if n_pe == 0:
-        raise Exception("no paired reads!? check file formats...")
+        raise TypeError("no paired reads!? check file formats...")
 
     print('DONE; read %d sequences,'
           ' %d pairs and %d singletons' %
