[Python-3000-checkins] r64109 - python/branches/py3k/PC/config.c
martin.v.loewis
python-3000-checkins at python.org
Wed Jun 11 07:48:29 CEST 2008
Author: martin.v.loewis
Date: Wed Jun 11 07:48:29 2008
New Revision: 64109
Log:
Update to PEP 3121.
Modified:
python/branches/py3k/PC/config.c
Modified: python/branches/py3k/PC/config.c
==============================================================================
--- python/branches/py3k/PC/config.c (original)
+++ python/branches/py3k/PC/config.c Wed Jun 11 07:48:29 2008
@@ -5,133 +5,134 @@
#include "Python.h"
-extern void initarray(void);
+extern PyObject* PyInit_array(void);
#ifndef MS_WINI64
-extern void initaudioop(void);
+extern PyObject* PyInit_audioop(void);
#endif
-extern void initbinascii(void);
-extern void initcmath(void);
-extern void initerrno(void);
-extern void initgc(void);
-extern void initmath(void);
-extern void init_md5(void);
-extern void initnt(void);
-extern void initoperator(void);
-extern void initsignal(void);
-extern void init_sha1(void);
-extern void init_sha256(void);
-extern void init_sha512(void);
-extern void inittime(void);
-extern void init_thread(void);
+extern PyObject* PyInit_binascii(void);
+extern PyObject* PyInit_cmath(void);
+extern PyObject* PyInit_errno(void);
+extern PyObject* PyInit_gc(void);
+extern PyObject* PyInit_math(void);
+extern PyObject* PyInit__md5(void);
+extern PyObject* PyInit_nt(void);
+extern PyObject* PyInit_operator(void);
+extern PyObject* PyInit_signal(void);
+extern PyObject* PyInit__sha1(void);
+extern PyObject* PyInit__sha256(void);
+extern PyObject* PyInit__sha512(void);
+extern PyObject* PyInit_time(void);
+extern PyObject* PyInit__thread(void);
+extern PyObject* PyInit_cStringIO(void);
#ifdef WIN32
-extern void initmsvcrt(void);
-extern void init_locale(void);
+extern PyObject* PyInit_msvcrt(void);
+extern PyObject* PyInit__locale(void);
#endif
-extern void init_codecs(void);
-extern void init_weakref(void);
-extern void initxxsubtype(void);
-extern void initzipimport(void);
-extern void init_random(void);
-extern void inititertools(void);
-extern void init_collections(void);
-extern void init_heapq(void);
-extern void init_bisect(void);
-extern void init_symtable(void);
-extern void initmmap(void);
-extern void init_csv(void);
-extern void init_sre(void);
-extern void initparser(void);
-extern void initwinreg(void);
-extern void init_struct(void);
-extern void initdatetime(void);
-extern void init_functools(void);
-extern void init_json(void);
-extern void initzlib(void);
-
-extern void init_multibytecodec(void);
-extern void init_codecs_cn(void);
-extern void init_codecs_hk(void);
-extern void init_codecs_iso2022(void);
-extern void init_codecs_jp(void);
-extern void init_codecs_kr(void);
-extern void init_codecs_tw(void);
-extern void init_subprocess(void);
-extern void init_lsprof(void);
-extern void init_ast(void);
-extern void init_fileio(void);
-extern void init_bytesio(void);
-extern void initatexit(void);
-extern void _PyWarnings_Init(void);
+extern PyObject* PyInit__codecs(void);
+extern PyObject* PyInit__weakref(void);
+extern PyObject* PyInit_xxsubtype(void);
+extern PyObject* PyInit_zipimport(void);
+extern PyObject* PyInit__random(void);
+extern PyObject* PyInit_itertools(void);
+extern PyObject* PyInit__collections(void);
+extern PyObject* PyInit__heapq(void);
+extern PyObject* PyInit__bisect(void);
+extern PyObject* PyInit__symtable(void);
+extern PyObject* PyInit_mmap(void);
+extern PyObject* PyInit__csv(void);
+extern PyObject* PyInit__sre(void);
+extern PyObject* PyInit_parser(void);
+extern PyObject* PyInit_winreg(void);
+extern PyObject* PyInit__struct(void);
+extern PyObject* PyInit_datetime(void);
+extern PyObject* PyInit__functools(void);
+extern PyObject* PyInit__json(void);
+extern PyObject* PyInit_zlib(void);
+
+extern PyObject* PyInit__multibytecodec(void);
+extern PyObject* PyInit__codecs_cn(void);
+extern PyObject* PyInit__codecs_hk(void);
+extern PyObject* PyInit__codecs_iso2022(void);
+extern PyObject* PyInit__codecs_jp(void);
+extern PyObject* PyInit__codecs_kr(void);
+extern PyObject* PyInit__codecs_tw(void);
+extern PyObject* PyInit__subprocess(void);
+extern PyObject* PyInit__lsprof(void);
+extern PyObject* PyInit__ast(void);
+extern PyObject* PyInit__fileio(void);
+extern PyObject* PyInit__bytesio(void);
+extern PyObject* PyInit_atexit(void);
+extern PyObject* _PyWarnings_Init(void);
/* tools/freeze/makeconfig.py marker for additional "extern" */
/* -- ADDMODULE MARKER 1 -- */
-extern void PyMarshal_Init(void);
-extern void initimp(void);
+extern PyObject* PyMarshal_Init(void);
+extern PyObject* PyInit_imp(void);
struct _inittab _PyImport_Inittab[] = {
- {"array", initarray},
- {"_ast", init_ast},
+ {"array", PyInit_array},
+ {"_ast", PyInit__ast},
#ifdef MS_WINDOWS
#ifndef MS_WINI64
- {"audioop", initaudioop},
+ {"audioop", PyInit_audioop},
#endif
#endif
- {"binascii", initbinascii},
- {"cmath", initcmath},
- {"errno", initerrno},
- {"gc", initgc},
- {"math", initmath},
- {"nt", initnt}, /* Use the NT os functions, not posix */
- {"operator", initoperator},
- {"signal", initsignal},
- {"_md5", init_md5},
- {"_sha1", init_sha1},
- {"_sha256", init_sha256},
- {"_sha512", init_sha512},
- {"time", inittime},
+ {"binascii", PyInit_binascii},
+ {"cmath", PyInit_cmath},
+ {"errno", PyInit_errno},
+ {"gc", PyInit_gc},
+ {"math", PyInit_math},
+ {"nt", PyInit_nt}, /* Use the NT os functions, not posix */
+ {"operator", PyInit_operator},
+ {"signal", PyInit_signal},
+ {"_md5", PyInit__md5},
+ {"_sha1", PyInit__sha1},
+ {"_sha256", PyInit__sha256},
+ {"_sha512", PyInit__sha512},
+ {"time", PyInit_time},
#ifdef WITH_THREAD
- {"_thread", init_thread},
+ {"_thread", PyInit__thread},
#endif
#ifdef WIN32
- {"msvcrt", initmsvcrt},
- {"_locale", init_locale},
+ {"msvcrt", PyInit_msvcrt},
+ {"_locale", PyInit__locale},
#endif
/* XXX Should _subprocess go in a WIN32 block? not WIN64? */
- {"_subprocess", init_subprocess},
+ {"_subprocess", PyInit__subprocess},
- {"_codecs", init_codecs},
- {"_weakref", init_weakref},
- {"_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", initwinreg},
- {"_struct", init_struct},
- {"datetime", initdatetime},
- {"_functools", init_functools},
- {"_json", init_json},
-
- {"xxsubtype", initxxsubtype},
- {"zipimport", initzipimport},
- {"zlib", initzlib},
+ {"_codecs", PyInit__codecs},
+ {"_weakref", PyInit__weakref},
+ {"_random", PyInit__random},
+ {"_bisect", PyInit__bisect},
+ {"_heapq", PyInit__heapq},
+ {"_lsprof", PyInit__lsprof},
+ {"itertools", PyInit_itertools},
+ {"_collections", PyInit__collections},
+ {"_symtable", PyInit__symtable},
+ {"mmap", PyInit_mmap},
+ {"_csv", PyInit__csv},
+ {"_sre", PyInit__sre},
+ {"parser", PyInit_parser},
+ {"winreg", PyInit_winreg},
+ {"_struct", PyInit__struct},
+ {"datetime", PyInit_datetime},
+ {"_functools", PyInit__functools},
+ {"_json", PyInit__json},
+
+ {"xxsubtype", PyInit_xxsubtype},
+ {"zipimport", PyInit_zipimport},
+ {"zlib", PyInit_zlib},
/* 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},
+ {"_multibytecodec", PyInit__multibytecodec},
+ {"_codecs_cn", PyInit__codecs_cn},
+ {"_codecs_hk", PyInit__codecs_hk},
+ {"_codecs_iso2022", PyInit__codecs_iso2022},
+ {"_codecs_jp", PyInit__codecs_jp},
+ {"_codecs_kr", PyInit__codecs_kr},
+ {"_codecs_tw", PyInit__codecs_tw},
/* tools/freeze/makeconfig.py marker for additional "_inittab" entries */
/* -- ADDMODULE MARKER 2 -- */
@@ -140,7 +141,7 @@
{"marshal", PyMarshal_Init},
/* This lives it with import.c */
- {"imp", initimp},
+ {"imp", PyInit_imp},
/* These entries are here for sys.builtin_module_names */
{"__main__", NULL},
@@ -148,9 +149,9 @@
{"sys", NULL},
{"_warnings", _PyWarnings_Init},
- {"_fileio", init_fileio},
- {"_bytesio", init_bytesio},
- {"atexit", initatexit},
+ {"_fileio", PyInit__fileio},
+ {"_bytesio", PyInit__bytesio},
+ {"atexit", PyInit_atexit},
/* Sentinel */
{0, 0}
More information about the Python-3000-checkins
mailing list