mirror of
https://github.com/python/cpython.git
synced 2025-10-26 11:14:33 +00:00
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r55985 | neal.norwitz | 2007-06-14 20:14:38 -0700 (Thu, 14 Jun 2007) | 2 lines
All these tests have been flaky wrt reporting leaks. Disable them.
................
r56003 | neal.norwitz | 2007-06-15 19:41:09 -0700 (Fri, 15 Jun 2007) | 1 line
Fix typo (certain).
................
r56004 | neal.norwitz | 2007-06-15 20:54:18 -0700 (Fri, 15 Jun 2007) | 4 lines
Fix it so test_os no longer reports ref leaks by clearing all the caches
the ABCMeta stores on the class. Apply this to all the ABC collections
as well as the class of os.environ which inherits from an ABC collection.
................
r56013 | neal.norwitz | 2007-06-17 19:56:31 -0700 (Sun, 17 Jun 2007) | 4 lines
This should make it a little easier when adding new collections which use ABCs.
The new subclass won't need to be listed in regrtest.
It will be even better when Guido adds weakrefs. :-)
................
r56014 | martin.v.loewis | 2007-06-17 20:15:51 -0700 (Sun, 17 Jun 2007) | 1 line
Drop inline, as it's not support by VS 2003.
................
r56015 | martin.v.loewis | 2007-06-17 20:17:19 -0700 (Sun, 17 Jun 2007) | 1 line
Expect long objects for DWORD values.
................
r56016 | martin.v.loewis | 2007-06-17 20:18:01 -0700 (Sun, 17 Jun 2007) | 1 line
Drop modules that have been deleted.
................
r56017 | martin.v.loewis | 2007-06-17 20:18:55 -0700 (Sun, 17 Jun 2007) | 1 line
Bump DLL version number to 30.
................
r56018 | neal.norwitz | 2007-06-17 20:55:43 -0700 (Sun, 17 Jun 2007) | 62 lines
Merged revisions 55951-56013 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55956 | thomas.heller | 2007-06-13 00:07:03 -0700 (Wed, 13 Jun 2007) | 2 lines
Do not hardcode the buildbot's directory name.
........
r55957 | thomas.heller | 2007-06-13 00:07:41 -0700 (Wed, 13 Jun 2007) | 2 lines
Notes about building tcl/tk for windows/AMD64.
........
r55958 | thomas.heller | 2007-06-13 00:54:57 -0700 (Wed, 13 Jun 2007) | 2 lines
Build bzip2.
........
r55962 | walter.doerwald | 2007-06-13 09:57:12 -0700 (Wed, 13 Jun 2007) | 8 lines
Add T_PYSSIZET in structmember.h: This can be used for
Py_ssize_t members.
Simplify the implementation of UnicodeError objects:
start and end attributes are now stored directly as
Py_ssize_t members, which simplifies various get and
set functions.
........
r55975 | martin.v.loewis | 2007-06-14 13:46:25 -0700 (Thu, 14 Jun 2007) | 3 lines
Patch #1734014: Use _I64_MAX instead of LLONG_MAX.
Will backport to 2.5.
........
r55984 | neal.norwitz | 2007-06-14 20:11:41 -0700 (Thu, 14 Jun 2007) | 4 lines
urllib2_localnet says it leaks probably due to threads. So ignore it.
popen2 is also complaining probably for similar reasons.
make install always reports failure, so don't mail in this case.
........
r56001 | andrew.kuchling | 2007-06-15 15:43:03 -0700 (Fri, 15 Jun 2007) | 1 line
Add a word
........
r56005 | martin.v.loewis | 2007-06-16 03:08:43 -0700 (Sat, 16 Jun 2007) | 2 lines
Mention Senthil Kumaran.
........
r56006 | georg.brandl | 2007-06-16 10:10:12 -0700 (Sat, 16 Jun 2007) | 2 lines
Add missing \versionadded.
........
r56009 | neal.norwitz | 2007-06-17 11:48:32 -0700 (Sun, 17 Jun 2007) | 1 line
SF #1738670, make example in doc work
........
r56011 | neal.norwitz | 2007-06-17 19:46:36 -0700 (Sun, 17 Jun 2007) | 1 line
SF #1738754, remove extra backslash in string
........
r56012 | neal.norwitz | 2007-06-17 19:50:15 -0700 (Sun, 17 Jun 2007) | 1 line
Revert last change for SF #1738754, there's no print in there.
........
................
314 lines
11 KiB
C
314 lines
11 KiB
C
#ifndef Py_ERRORS_H
|
|
#define Py_ERRORS_H
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
/* Error objects */
|
|
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
PyObject *dict;
|
|
PyObject *args;
|
|
} PyBaseExceptionObject;
|
|
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
PyObject *dict;
|
|
PyObject *args;
|
|
PyObject *msg;
|
|
PyObject *filename;
|
|
PyObject *lineno;
|
|
PyObject *offset;
|
|
PyObject *text;
|
|
PyObject *print_file_and_line;
|
|
} PySyntaxErrorObject;
|
|
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
PyObject *dict;
|
|
PyObject *args;
|
|
PyObject *encoding;
|
|
PyObject *object;
|
|
Py_ssize_t start;
|
|
Py_ssize_t end;
|
|
PyObject *reason;
|
|
} PyUnicodeErrorObject;
|
|
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
PyObject *dict;
|
|
PyObject *args;
|
|
PyObject *code;
|
|
} PySystemExitObject;
|
|
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
PyObject *dict;
|
|
PyObject *args;
|
|
PyObject *myerrno;
|
|
PyObject *strerror;
|
|
PyObject *filename;
|
|
} PyEnvironmentErrorObject;
|
|
|
|
#ifdef MS_WINDOWS
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
PyObject *dict;
|
|
PyObject *args;
|
|
PyObject *myerrno;
|
|
PyObject *strerror;
|
|
PyObject *filename;
|
|
PyObject *winerror;
|
|
} PyWindowsErrorObject;
|
|
#endif
|
|
|
|
/* Error handling definitions */
|
|
|
|
PyAPI_FUNC(void) PyErr_SetNone(PyObject *);
|
|
PyAPI_FUNC(void) PyErr_SetObject(PyObject *, PyObject *);
|
|
PyAPI_FUNC(void) PyErr_SetString(PyObject *, const char *);
|
|
PyAPI_FUNC(PyObject *) PyErr_Occurred(void);
|
|
PyAPI_FUNC(void) PyErr_Clear(void);
|
|
PyAPI_FUNC(void) PyErr_Fetch(PyObject **, PyObject **, PyObject **);
|
|
PyAPI_FUNC(void) PyErr_Restore(PyObject *, PyObject *, PyObject *);
|
|
|
|
#ifdef Py_DEBUG
|
|
#define _PyErr_OCCURRED() PyErr_Occurred()
|
|
#else
|
|
#define _PyErr_OCCURRED() (_PyThreadState_Current->curexc_type)
|
|
#endif
|
|
|
|
/* Error testing and normalization */
|
|
PyAPI_FUNC(int) PyErr_GivenExceptionMatches(PyObject *, PyObject *);
|
|
PyAPI_FUNC(int) PyErr_ExceptionMatches(PyObject *);
|
|
PyAPI_FUNC(void) PyErr_NormalizeException(PyObject**, PyObject**, PyObject**);
|
|
|
|
/* */
|
|
|
|
#define PyExceptionClass_Check(x) \
|
|
(PyType_Check((x)) && \
|
|
PyType_FastSubclass((PyTypeObject*)(x), Py_TPFLAGS_BASE_EXC_SUBCLASS))
|
|
|
|
#define PyExceptionInstance_Check(x) \
|
|
PyType_FastSubclass((x)->ob_type, Py_TPFLAGS_BASE_EXC_SUBCLASS)
|
|
|
|
#define PyExceptionClass_Name(x) \
|
|
((char *)(((PyTypeObject*)(x))->tp_name))
|
|
|
|
#define PyExceptionInstance_Class(x) ((PyObject*)((x)->ob_type))
|
|
|
|
|
|
/* Predefined exceptions */
|
|
|
|
PyAPI_DATA(PyObject *) PyExc_BaseException;
|
|
PyAPI_DATA(PyObject *) PyExc_Exception;
|
|
PyAPI_DATA(PyObject *) PyExc_StopIteration;
|
|
PyAPI_DATA(PyObject *) PyExc_GeneratorExit;
|
|
PyAPI_DATA(PyObject *) PyExc_ArithmeticError;
|
|
PyAPI_DATA(PyObject *) PyExc_LookupError;
|
|
|
|
PyAPI_DATA(PyObject *) PyExc_AssertionError;
|
|
PyAPI_DATA(PyObject *) PyExc_AttributeError;
|
|
PyAPI_DATA(PyObject *) PyExc_EOFError;
|
|
PyAPI_DATA(PyObject *) PyExc_FloatingPointError;
|
|
PyAPI_DATA(PyObject *) PyExc_EnvironmentError;
|
|
PyAPI_DATA(PyObject *) PyExc_IOError;
|
|
PyAPI_DATA(PyObject *) PyExc_OSError;
|
|
PyAPI_DATA(PyObject *) PyExc_ImportError;
|
|
PyAPI_DATA(PyObject *) PyExc_IndexError;
|
|
PyAPI_DATA(PyObject *) PyExc_KeyError;
|
|
PyAPI_DATA(PyObject *) PyExc_KeyboardInterrupt;
|
|
PyAPI_DATA(PyObject *) PyExc_MemoryError;
|
|
PyAPI_DATA(PyObject *) PyExc_NameError;
|
|
PyAPI_DATA(PyObject *) PyExc_OverflowError;
|
|
PyAPI_DATA(PyObject *) PyExc_RuntimeError;
|
|
PyAPI_DATA(PyObject *) PyExc_NotImplementedError;
|
|
PyAPI_DATA(PyObject *) PyExc_SyntaxError;
|
|
PyAPI_DATA(PyObject *) PyExc_IndentationError;
|
|
PyAPI_DATA(PyObject *) PyExc_TabError;
|
|
PyAPI_DATA(PyObject *) PyExc_ReferenceError;
|
|
PyAPI_DATA(PyObject *) PyExc_SystemError;
|
|
PyAPI_DATA(PyObject *) PyExc_SystemExit;
|
|
PyAPI_DATA(PyObject *) PyExc_TypeError;
|
|
PyAPI_DATA(PyObject *) PyExc_UnboundLocalError;
|
|
PyAPI_DATA(PyObject *) PyExc_UnicodeError;
|
|
PyAPI_DATA(PyObject *) PyExc_UnicodeEncodeError;
|
|
PyAPI_DATA(PyObject *) PyExc_UnicodeDecodeError;
|
|
PyAPI_DATA(PyObject *) PyExc_UnicodeTranslateError;
|
|
PyAPI_DATA(PyObject *) PyExc_ValueError;
|
|
PyAPI_DATA(PyObject *) PyExc_ZeroDivisionError;
|
|
#ifdef MS_WINDOWS
|
|
PyAPI_DATA(PyObject *) PyExc_WindowsError;
|
|
#endif
|
|
#ifdef __VMS
|
|
PyAPI_DATA(PyObject *) PyExc_VMSError;
|
|
#endif
|
|
|
|
PyAPI_DATA(PyObject *) PyExc_MemoryErrorInst;
|
|
|
|
/* Predefined warning categories */
|
|
PyAPI_DATA(PyObject *) PyExc_Warning;
|
|
PyAPI_DATA(PyObject *) PyExc_UserWarning;
|
|
PyAPI_DATA(PyObject *) PyExc_DeprecationWarning;
|
|
PyAPI_DATA(PyObject *) PyExc_PendingDeprecationWarning;
|
|
PyAPI_DATA(PyObject *) PyExc_SyntaxWarning;
|
|
PyAPI_DATA(PyObject *) PyExc_RuntimeWarning;
|
|
PyAPI_DATA(PyObject *) PyExc_FutureWarning;
|
|
PyAPI_DATA(PyObject *) PyExc_ImportWarning;
|
|
PyAPI_DATA(PyObject *) PyExc_UnicodeWarning;
|
|
|
|
|
|
/* Convenience functions */
|
|
|
|
PyAPI_FUNC(int) PyErr_BadArgument(void);
|
|
PyAPI_FUNC(PyObject *) PyErr_NoMemory(void);
|
|
PyAPI_FUNC(PyObject *) PyErr_SetFromErrno(PyObject *);
|
|
PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithFilenameObject(
|
|
PyObject *, PyObject *);
|
|
PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithFilename(PyObject *, char *);
|
|
#ifdef Py_WIN_WIDE_FILENAMES
|
|
PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithUnicodeFilename(
|
|
PyObject *, Py_UNICODE *);
|
|
#endif /* Py_WIN_WIDE_FILENAMES */
|
|
|
|
PyAPI_FUNC(PyObject *) PyErr_Format(PyObject *, const char *, ...);
|
|
|
|
#ifdef MS_WINDOWS
|
|
PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithFilenameObject(
|
|
int, const char *);
|
|
PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithFilename(
|
|
int, const char *);
|
|
#ifdef Py_WIN_WIDE_FILENAMES
|
|
PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithUnicodeFilename(
|
|
int, const Py_UNICODE *);
|
|
#endif /* Py_WIN_WIDE_FILENAMES */
|
|
PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErr(int);
|
|
PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithFilenameObject(
|
|
PyObject *,int, PyObject *);
|
|
PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithFilename(
|
|
PyObject *,int, const char *);
|
|
#ifdef Py_WIN_WIDE_FILENAMES
|
|
PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithUnicodeFilename(
|
|
PyObject *,int, const Py_UNICODE *);
|
|
#endif /* Py_WIN_WIDE_FILENAMES */
|
|
PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErr(PyObject *, int);
|
|
#endif /* MS_WINDOWS */
|
|
|
|
/* Export the old function so that the existing API remains available: */
|
|
PyAPI_FUNC(void) PyErr_BadInternalCall(void);
|
|
PyAPI_FUNC(void) _PyErr_BadInternalCall(char *filename, int lineno);
|
|
/* Mask the old API with a call to the new API for code compiled under
|
|
Python 2.0: */
|
|
#define PyErr_BadInternalCall() _PyErr_BadInternalCall(__FILE__, __LINE__)
|
|
|
|
/* Function to create a new exception */
|
|
PyAPI_FUNC(PyObject *) PyErr_NewException(char *name, PyObject *base,
|
|
PyObject *dict);
|
|
PyAPI_FUNC(void) PyErr_WriteUnraisable(PyObject *);
|
|
|
|
/* Issue a warning or exception */
|
|
PyAPI_FUNC(int) PyErr_WarnEx(PyObject *category, const char *msg,
|
|
Py_ssize_t stack_level);
|
|
PyAPI_FUNC(int) PyErr_WarnExplicit(PyObject *, const char *,
|
|
const char *, int,
|
|
const char *, PyObject *);
|
|
/* PyErr_Warn is only for backwards compatability and will be removed.
|
|
Use PyErr_WarnEx instead. */
|
|
#define PyErr_Warn(category, msg) PyErr_WarnEx(category, msg, 1)
|
|
|
|
/* In sigcheck.c or signalmodule.c */
|
|
PyAPI_FUNC(int) PyErr_CheckSignals(void);
|
|
PyAPI_FUNC(void) PyErr_SetInterrupt(void);
|
|
|
|
/* Support for adding program text to SyntaxErrors */
|
|
PyAPI_FUNC(void) PyErr_SyntaxLocation(const char *, int);
|
|
PyAPI_FUNC(PyObject *) PyErr_ProgramText(const char *, int);
|
|
|
|
/* The following functions are used to create and modify unicode
|
|
exceptions from C */
|
|
|
|
/* create a UnicodeDecodeError object */
|
|
PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_Create(
|
|
const char *, const char *, Py_ssize_t, Py_ssize_t, Py_ssize_t, const char *);
|
|
|
|
/* create a UnicodeEncodeError object */
|
|
PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_Create(
|
|
const char *, const Py_UNICODE *, Py_ssize_t, Py_ssize_t, Py_ssize_t, const char *);
|
|
|
|
/* create a UnicodeTranslateError object */
|
|
PyAPI_FUNC(PyObject *) PyUnicodeTranslateError_Create(
|
|
const Py_UNICODE *, Py_ssize_t, Py_ssize_t, Py_ssize_t, const char *);
|
|
|
|
/* get the encoding attribute */
|
|
PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_GetEncoding(PyObject *);
|
|
PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_GetEncoding(PyObject *);
|
|
|
|
/* get the object attribute */
|
|
PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_GetObject(PyObject *);
|
|
PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_GetObject(PyObject *);
|
|
PyAPI_FUNC(PyObject *) PyUnicodeTranslateError_GetObject(PyObject *);
|
|
|
|
/* get the value of the start attribute (the int * may not be NULL)
|
|
return 0 on success, -1 on failure */
|
|
PyAPI_FUNC(int) PyUnicodeEncodeError_GetStart(PyObject *, Py_ssize_t *);
|
|
PyAPI_FUNC(int) PyUnicodeDecodeError_GetStart(PyObject *, Py_ssize_t *);
|
|
PyAPI_FUNC(int) PyUnicodeTranslateError_GetStart(PyObject *, Py_ssize_t *);
|
|
|
|
/* assign a new value to the start attribute
|
|
return 0 on success, -1 on failure */
|
|
PyAPI_FUNC(int) PyUnicodeEncodeError_SetStart(PyObject *, Py_ssize_t);
|
|
PyAPI_FUNC(int) PyUnicodeDecodeError_SetStart(PyObject *, Py_ssize_t);
|
|
PyAPI_FUNC(int) PyUnicodeTranslateError_SetStart(PyObject *, Py_ssize_t);
|
|
|
|
/* get the value of the end attribute (the int *may not be NULL)
|
|
return 0 on success, -1 on failure */
|
|
PyAPI_FUNC(int) PyUnicodeEncodeError_GetEnd(PyObject *, Py_ssize_t *);
|
|
PyAPI_FUNC(int) PyUnicodeDecodeError_GetEnd(PyObject *, Py_ssize_t *);
|
|
PyAPI_FUNC(int) PyUnicodeTranslateError_GetEnd(PyObject *, Py_ssize_t *);
|
|
|
|
/* assign a new value to the end attribute
|
|
return 0 on success, -1 on failure */
|
|
PyAPI_FUNC(int) PyUnicodeEncodeError_SetEnd(PyObject *, Py_ssize_t);
|
|
PyAPI_FUNC(int) PyUnicodeDecodeError_SetEnd(PyObject *, Py_ssize_t);
|
|
PyAPI_FUNC(int) PyUnicodeTranslateError_SetEnd(PyObject *, Py_ssize_t);
|
|
|
|
/* get the value of the reason attribute */
|
|
PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_GetReason(PyObject *);
|
|
PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_GetReason(PyObject *);
|
|
PyAPI_FUNC(PyObject *) PyUnicodeTranslateError_GetReason(PyObject *);
|
|
|
|
/* assign a new value to the reason attribute
|
|
return 0 on success, -1 on failure */
|
|
PyAPI_FUNC(int) PyUnicodeEncodeError_SetReason(
|
|
PyObject *, const char *);
|
|
PyAPI_FUNC(int) PyUnicodeDecodeError_SetReason(
|
|
PyObject *, const char *);
|
|
PyAPI_FUNC(int) PyUnicodeTranslateError_SetReason(
|
|
PyObject *, const char *);
|
|
|
|
|
|
/* These APIs aren't really part of the error implementation, but
|
|
often needed to format error messages; the native C lib APIs are
|
|
not available on all platforms, which is why we provide emulations
|
|
for those platforms in Python/mysnprintf.c,
|
|
WARNING: The return value of snprintf varies across platforms; do
|
|
not rely on any particular behavior; eventually the C99 defn may
|
|
be reliable.
|
|
*/
|
|
#if defined(MS_WIN32) && !defined(HAVE_SNPRINTF)
|
|
# define HAVE_SNPRINTF
|
|
# define snprintf _snprintf
|
|
# define vsnprintf _vsnprintf
|
|
#endif
|
|
|
|
#include <stdarg.h>
|
|
PyAPI_FUNC(int) PyOS_snprintf(char *str, size_t size, const char *format, ...)
|
|
Py_GCC_ATTRIBUTE((format(printf, 3, 4)));
|
|
PyAPI_FUNC(int) PyOS_vsnprintf(char *str, size_t size, const char *format, va_list va)
|
|
Py_GCC_ATTRIBUTE((format(printf, 3, 0)));
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
#endif /* !Py_ERRORS_H */
|