mirror of
https://github.com/python/cpython.git
synced 2025-11-09 10:01:42 +00:00
1a6387e683
svn+ssh://pythondev@svn.python.org/python/branches/trunk-bytearray
........
r61750 | christian.heimes | 2008-03-22 20:47:44 +0100 (Sat, 22 Mar 2008) | 1 line
Copied files from py3k w/o modifications
........
r61752 | christian.heimes | 2008-03-22 20:53:20 +0100 (Sat, 22 Mar 2008) | 7 lines
Take One
* Added initialization code, warnings, flags etc. to the appropriate places
* Added new buffer interface to string type
* Modified tests
* Modified Makefile.pre.in to compile the new files
* Added bytesobject.c to Python.h
........
r61754 | christian.heimes | 2008-03-22 21:22:19 +0100 (Sat, 22 Mar 2008) | 2 lines
Disabled bytearray.extend for now since it causes an infinite recursion
Fixed serveral unit tests
........
r61756 | christian.heimes | 2008-03-22 21:43:38 +0100 (Sat, 22 Mar 2008) | 5 lines
Added PyBytes support to several places:
str + bytearray
ord(bytearray)
bytearray(str, encoding)
........
r61760 | christian.heimes | 2008-03-22 21:56:32 +0100 (Sat, 22 Mar 2008) | 1 line
Fixed more unit tests related to type('') is not unicode
........
r61763 | christian.heimes | 2008-03-22 22:20:28 +0100 (Sat, 22 Mar 2008) | 2 lines
Fixed more unit tests
Fixed bytearray.extend
........
r61768 | christian.heimes | 2008-03-22 22:40:50 +0100 (Sat, 22 Mar 2008) | 1 line
Implemented old buffer interface for bytearray
........
r61772 | christian.heimes | 2008-03-22 23:24:52 +0100 (Sat, 22 Mar 2008) | 1 line
Added backport of the io module
........
r61775 | christian.heimes | 2008-03-23 03:50:49 +0100 (Sun, 23 Mar 2008) | 1 line
Fix str assignement to bytearray. Assignment of a str of size 1 is interpreted as a single byte
........
r61805 | christian.heimes | 2008-03-23 19:33:48 +0100 (Sun, 23 Mar 2008) | 3 lines
Fixed more tests
Fixed bytearray() comparsion with unicode()
Fixed iterator assignment of bytearray
........
r61809 | christian.heimes | 2008-03-23 21:02:21 +0100 (Sun, 23 Mar 2008) | 2 lines
str(bytesarray()) now returns the bytes and not the representation of the bytearray object
Enabled and fixed more unit tests
........
r61812 | christian.heimes | 2008-03-23 21:53:08 +0100 (Sun, 23 Mar 2008) | 3 lines
Clear error PyNumber_AsSsize_t() fails
Use CHARMASK for ob_svall access
disabled a test with memoryview again
........
r61819 | christian.heimes | 2008-03-23 23:05:57 +0100 (Sun, 23 Mar 2008) | 1 line
Untested updates to the PCBuild directory
........
r61917 | christian.heimes | 2008-03-26 00:57:06 +0100 (Wed, 26 Mar 2008) | 1 line
The type system of Python 2.6 has subtle differences to 3.0's. I've removed the Py_TPFLAGS_BASETYPE flags from bytearray for now. bytearray can't be subclasses until the issues with bytearray subclasses are fixed.
........
r61920 | christian.heimes | 2008-03-26 01:44:08 +0100 (Wed, 26 Mar 2008) | 2 lines
Disabled last failing test
I don't understand what the test is testing and how it suppose to work. Ka-Ping, please check it out.
........
r61930 | christian.heimes | 2008-03-26 12:46:18 +0100 (Wed, 26 Mar 2008) | 1 line
Re-enabled bytes warning code
........
r61933 | christian.heimes | 2008-03-26 13:20:46 +0100 (Wed, 26 Mar 2008) | 1 line
Fixed a bug in the new buffer protocol. The buffer slots weren't copied into a subclass.
........
r61934 | christian.heimes | 2008-03-26 13:25:09 +0100 (Wed, 26 Mar 2008) | 1 line
Re-enabled bytearray subclassing - all tests are passing.
........
174 lines
6.5 KiB
C
174 lines
6.5 KiB
C
|
|
/* Interfaces to parse and execute pieces of python code */
|
|
|
|
#ifndef Py_PYTHONRUN_H
|
|
#define Py_PYTHONRUN_H
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#define PyCF_MASK (CO_FUTURE_DIVISION | CO_FUTURE_ABSOLUTE_IMPORT | \
|
|
CO_FUTURE_WITH_STATEMENT|CO_FUTURE_PRINT_FUNCTION)
|
|
#define PyCF_MASK_OBSOLETE (CO_NESTED)
|
|
#define PyCF_SOURCE_IS_UTF8 0x0100
|
|
#define PyCF_DONT_IMPLY_DEDENT 0x0200
|
|
#define PyCF_ONLY_AST 0x0400
|
|
|
|
typedef struct {
|
|
int cf_flags; /* bitmask of CO_xxx flags relevant to future */
|
|
} PyCompilerFlags;
|
|
|
|
PyAPI_FUNC(void) Py_SetProgramName(char *);
|
|
PyAPI_FUNC(char *) Py_GetProgramName(void);
|
|
|
|
PyAPI_FUNC(void) Py_SetPythonHome(char *);
|
|
PyAPI_FUNC(char *) Py_GetPythonHome(void);
|
|
|
|
PyAPI_FUNC(void) Py_Initialize(void);
|
|
PyAPI_FUNC(void) Py_InitializeEx(int);
|
|
PyAPI_FUNC(void) Py_Finalize(void);
|
|
PyAPI_FUNC(int) Py_IsInitialized(void);
|
|
PyAPI_FUNC(PyThreadState *) Py_NewInterpreter(void);
|
|
PyAPI_FUNC(void) Py_EndInterpreter(PyThreadState *);
|
|
|
|
PyAPI_FUNC(int) PyRun_AnyFileFlags(FILE *, const char *, PyCompilerFlags *);
|
|
PyAPI_FUNC(int) PyRun_AnyFileExFlags(FILE *, const char *, int, PyCompilerFlags *);
|
|
PyAPI_FUNC(int) PyRun_SimpleStringFlags(const char *, PyCompilerFlags *);
|
|
PyAPI_FUNC(int) PyRun_SimpleFileExFlags(FILE *, const char *, int, PyCompilerFlags *);
|
|
PyAPI_FUNC(int) PyRun_InteractiveOneFlags(FILE *, const char *, PyCompilerFlags *);
|
|
PyAPI_FUNC(int) PyRun_InteractiveLoopFlags(FILE *, const char *, PyCompilerFlags *);
|
|
|
|
PyAPI_FUNC(struct _mod *) PyParser_ASTFromString(const char *, const char *,
|
|
int, PyCompilerFlags *flags,
|
|
PyArena *);
|
|
PyAPI_FUNC(struct _mod *) PyParser_ASTFromFile(FILE *, const char *, int,
|
|
char *, char *,
|
|
PyCompilerFlags *, int *,
|
|
PyArena *);
|
|
#define PyParser_SimpleParseString(S, B) \
|
|
PyParser_SimpleParseStringFlags(S, B, 0)
|
|
#define PyParser_SimpleParseFile(FP, S, B) \
|
|
PyParser_SimpleParseFileFlags(FP, S, B, 0)
|
|
PyAPI_FUNC(struct _node *) PyParser_SimpleParseStringFlags(const char *, int,
|
|
int);
|
|
PyAPI_FUNC(struct _node *) PyParser_SimpleParseFileFlags(FILE *, const char *,
|
|
int, int);
|
|
|
|
PyAPI_FUNC(PyObject *) PyRun_StringFlags(const char *, int, PyObject *,
|
|
PyObject *, PyCompilerFlags *);
|
|
|
|
PyAPI_FUNC(PyObject *) PyRun_FileExFlags(FILE *, const char *, int,
|
|
PyObject *, PyObject *, int,
|
|
PyCompilerFlags *);
|
|
|
|
#define Py_CompileString(str, p, s) Py_CompileStringFlags(str, p, s, NULL)
|
|
PyAPI_FUNC(PyObject *) Py_CompileStringFlags(const char *, const char *, int,
|
|
PyCompilerFlags *);
|
|
PyAPI_FUNC(struct symtable *) Py_SymtableString(const char *, const char *, int);
|
|
|
|
PyAPI_FUNC(void) PyErr_Print(void);
|
|
PyAPI_FUNC(void) PyErr_PrintEx(int);
|
|
PyAPI_FUNC(void) PyErr_Display(PyObject *, PyObject *, PyObject *);
|
|
|
|
PyAPI_FUNC(int) Py_AtExit(void (*func)(void));
|
|
|
|
PyAPI_FUNC(void) Py_Exit(int);
|
|
|
|
PyAPI_FUNC(int) Py_FdIsInteractive(FILE *, const char *);
|
|
|
|
/* Bootstrap */
|
|
PyAPI_FUNC(int) Py_Main(int argc, char **argv);
|
|
|
|
/* Use macros for a bunch of old variants */
|
|
#define PyRun_String(str, s, g, l) PyRun_StringFlags(str, s, g, l, NULL)
|
|
#define PyRun_AnyFile(fp, name) PyRun_AnyFileExFlags(fp, name, 0, NULL)
|
|
#define PyRun_AnyFileEx(fp, name, closeit) \
|
|
PyRun_AnyFileExFlags(fp, name, closeit, NULL)
|
|
#define PyRun_AnyFileFlags(fp, name, flags) \
|
|
PyRun_AnyFileExFlags(fp, name, 0, flags)
|
|
#define PyRun_SimpleString(s) PyRun_SimpleStringFlags(s, NULL)
|
|
#define PyRun_SimpleFile(f, p) PyRun_SimpleFileExFlags(f, p, 0, NULL)
|
|
#define PyRun_SimpleFileEx(f, p, c) PyRun_SimpleFileExFlags(f, p, c, NULL)
|
|
#define PyRun_InteractiveOne(f, p) PyRun_InteractiveOneFlags(f, p, NULL)
|
|
#define PyRun_InteractiveLoop(f, p) PyRun_InteractiveLoopFlags(f, p, NULL)
|
|
#define PyRun_File(fp, p, s, g, l) \
|
|
PyRun_FileExFlags(fp, p, s, g, l, 0, NULL)
|
|
#define PyRun_FileEx(fp, p, s, g, l, c) \
|
|
PyRun_FileExFlags(fp, p, s, g, l, c, NULL)
|
|
#define PyRun_FileFlags(fp, p, s, g, l, flags) \
|
|
PyRun_FileExFlags(fp, p, s, g, l, 0, flags)
|
|
|
|
/* In getpath.c */
|
|
PyAPI_FUNC(char *) Py_GetProgramFullPath(void);
|
|
PyAPI_FUNC(char *) Py_GetPrefix(void);
|
|
PyAPI_FUNC(char *) Py_GetExecPrefix(void);
|
|
PyAPI_FUNC(char *) Py_GetPath(void);
|
|
|
|
/* In their own files */
|
|
PyAPI_FUNC(const char *) Py_GetVersion(void);
|
|
PyAPI_FUNC(const char *) Py_GetPlatform(void);
|
|
PyAPI_FUNC(const char *) Py_GetCopyright(void);
|
|
PyAPI_FUNC(const char *) Py_GetCompiler(void);
|
|
PyAPI_FUNC(const char *) Py_GetBuildInfo(void);
|
|
PyAPI_FUNC(const char *) _Py_svnversion(void);
|
|
PyAPI_FUNC(const char *) Py_SubversionRevision(void);
|
|
PyAPI_FUNC(const char *) Py_SubversionShortBranch(void);
|
|
|
|
/* Internal -- various one-time initializations */
|
|
PyAPI_FUNC(PyObject *) _PyBuiltin_Init(void);
|
|
PyAPI_FUNC(PyObject *) _PySys_Init(void);
|
|
PyAPI_FUNC(void) _PyImport_Init(void);
|
|
PyAPI_FUNC(void) _PyExc_Init(void);
|
|
PyAPI_FUNC(void) _PyImportHooks_Init(void);
|
|
PyAPI_FUNC(int) _PyFrame_Init(void);
|
|
PyAPI_FUNC(int) _PyInt_Init(void);
|
|
PyAPI_FUNC(void) _PyFloat_Init(void);
|
|
PyAPI_FUNC(int) PyBytes_Init(void);
|
|
|
|
/* Various internal finalizers */
|
|
PyAPI_FUNC(void) _PyExc_Fini(void);
|
|
PyAPI_FUNC(void) _PyImport_Fini(void);
|
|
PyAPI_FUNC(void) PyMethod_Fini(void);
|
|
PyAPI_FUNC(void) PyFrame_Fini(void);
|
|
PyAPI_FUNC(void) PyCFunction_Fini(void);
|
|
PyAPI_FUNC(void) PyDict_Fini(void);
|
|
PyAPI_FUNC(void) PyTuple_Fini(void);
|
|
PyAPI_FUNC(void) PyList_Fini(void);
|
|
PyAPI_FUNC(void) PySet_Fini(void);
|
|
PyAPI_FUNC(void) PyString_Fini(void);
|
|
PyAPI_FUNC(void) PyInt_Fini(void);
|
|
PyAPI_FUNC(void) PyFloat_Fini(void);
|
|
PyAPI_FUNC(void) PyOS_FiniInterrupts(void);
|
|
PyAPI_FUNC(void) PyBytes_Fini(void);
|
|
|
|
/* Stuff with no proper home (yet) */
|
|
PyAPI_FUNC(char *) PyOS_Readline(FILE *, FILE *, char *);
|
|
PyAPI_DATA(int) (*PyOS_InputHook)(void);
|
|
PyAPI_DATA(char) *(*PyOS_ReadlineFunctionPointer)(FILE *, FILE *, char *);
|
|
PyAPI_DATA(PyThreadState*) _PyOS_ReadlineTState;
|
|
|
|
/* Stack size, in "pointers" (so we get extra safety margins
|
|
on 64-bit platforms). On a 32-bit platform, this translates
|
|
to a 8k margin. */
|
|
#define PYOS_STACK_MARGIN 2048
|
|
|
|
#if defined(WIN32) && !defined(MS_WIN64) && defined(_MSC_VER)
|
|
/* Enable stack checking under Microsoft C */
|
|
#define USE_STACKCHECK
|
|
#endif
|
|
|
|
#ifdef USE_STACKCHECK
|
|
/* Check that we aren't overflowing our stack */
|
|
PyAPI_FUNC(int) PyOS_CheckStack(void);
|
|
#endif
|
|
|
|
/* Signals */
|
|
typedef void (*PyOS_sighandler_t)(int);
|
|
PyAPI_FUNC(PyOS_sighandler_t) PyOS_getsig(int);
|
|
PyAPI_FUNC(PyOS_sighandler_t) PyOS_setsig(int, PyOS_sighandler_t);
|
|
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
#endif /* !Py_PYTHONRUN_H */
|