Merge branch 'master' into doc

robotools · Dec 17, 2019 · b51457a · b51457a
2 parents c6a000f + 48dc7ad
commit b51457a
Show file tree

Hide file tree

Showing 2 changed files with 186 additions and 45 deletions.
diff --git a/Documentation/source/conf.py b/Documentation/source/conf.py
diff --git a/Lib/vanilla/vanillaBase.py b/Lib/vanilla/vanillaBase.py
@@ -24,7 +24,11 @@ class VanillaError(Exception): pass
 # OS Version Constants
 # --------------------
 
-osVersionCurrent = StrictVersion(platform.mac_ver()[0])
+macVersion = platform.mac_ver()[0]
+if platform.system() != "Darwin":
+    macVersion = "0.0"
+osVersionCurrent = StrictVersion(macVersion)
+osVersion10_15 = StrictVersion("10.15")
 osVersion10_14 = StrictVersion("10.14")
 osVersion10_13 = StrictVersion("10.13")
 osVersion10_12 = StrictVersion("10.12")