mirror of
https://github.com/python/cpython
synced 2024-09-20 02:39:41 +00:00
9e896b37c7
his copy of test_contains.py seems to be broken -- the lines he deleted were already absent). Checkin messages: New Unicode support for int(), float(), complex() and long(). - new APIs PyInt_FromUnicode() and PyLong_FromUnicode() - added support for Unicode to PyFloat_FromString() - new encoding API PyUnicode_EncodeDecimal() which converts Unicode to a decimal char* string (used in the above new APIs) - shortcuts for calls like int(<int object>) and float(<float obj>) - tests for all of the above Unicode compares and contains checks: - comparing Unicode and non-string types now works; TypeErrors are masked, all other errors such as ValueError during Unicode coercion are passed through (note that PyUnicode_Compare does not implement the masking -- PyObject_Compare does this) - contains now works for non-string types too; TypeErrors are masked and 0 returned; all other errors are passed through Better testing support for the standard codecs. Misc minor enhancements, such as an alias dbcs for the mbcs codec. Changes: - PyLong_FromString() now applies the same error checks as does PyInt_FromString(): trailing garbage is reported as error and not longer silently ignored. The only characters which may be trailing the digits are 'L' and 'l' -- these are still silently ignored. - string.ato?() now directly interface to int(), long() and float(). The error strings are now a little different, but the type still remains the same. These functions are now ready to get declared obsolete ;-) - PyNumber_Int() now also does a check for embedded NULL chars in the input string; PyNumber_Long() already did this (and still does) Followed by: Looks like I've gone a step too far there... (and test_contains.py seem to have a bug too). I've changed back to reporting all errors in PyUnicode_Contains() and added a few more test cases to test_contains.py (plus corrected the join() NameError).
132 lines
3.6 KiB
C
132 lines
3.6 KiB
C
#ifndef Py_PYTHON_H
|
|
#define Py_PYTHON_H
|
|
/* Since this is a "meta-include" file, no #ifdef __cplusplus / extern "C" { */
|
|
|
|
/***********************************************************
|
|
Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
|
|
The Netherlands.
|
|
|
|
All Rights Reserved
|
|
|
|
Permission to use, copy, modify, and distribute this software and its
|
|
documentation for any purpose and without fee is hereby granted,
|
|
provided that the above copyright notice appear in all copies and that
|
|
both that copyright notice and this permission notice appear in
|
|
supporting documentation, and that the names of Stichting Mathematisch
|
|
Centrum or CWI or Corporation for National Research Initiatives or
|
|
CNRI not be used in advertising or publicity pertaining to
|
|
distribution of the software without specific, written prior
|
|
permission.
|
|
|
|
While CWI is the initial source for this software, a modified version
|
|
is made available by the Corporation for National Research Initiatives
|
|
(CNRI) at the Internet address ftp://ftp.python.org.
|
|
|
|
STICHTING MATHEMATISCH CENTRUM AND CNRI DISCLAIM ALL WARRANTIES WITH
|
|
REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
|
|
MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH
|
|
CENTRUM OR CNRI BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
|
|
DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
|
|
PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
|
|
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
PERFORMANCE OF THIS SOFTWARE.
|
|
|
|
******************************************************************/
|
|
|
|
/* Include nearly all Python header files */
|
|
|
|
#include "patchlevel.h"
|
|
#include "config.h"
|
|
|
|
/* config.h may or may not define DL_IMPORT */
|
|
#ifndef DL_IMPORT /* declarations for DLL import/export */
|
|
#define DL_IMPORT(RTYPE) RTYPE
|
|
#endif
|
|
#ifndef DL_EXPORT /* declarations for DLL import/export */
|
|
#define DL_EXPORT(RTYPE) RTYPE
|
|
#endif
|
|
|
|
#ifdef SYMANTEC__CFM68K__
|
|
#define UsingSharedLibs
|
|
#endif
|
|
|
|
#if defined(__sgi) && defined(WITH_THREAD) && !defined(_SGI_MP_SOURCE)
|
|
#define _SGI_MP_SOURCE
|
|
#endif
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
#ifdef HAVE_STDLIB_H
|
|
#include <stdlib.h>
|
|
#endif
|
|
|
|
#include "myproto.h"
|
|
|
|
#ifdef SYMANTEC__CFM68K__
|
|
#pragma lib_export on
|
|
#endif
|
|
|
|
#include "object.h"
|
|
#include "objimpl.h"
|
|
|
|
#include "pydebug.h"
|
|
|
|
#include "unicodeobject.h"
|
|
#include "intobject.h"
|
|
#include "longobject.h"
|
|
#include "floatobject.h"
|
|
#ifndef WITHOUT_COMPLEX
|
|
#include "complexobject.h"
|
|
#endif
|
|
#include "rangeobject.h"
|
|
#include "stringobject.h"
|
|
#include "bufferobject.h"
|
|
#include "tupleobject.h"
|
|
#include "listobject.h"
|
|
#include "dictobject.h"
|
|
#include "methodobject.h"
|
|
#include "moduleobject.h"
|
|
#include "funcobject.h"
|
|
#include "classobject.h"
|
|
#include "fileobject.h"
|
|
#include "cobject.h"
|
|
#include "traceback.h"
|
|
#include "sliceobject.h"
|
|
|
|
#include "codecs.h"
|
|
#include "pyerrors.h"
|
|
#include "mymalloc.h"
|
|
|
|
#include "pystate.h"
|
|
|
|
#include "modsupport.h"
|
|
#include "ceval.h"
|
|
#include "pythonrun.h"
|
|
#include "sysmodule.h"
|
|
#include "intrcheck.h"
|
|
#include "import.h"
|
|
|
|
#include "abstract.h"
|
|
|
|
#define PyArg_GetInt(v, a) PyArg_Parse((v), "i", (a))
|
|
#define PyArg_NoArgs(v) PyArg_Parse(v, "")
|
|
|
|
/* Convert a possibly signed character to a nonnegative int */
|
|
/* XXX This assumes characters are 8 bits wide */
|
|
#ifdef __CHAR_UNSIGNED__
|
|
#define Py_CHARMASK(c) (c)
|
|
#else
|
|
#define Py_CHARMASK(c) ((c) & 0xff)
|
|
#endif
|
|
|
|
#include "pyfpe.h"
|
|
|
|
/* These definitions much match corresponding definitions in graminit.h.
|
|
There's code in compile.c that checks that they are the same. */
|
|
#define Py_single_input 256
|
|
#define Py_file_input 257
|
|
#define Py_eval_input 258
|
|
|
|
#endif /* !Py_PYTHON_H */
|