Fixed import try/except in tests so that pypy doesn't immediately choke

tests/conftest.py

@@ -4,7 +4,7 @@ import pytest
 import glob
 try:
     import gpg
-except (ModuleNotFoundError, NameError):
+except ImportError:
     gpg = None
 import os
 import sys

tests/test_05_actions.py

@@ -8,7 +8,7 @@ import copy
 import glob
 try:
     import gpg
-except (ModuleNotFoundError, NameError):
+except ImportError:
     gpg = None
 import itertools
 import os

tests/test_99_regressions.py

@@ -4,7 +4,7 @@ from conftest import gpg_ver, gnupghome
 
 try:
     import gpg
-except (ModuleNotFoundError, NameError):
+except ImportError:
     gpg = None
 import os
 import datetime