Don't break if pkg_resources.require() fails.

kalxas · Oct 18, 2006 · 7a59668 · 7a59668
1 parent e456bd2
commit 7a59668
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/tests/runalldoctests.py b/tests/runalldoctests.py
@@ -2,7 +2,10 @@
 import glob
 import pkg_resources
 
-pkg_resources.require('OWSLib')
+try:
+    pkg_resources.require('OWSLib')
+except (ImportError, pkg_resources.DistributionNotFound):
+    pass
 
 testfiles = glob.glob('*WFS*.txt')
 

diff --git a/tests/testWFSReader.py b/tests/testWFSReader.py
@@ -28,7 +28,7 @@
 try:
     import pkg_resources
     pkg_resources.require('OWSLib')
-except ImportError:
+except (ImportError, pkg_resources.DistributionNotFound):
     pass
 
 from owslib.wfs import WFSCapabilitiesReader, nspath, OGC_NAMESPACE

diff --git a/tests/testWMSReader.py b/tests/testWMSReader.py
@@ -25,7 +25,7 @@
 try:
     import pkg_resources
     pkg_resources.require('OWSLib')
-except ImportError:
+except (ImportError, pkg_resources.DistributionNotFound):
     pass
 
 from owslib.wms import WMSCapabilitiesReader