Merge pull request beeware#748 from MisterY/jetbrains

Accept non-Android vendors as Java by default. Fixes beeware#747 (jumbo jet)
jedie · Mar 1, 2018 · f82d9e8 · f82d9e8
2 parents e2fc0d2 + 4e858ae
commit f82d9e8
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/python/common/python/platform.java b/python/common/python/platform.java
@@ -21,14 +21,10 @@ public class platform extends org.python.types.Module {
         java.lang.String platform_class_name;
         java.lang.Class platform_class;
 
-        if (vendor.equals("Oracle Corporation")) {
-            platform_class_name = "python._platform.JavaPlatform";
-        } else if (vendor.equals("The Android Project")) {
+        if (vendor.equals("The Android Project")) {
             platform_class_name = "python._platform.AndroidPlatform";
-        } else if (vendor.equals("Azul Systems, Inc.")) {
-            platform_class_name = "python._platform.JavaPlatform";
         } else {
-            throw new org.python.exceptions.RuntimeError("Unknown platform vendor '" + vendor + "'");
+            platform_class_name = "python._platform.JavaPlatform";
         }
 
         try {