瀏覽代碼

SCons: Fix Godot detection in custom modules logic

`exec()` was not a good idea as it assumes a certain type of `version.py` file
similar to Godot's own file, which is not always a reliable assumption (see
https://github.com/godotengine/godot/pull/43057#issuecomment-777632900).

Also restores Python 2 support for the 3.2 branch.

(cherry picked from commit 75910d1e9b37dc5647a9f8883c5a2268188a2423)
Rémi Verschelde 4 年之前
父節點
當前提交
10f0be7719
共有 1 個文件被更改,包括 1 次插入3 次删除
  1. 1 3
      methods.py

+ 1 - 3
methods.py

@@ -163,9 +163,7 @@ def detect_modules(search_path, recursive=False):
         version_path = os.path.join(path, "version.py")
         if os.path.exists(version_path):
             with open(version_path) as f:
-                version = {}
-                exec(f.read(), version)
-                if version.get("short_name") == "godot":
+                if 'short_name = "godot"' in f.read():
                     return True
         return False