[Python-checkins] r81605 - in python/branches/release31-maint: Modules/config.c.in (original) (raw)
mark.dickinson python-checkins at python.org
Sat May 29 23:11:05 CEST 2010
- Previous message: [Python-checkins] r81604 - in python/branches/py3k: Modules/config.c.in
- Next message: [Python-checkins] distutils2: Fixed test_find_packages failing when os.path.walk() returns dirs in a
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: mark.dickinson Date: Sat May 29 23:11:05 2010 New Revision: 81605
Log: 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......... ................
Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Modules/config.c.in
Modified: python/branches/release31-maint/Modules/config.c.in
--- python/branches/release31-maint/Modules/config.c.in (original) +++ python/branches/release31-maint/Modules/config.c.in Sat May 29 23:11:05 2010 @@ -34,28 +34,28 @@ /* -- 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} };
- Previous message: [Python-checkins] r81604 - in python/branches/py3k: Modules/config.c.in
- Next message: [Python-checkins] distutils2: Fixed test_find_packages failing when os.path.walk() returns dirs in a
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]