Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
d7e76405
Commit
d7e76405
authored
Feb 22, 2011
by
Victor Stinner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #3080: document encoding used by import functions
parent
42040fb6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
51 additions
and
16 deletions
+51
-16
Include/import.h
Include/import.h
+45
-14
Include/moduleobject.h
Include/moduleobject.h
+3
-1
Include/pycapsule.h
Include/pycapsule.h
+3
-1
No files found.
Include/import.h
View file @
d7e76405
...
...
@@ -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
;
};
...
...
Include/moduleobject.h
View file @
d7e76405
...
...
@@ -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
*
);
...
...
Include/pycapsule.h
View file @
d7e76405
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment