Merge pull request #10363 from BrennanGit/fix-AddTool-for-wxPy4.0.0

jklymak · web-flow · commit 8d53ebf4910c · 2018-02-02T09:47:25.000-08:00
Fix to allow both old and new style wx versions
diff --git a/lib/matplotlib/backends/wx_compat.py b/lib/matplotlib/backends/wx_compat.py
@@ -11,7 +11,7 @@
                         unicode_literals)
 
 import six
-from distutils.version import StrictVersion
+from distutils.version import StrictVersion, LooseVersion
 
 missingwx = "Matplotlib backend_wx and backend_wxagg require wxPython>=2.9"
 
@@ -23,8 +23,13 @@
 except ImportError:
     raise ImportError(missingwx)
 
+try:
+    wx_version = StrictVersion(wx.VERSION_STRING)
+except ValueError:
+    wx_version = LooseVersion(wx.VERSION_STRING)
+
 # Ensure we have the correct version imported
-if StrictVersion(wx.VERSION_STRING) < StrictVersion("2.9"):
+if wx_version < str("2.9"):
     raise ImportError(missingwx)
 
 if is_phoenix:
@@ -152,7 +157,7 @@ def _AddTool(parent, wx_ids, text, bmp, tooltip_text):
     else:
         add_tool = parent.DoAddTool
 
-    if not is_phoenix or StrictVersion(wx.VERSION_STRING) >= str("4.0.0b2"):
+    if not is_phoenix or wx_version >= str("4.0.0b2"):
         # NOTE: when support for Phoenix prior to 4.0.0b2 is dropped then
         # all that is needed is this clause, and the if and else clause can
         # be removed.
