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.
  ........
................

diff --git a/Modules/config.c.in b/Modules/config.c.in
index 5d8f5a96e83d167f6b0017f4081d8aeeddfa2e1a..3fb5dd3f4fc7f98c7d27247c16e63f9ed4fd07cf 100644 (file)
--- a/Modules/config.c.in
+++ b/Modules/config.c.in
@@ -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}
 };