AppPkg/Applications/Python: Get Python startup process fully working for EDK II.

[mirror_edk2.git] / AppPkg / Applications / Python / Efi / config.c

diff --git a/AppPkg/Applications/Python/Efi/config.c b/AppPkg/Applications/Python/Efi/config.c
index 98e7e2a31efc0a16552124f1e0690db34c3dfd94..60df9b4dc30a5bbc4c31bc476507791e24e77070 100644 (file)
--- a/AppPkg/Applications/Python/Efi/config.c
+++ b/AppPkg/Applications/Python/Efi/config.c
@@ -30,7 +30,7 @@ extern void initimageop(void);
 #endif\r
 extern void initmath(void);\r
 extern void init_md5(void);\r
-extern void initnt(void);\r
+extern void initedk2(void);\r
 extern void initoperator(void);\r
 extern void initsignal(void);\r
 extern void init_sha(void);\r
@@ -80,6 +80,9 @@ extern void init_ast(void);
 extern void init_io(void);\r
 extern void _PyWarnings_Init(void);\r
 \r
+extern void init_socket(void);\r
+extern void initselect(void);\r
+\r
 /* tools/freeze/makeconfig.py marker for additional "extern" */\r
 /* -- ADDMODULE MARKER 1 -- */\r
 \r
@@ -90,37 +93,60 @@ struct _inittab _PyImport_Inittab[] = {
 \r
     {"array", initarray},\r
     {"_ast", init_ast},\r
-#ifdef MS_WINDOWS\r
-#ifndef MS_WINI64\r
-    {"audioop", initaudioop},\r
-#endif\r
-#endif\r
     {"binascii", initbinascii},\r
-    //{"cmath", initcmath},\r
     {"errno", initerrno},\r
-\r
+    {"future_builtins", initfuture_builtins},\r
     {"gc", initgc},\r
     {"signal", initsignal},\r
-\r
-#if 0\r
-    {"future_builtins", initfuture_builtins},\r
-#ifndef MS_WINI64\r
-    {"imageop", initimageop},\r
-#endif\r
+    {"edk2", initedk2},\r
+    {"operator", initoperator},\r
+    {"_weakref", init_weakref},\r
     {"math", initmath},\r
+    {"time", inittime},\r
+    {"datetime", initdatetime},\r
+    {"cStringIO", initcStringIO},\r
+    {"_codecs", init_codecs},\r
+\r
+    /* CJK codecs */\r
+    {"_multibytecodec", init_multibytecodec},\r
+    {"_codecs_cn", init_codecs_cn},\r
+    {"_codecs_hk", init_codecs_hk},\r
+    {"_codecs_iso2022", init_codecs_iso2022},\r
+    {"_codecs_jp", init_codecs_jp},\r
+    {"_codecs_kr", init_codecs_kr},\r
+    {"_codecs_tw", init_codecs_tw},\r
+\r
+    {"_bisect", init_bisect},\r
     {"_md5", init_md5},\r
-    //{"nt", initnt}, /* Use the NT os functions, not posix */\r
-    {"operator", initoperator},\r
     {"_sha", init_sha},\r
     {"_sha256", init_sha256},\r
     {"_sha512", init_sha512},\r
+    {"_random", init_random},\r
+    {"_heapq", init_heapq},\r
+    {"itertools", inititertools},\r
+    {"_collections", init_collections},\r
+    {"_sre", init_sre},\r
+    {"parser", initparser},\r
+    {"_struct", init_struct},\r
+    {"cPickle", initcPickle},\r
+\r
     {"strop", initstrop},\r
-    {"time", inittime},\r
+    {"_functools", init_functools},\r
+    {"cmath", initcmath},\r
+    {"_json", init_json},\r
+\r
+    {"_socket", init_socket},\r
+    {"select", initselect},\r
+\r
+    {"xxsubtype", initxxsubtype},\r
+\r
+#if 0\r
+#ifndef MS_WINI64\r
+    {"imageop", initimageop},\r
+#endif\r
 #ifdef WITH_THREAD\r
     {"thread", initthread},\r
 #endif\r
-    {"cStringIO", initcStringIO},\r
-    {"cPickle", initcPickle},\r
 #ifdef WIN32\r
     {"msvcrt", initmsvcrt},\r
     {"_locale", init_locale},\r
@@ -128,42 +154,14 @@ struct _inittab _PyImport_Inittab[] = {
     /* XXX Should _subprocess go in a WIN32 block?  not WIN64? */\r
     //{"_subprocess", init_subprocess},\r
 \r
-    {"_codecs", init_codecs},\r
-    //{"_weakref", init_weakref},\r
     //{"_hotshot", init_hotshot},\r
-    {"_random", init_random},\r
-    {"_bisect", init_bisect},\r
-    {"_heapq", init_heapq},\r
     //{"_lsprof", init_lsprof},\r
-    {"itertools", inititertools},\r
-    {"_collections", init_collections},\r
-    {"_symtable", init_symtable},\r
     //{"mmap", initmmap},\r
-    {"_csv", init_csv},\r
-    {"_sre", init_sre},\r
-#endif\r
-\r
-    {"parser", initparser},\r
-\r
-#if 0\r
     //{"_winreg", init_winreg},\r
-    {"_struct", init_struct},\r
-    {"datetime", initdatetime},\r
-    {"_functools", init_functools},\r
-    {"_json", init_json},\r
-\r
-    {"xxsubtype", initxxsubtype},\r
-    //{"zipimport", initzipimport},\r
-    //{"zlib", initzlib},\r
-\r
-    /* CJK codecs */\r
-    {"_multibytecodec", init_multibytecodec},\r
-    {"_codecs_cn", init_codecs_cn},\r
-    {"_codecs_hk", init_codecs_hk},\r
-    {"_codecs_iso2022", init_codecs_iso2022},\r
-    {"_codecs_jp", init_codecs_jp},\r
-    {"_codecs_kr", init_codecs_kr},\r
-    {"_codecs_tw", init_codecs_tw},\r
+    {"_symtable", init_symtable},\r
+    {"_csv", init_csv},\r
+    {"zipimport", initzipimport},\r
+    {"zlib", initzlib},\r
 #endif\r
 \r
 /* tools/freeze/makeconfig.py marker for additional "_inittab" entries */\r