Simply suppress all exceptions when attempting to resolve a version, …

…following model in CherryPy.
cherrypy · Jan 23, 2017 · 45aa7c5 · 45aa7c5 · webknjaz · Mar 3, 2017
1 parent 9771379
commit 45aa7c5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -7,6 +7,9 @@ Kept aliases for compatibility.
 #1: Corrected docstrings in :module:`cheroot.server`
 and :module:`cheroot.wsgi`.
 
+#2: Fixed ImportError when pkg_resources cannot find the
+    cheroot distribution.
+
 v5.0.1
 ======
 

diff --git a/cheroot/__init__.py b/cheroot/__init__.py
@@ -1,5 +1,10 @@
 try:
 	import pkg_resources
+except ImportError:
+	pass
+
+
+try:
 	__version__ = pkg_resources.get_distribution('cheroot').version
-except (ImportError, pkg_resources.DistributionNotFound):
+except Exception:
 	__version__ = 'unknown'