summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2010-05-29 21:03:13 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2010-05-29 21:03:13 (GMT)
commit1fe418839630dbedfdcbcd038dcc2b954a508fe7 (patch)
treeaf211477d600fff3359b6969b36a52d0744a10c1 /Modules
parent0f55c32fc8837180a291352b2c7cbebe709d6736 (diff)
downloadcpython-1fe418839630dbedfdcbcd038dcc2b954a508fe7.zip
cpython-1fe418839630dbedfdcbcd038dcc2b954a508fe7.tar.gz
cpython-1fe418839630dbedfdcbcd038dcc2b954a508fe7.tar.bz2
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. ........
Diffstat (limited to 'Modules')
-rw-r--r--Modules/config.c.in35
1 files changed, 17 insertions, 18 deletions
diff --git a/Modules/config.c.in b/Modules/config.c.in
index d5ca10f..faa427a 100644
--- a/Modules/config.c.in
+++ b/Modules/config.c.in
@@ -34,33 +34,32 @@ 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", initimp},
+ /* This lives in import.c */
+ {"imp", initimp},
- /* This lives in Python/Python-ast.c */
- {"_ast", init_ast},
+ /* This lives in Python/Python-ast.c */
+ {"_ast", init_ast},
- /* These entries are here for sys.builtin_module_names */
- {"__main__", NULL},
- {"__builtin__", NULL},
- {"sys", NULL},
- {"exceptions", NULL},
+ /* These entries are here for sys.builtin_module_names */
+ {"__main__", NULL},
+ {"__builtin__", NULL},
+ {"sys", NULL},
+ {"exceptions", NULL},
- /* This lives in gcmodule.c */
- {"gc", initgc},
+ /* This lives in gcmodule.c */
+ {"gc", initgc},
- /* This lives in _warnings.c */
- {"_warnings", _PyWarnings_Init},
+ /* This lives in _warnings.c */
+ {"_warnings", _PyWarnings_Init},
- /* Sentinel */
- {0, 0}
+ /* Sentinel */
+ {0, 0}
};
#ifdef __cplusplus
}
#endif
-