Merged revisions 81604 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r81604 | mark.dickinson | 2010-05-29 22:05:27 +0100 (Sat, 29 May 2010) | 9 lines

  Merged revisions 81602 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r81602 | mark.dickinson | 2010-05-29 22:00:52 +0100 (Sat, 29 May 2010) | 1 line

    Untabify Modules/config.c.in.
  ........
................
This commit is contained in:
Mark Dickinson 2010-05-29 21:11:05 +00:00
parent 3e2d67e01a
commit 53d7c14bf9

View File

@ -34,28 +34,28 @@ struct _inittab _PyImport_Inittab[] = {
/* -- ADDMODULE MARKER 2 -- */
/* This module lives in marshal.c */
{"marshal", PyMarshal_Init},
/* This module lives in marshal.c */
{"marshal", PyMarshal_Init},
/* This lives in import.c */
{"imp", PyInit_imp},
/* This lives in import.c */
{"imp", PyInit_imp},
/* This lives in Python/Python-ast.c */
{"_ast", PyInit__ast},
/* This lives in Python/Python-ast.c */
{"_ast", PyInit__ast},
/* These entries are here for sys.builtin_module_names */
{"__main__", NULL},
{"builtins", NULL},
{"sys", NULL},
/* These entries are here for sys.builtin_module_names */
{"__main__", NULL},
{"builtins", NULL},
{"sys", NULL},
/* This lives in gcmodule.c */
{"gc", PyInit_gc},
/* This lives in gcmodule.c */
{"gc", PyInit_gc},
/* This lives in _warnings.c */
{"_warnings", _PyWarnings_Init},
/* This lives in _warnings.c */
{"_warnings", _PyWarnings_Init},
/* Sentinel */
{0, 0}
/* Sentinel */
{0, 0}
};