Changeset 388 for python/vendor/current/PC/config.c

Timestamp:

Mar 19, 2014, 11:11:30 AM (11 years ago)

Author:

dmik

Message:

python: Update vendor to 2.7.6.

File:

• python/vendor/current/PC/config.c (modified) (3 diffs)

python/vendor/current/PC/config.c

@@ -53 +53 @@
 extern void init_struct(void);
 extern void initdatetime(void);
-extern void init_fileio(void);
-extern void init_bytesio(void);
 extern void init_functools(void);
 extern void init_json(void);
@@ -69 +67 @@
 extern void init_lsprof(void);
 extern void init_ast(void);
+extern void init_io(void);
 extern void _PyWarnings_Init(void);
 
@@ -79 +78 @@
 struct _inittab _PyImport_Inittab[] = {
 
-        {"array", initarray},
-        {"_ast", init_ast},
+    {"array", initarray},
+    {"_ast", init_ast},
 #ifdef MS_WINDOWS
 #ifndef MS_WINI64
-        {"audioop", initaudioop},
+    {"audioop", initaudioop},
 #endif
 #endif
-        {"binascii", initbinascii},
-        {"cmath", initcmath},
-        {"errno", initerrno},
-        {"future_builtins", initfuture_builtins},
-        {"gc", initgc},
+    {"binascii", initbinascii},
+    {"cmath", initcmath},
+    {"errno", initerrno},
+    {"future_builtins", initfuture_builtins},
+    {"gc", initgc},
 #ifndef MS_WINI64
-        {"imageop", initimageop},
+    {"imageop", initimageop},
 #endif
-        {"math", initmath},
-        {"_md5", init_md5},
-        {"nt", initnt}, /* Use the NT os functions, not posix */
-        {"operator", initoperator},
-        {"signal", initsignal},
-        {"_sha", init_sha},
-        {"_sha256", init_sha256},
-        {"_sha512", init_sha512},
-        {"strop", initstrop},
-        {"time", inittime},
+    {"math", initmath},
+    {"_md5", init_md5},
+    {"nt", initnt}, /* Use the NT os functions, not posix */
+    {"operator", initoperator},
+    {"signal", initsignal},
+    {"_sha", init_sha},
+    {"_sha256", init_sha256},
+    {"_sha512", init_sha512},
+    {"strop", initstrop},
+    {"time", inittime},
 #ifdef WITH_THREAD
-        {"thread", initthread},
+    {"thread", initthread},
 #endif
-        {"cStringIO", initcStringIO},
-        {"cPickle", initcPickle},
+    {"cStringIO", initcStringIO},
+    {"cPickle", initcPickle},
 #ifdef WIN32
-        {"msvcrt", initmsvcrt},
-        {"_locale", init_locale},
+    {"msvcrt", initmsvcrt},
+    {"_locale", init_locale},
 #endif
-        /* XXX Should _subprocess go in a WIN32 block?  not WIN64? */
-        {"_subprocess", init_subprocess},
+    /* XXX Should _subprocess go in a WIN32 block?  not WIN64? */
+    {"_subprocess", init_subprocess},
 
-        {"_codecs", init_codecs},
-        {"_weakref", init_weakref},
-        {"_hotshot", init_hotshot},
-        {"_random", init_random},
-        {"_bisect", init_bisect},
-        {"_heapq", init_heapq},
-        {"_lsprof", init_lsprof},
-        {"itertools", inititertools},
-        {"_collections", init_collections},
-        {"_symtable", init_symtable},
-        {"mmap", initmmap},
-        {"_csv", init_csv},
-        {"_sre", init_sre},
-        {"parser", initparser},
-        {"_winreg", init_winreg},
-        {"_struct", init_struct},
-        {"datetime", initdatetime},
-        {"_fileio", init_fileio},
-        {"_bytesio", init_bytesio},
-        {"_functools", init_functools},
-        {"_json", init_json},
+    {"_codecs", init_codecs},
+    {"_weakref", init_weakref},
+    {"_hotshot", init_hotshot},
+    {"_random", init_random},
+    {"_bisect", init_bisect},
+    {"_heapq", init_heapq},
+    {"_lsprof", init_lsprof},
+    {"itertools", inititertools},
+    {"_collections", init_collections},
+    {"_symtable", init_symtable},
+    {"mmap", initmmap},
+    {"_csv", init_csv},
+    {"_sre", init_sre},
+    {"parser", initparser},
+    {"_winreg", init_winreg},
+    {"_struct", init_struct},
+    {"datetime", initdatetime},
+    {"_functools", init_functools},
+    {"_json", init_json},
 
-        {"xxsubtype", initxxsubtype},
-        {"zipimport", initzipimport},
-        {"zlib", initzlib},
-        
-        /* CJK codecs */
-        {"_multibytecodec", init_multibytecodec},
-        {"_codecs_cn", init_codecs_cn},
-        {"_codecs_hk", init_codecs_hk},
-        {"_codecs_iso2022", init_codecs_iso2022},
-        {"_codecs_jp", init_codecs_jp},
-        {"_codecs_kr", init_codecs_kr},
-        {"_codecs_tw", init_codecs_tw},
+    {"xxsubtype", initxxsubtype},
+    {"zipimport", initzipimport},
+    {"zlib", initzlib},
+
+    /* CJK codecs */
+    {"_multibytecodec", init_multibytecodec},
+    {"_codecs_cn", init_codecs_cn},
+    {"_codecs_hk", init_codecs_hk},
+    {"_codecs_iso2022", init_codecs_iso2022},
+    {"_codecs_jp", init_codecs_jp},
+    {"_codecs_kr", init_codecs_kr},
+    {"_codecs_tw", init_codecs_tw},
 
 /* tools/freeze/makeconfig.py marker for additional "_inittab" entries */
 /* -- ADDMODULE MARKER 2 -- */
 
-        /* This module "lives in" with marshal.c */
-        {"marshal", PyMarshal_Init},
+    /* This module "lives in" with marshal.c */
+    {"marshal", PyMarshal_Init},
 
-        /* This lives it with import.c */
-        {"imp", initimp},
+    /* This lives it with import.c */
+    {"imp", initimp},
 
-        /* These entries are here for sys.builtin_module_names */
-        {"__main__", NULL},
-        {"__builtin__", NULL},
-        {"sys", NULL},
-        {"exceptions", NULL},
-        {"_warnings", _PyWarnings_Init},
+    /* These entries are here for sys.builtin_module_names */
+    {"__main__", NULL},
+    {"__builtin__", NULL},
+    {"sys", NULL},
+    {"exceptions", NULL},
+    {"_warnings", _PyWarnings_Init},
 
-        /* Sentinel */
-        {0, 0}
+    {"_io", init_io},
+
+    /* Sentinel */
+    {0, 0}
 };