Merge pull request #54 from OhseyDev/patch-py3

NobodyXu · Mar 8, 2024 · c71cb99 · c71cb99
2 parents 4b1963d + 34c4315
commit c71cb99
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/Callback/python3.cc b/src/Callback/python3.cc
@@ -123,11 +123,6 @@ void Interpreter::release()
 
 static void initialize_interpreter()
 {
-    auto empty_wstr = Py_DecodeLocale_Checked("");
-
-    wchar_t* argv[] = {empty_wstr.str.get(), nullptr};
-    PySys_SetArgvEx(1, argv, 0);
-
     Module sys("sys");
 
     sys.setattr("stdin", Object::get_none());
@@ -141,8 +136,17 @@ void MainInterpreter::load_libpython3()
     if (Py_IsInitialized())
         return;
 
+    PyConfig cfg;
+    PyConfig_InitPythonConfig(&cfg);
+
     auto wstr = Py_DecodeLocale_Checked("python3");
-    Py_SetProgramName(wstr.str.get());
+    cfg.program_name = wstr.str.get();
+    /* 
+     * Depreciated in version 3.11: Py_SetProgramName(...)
+     */
+    auto empty_wstr = Py_DecodeLocale_Checked("");
+    wchar_t* argv[] = {empty_wstr.str.get(), nullptr};
+    PyConfig_SetArgv(&cfg, 1, argv);
 
     /*
      * Changed in version 3.7: Py_Initialize() now initializes the GIL.

diff --git a/src/utility.c b/src/utility.c
@@ -327,7 +327,7 @@ void visit_all_subdirs(const char *path, subdir_visiter visiter, ...)
                 // Check if it is a dir after resolution
                 if (!isdir(path, path_fd, ent->d_name))
                     break;
-                [[fallthrough]];
+		//[[fallthrough]];
 
             case DT_DIR:
                 if (strcmp(ent->d_name, ".") != 0 && strcmp(ent->d_name, "..") != 0)