Merged revisions 88517 via svnmerge from

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

........
  r88517 | victor.stinner | 2011-02-23 00:38:34 +0100 (mer., 23 févr. 2011) | 1 line

  Issue #3080: document encoding used by import functions
........

diff --git a/Include/import.h b/Include/import.h
index 2df94ff11ca87a1b43773f58283a6d340154b454..400e97cefe2449bb5fcc9252f0e5958343a5af63 100644 (file)
--- a/Include/import.h
+++ b/Include/import.h
@@ -9,26 +9,49 @@ extern "C" {
 
 PyAPI_FUNC(long) PyImport_GetMagicNumber(void);
 PyAPI_FUNC(const char *) PyImport_GetMagicTag(void);
-PyAPI_FUNC(PyObject *) PyImport_ExecCodeModule(char *name, PyObject *co);
+PyAPI_FUNC(PyObject *) PyImport_ExecCodeModule(
+    char *name,                 /* UTF-8 encoded string */
+    PyObject *co
+    );
 PyAPI_FUNC(PyObject *) PyImport_ExecCodeModuleEx(
-       char *name, PyObject *co, char *pathname);
+    char *name,                 /* UTF-8 encoded string */
+    PyObject *co,
+    char *pathname              /* decoded from the filesystem encoding */
+    );
 PyAPI_FUNC(PyObject *) PyImport_ExecCodeModuleWithPathnames(
-       char *name, PyObject *co, char *pathname, char *cpathname);
+    char *name,                 /* UTF-8 encoded string */
+    PyObject *co,
+    char *pathname,             /* decoded from the filesystem encoding */
+    char *cpathname             /* decoded from the filesystem encoding */
+    );
 PyAPI_FUNC(PyObject *) PyImport_GetModuleDict(void);
-PyAPI_FUNC(PyObject *) PyImport_AddModule(const char *name);
-PyAPI_FUNC(PyObject *) PyImport_ImportModule(const char *name);
-PyAPI_FUNC(PyObject *) PyImport_ImportModuleNoBlock(const char *);
-PyAPI_FUNC(PyObject *) PyImport_ImportModuleLevel(char *name,
-       PyObject *globals, PyObject *locals, PyObject *fromlist, int level);
+PyAPI_FUNC(PyObject *) PyImport_AddModule(
+    const char *name            /* UTF-8 encoded string */
+    );
+PyAPI_FUNC(PyObject *) PyImport_ImportModule(
+    const char *name            /* UTF-8 encoded string */
+    );
+PyAPI_FUNC(PyObject *) PyImport_ImportModuleNoBlock(
+    const char *name            /* UTF-8 encoded string */
+    );
+PyAPI_FUNC(PyObject *) PyImport_ImportModuleLevel(
+    char *name,                 /* UTF-8 encoded string */
+    PyObject *globals,
+    PyObject *locals,
+    PyObject *fromlist,
+    int level
+    );
 
 #define PyImport_ImportModuleEx(n, g, l, f) \
-       PyImport_ImportModuleLevel(n, g, l, f, -1)
+    PyImport_ImportModuleLevel(n, g, l, f, -1)
 
 PyAPI_FUNC(PyObject *) PyImport_GetImporter(PyObject *path);
 PyAPI_FUNC(PyObject *) PyImport_Import(PyObject *name);
 PyAPI_FUNC(PyObject *) PyImport_ReloadModule(PyObject *m);
 PyAPI_FUNC(void) PyImport_Cleanup(void);
-PyAPI_FUNC(int) PyImport_ImportFrozenModule(char *);
+PyAPI_FUNC(int) PyImport_ImportFrozenModule(
+    char *name                  /* UTF-8 encoded string */
+    );
 
 #ifndef Py_LIMITED_API
 #ifdef WITH_THREAD
@@ -41,9 +64,14 @@ PyAPI_FUNC(int) _PyImport_ReleaseLock(void);
 
 PyAPI_FUNC(void) _PyImport_ReInitLock(void);
 
-PyAPI_FUNC(PyObject *)_PyImport_FindBuiltin(char *);
+PyAPI_FUNC(PyObject *)_PyImport_FindBuiltin(
+    char *name                  /* UTF-8 encoded string */
+    );
 PyAPI_FUNC(PyObject *)_PyImport_FindExtensionUnicode(char *, PyObject *);
-PyAPI_FUNC(int)_PyImport_FixupBuiltin(PyObject*, char *);
+PyAPI_FUNC(int)_PyImport_FixupBuiltin(
+    PyObject *mod,
+    char *name                  /* UTF-8 encoded string */
+    );
 PyAPI_FUNC(int)_PyImport_FixupExtensionUnicode(PyObject*, char *, PyObject *);
 
 struct _inittab {
@@ -56,11 +84,14 @@ PyAPI_FUNC(int) PyImport_ExtendInittab(struct _inittab *newtab);
 
 PyAPI_DATA(PyTypeObject) PyNullImporter_Type;
 
-PyAPI_FUNC(int) PyImport_AppendInittab(const char *name, PyObject* (*initfunc)(void));
+PyAPI_FUNC(int) PyImport_AppendInittab(
+    const char *name,           /* ASCII encoded string */
+    PyObject* (*initfunc)(void)
+    );
 
 #ifndef Py_LIMITED_API
 struct _frozen {
-    char *name;
+    char *name;                 /* ASCII encoded string */
     unsigned char *code;
     int size;
 };

diff --git a/Include/moduleobject.h b/Include/moduleobject.h
index 338cf4bb93acbf7dcfedd155b45663be4aade7fe..7b2bf1c144ecbca4d482656efc81851e5496af34 100644 (file)
--- a/Include/moduleobject.h
+++ b/Include/moduleobject.h
@@ -12,7 +12,9 @@ PyAPI_DATA(PyTypeObject) PyModule_Type;
 #define PyModule_Check(op) PyObject_TypeCheck(op, &PyModule_Type)
 #define PyModule_CheckExact(op) (Py_TYPE(op) == &PyModule_Type)
 
-PyAPI_FUNC(PyObject *) PyModule_New(const char *);
+PyAPI_FUNC(PyObject *) PyModule_New(
+    const char *name            /* UTF-8 encoded string */
+    );
 PyAPI_FUNC(PyObject *) PyModule_GetDict(PyObject *);
 PyAPI_FUNC(const char *) PyModule_GetName(PyObject *);
 PyAPI_FUNC(const char *) PyModule_GetFilename(PyObject *);

diff --git a/Include/pycapsule.h b/Include/pycapsule.h
index eba82ee0b24fd970bcb87699c929c3eaa5b89fa6..d9ecda7a4b6e4a1f26500770e79b7996425d3832 100644 (file)
--- a/Include/pycapsule.h
+++ b/Include/pycapsule.h
@@ -48,7 +48,9 @@ PyAPI_FUNC(int) PyCapsule_SetName(PyObject *capsule, const char *name);
 
 PyAPI_FUNC(int) PyCapsule_SetContext(PyObject *capsule, void *context);
 
-PyAPI_FUNC(void *) PyCapsule_Import(const char *name, int no_block);
+PyAPI_FUNC(void *) PyCapsule_Import(
+    const char *name,           /* UTF-8 encoded string */
+    int no_block);
 
 
 #ifdef __cplusplus