[Python-checkins] r63672 - in python/trunk: Include/Python.h Include/bytearrayobject.h Include/bytesobject.h Include/pythonrun.h Include/stringobject.h Objects/bytesobject.c Objects/object.c Objects/stringobject.c Objects/unicodeobject.c Python/bltinmodule.c Python/pythonrun.c

[M.-A. Lemburg]

On 2008-05-26 14:29, christian.heimes wrote:
> Author: christian.heimes
> Date: Mon May 26 14:29:14 2008
> New Revision: 63672
> 
> Log:
> First step of the C API rename:
> renamed Include/bytesobject.h to Include/bytearrayobject.h
> renamed Include/stringobject.h to Include/bytesobject.h
> added Include/stringobject.h with aliases

I think you have those aliases backwards:

> Added: python/trunk/Include/stringobject.h
> ==============================================================================
> --- (empty file)
> +++ python/trunk/Include/stringobject.h	Mon May 26 14:29:14 2008
> @@ -0,0 +1,36 @@
> +#define PyBytesObject PyStringObject

Shouldn't this read

#define PyStringObject PyBytesObject

?

Dito for the others...

> +#define PyBytes_Type PyString_Type
> +
> +#define PyBytes_Check PyString_Check
> +#define PyBytes_CheckExact PyString_CheckExact 
> +#define PyBytes_CHECK_INTERNED PyString_CHECK_INTERNED
> +#define PyBytes_AS_STRING PyString_AS_STRING
> +#define PyBytes_GET_SIZE PyString_GET_SIZE
> +#define Py_TPFLAGS_BYTES_SUBCLASS Py_TPFLAGS_STRING_SUBCLASS
> +
> +#define PyBytes_FromStringAndSize PyString_FromStringAndSize
> +#define PyBytes_FromString PyString_FromString
> +#define PyBytes_FromFormatV PyString_FromFormatV
> +#define PyBytes_FromFormat PyString_FromFormat
> +#define PyBytes_Size PyString_Size
> +#define PyBytes_AsString PyString_AsString
> +#define PyBytes_Repr PyString_Repr
> +#define PyBytes_Concat PyString_Concat
> +#define PyBytes_ConcatAndDel PyString_ConcatAndDel
> +#define _PyBytes_Resize _PyString_Resize
> +#define _PyBytes_Eq _PyString_Eq
> +#define PyBytes_Format PyString_Format
> +#define _PyBytes_FormatLong _PyString_FormatLong
> +#define PyBytes_DecodeEscape PyString_DecodeEscape
> +#define PyBytes_InternInPlace PyString_InternInPlace
> +#define PyBytes_InternImmortal PyString_InternImmortal
> +#define PyBytes_InternFromString PyString_InternFromString
> +#define _PyBytes_Join _PyString_Join
> +#define PyBytes_Decode PyString_Decode
> +#define PyBytes_Encode PyString_Encode
> +#define PyBytes_AsEncodedObject PyString_AsEncodedObject
> +#define PyBytes_AsEncodedString PyString_AsEncodedString
> +#define PyBytes_AsDecodedObject PyString_AsDecodedObject
> +#define PyBytes_AsDecodedString PyString_AsDecodedString
> +#define PyBytes_AsStringAndSize PyString_AsStringAndSize
> +#define _PyBytes_InsertThousandsGrouping _PyString_InsertThousandsGrouping

-- 
Marc-Andre Lemburg
eGenix.com

Professional Python Services directly from the Source  (#1, May 26 2008)
 >>> Python/Zope Consulting and Support ...        http://www.egenix.com/
 >>> mxODBC.Zope.Database.Adapter ...             http://zope.egenix.com/
 >>> mxODBC, mxDateTime, mxTextTools ...        http://python.egenix.com/
________________________________________________________________________
2008-07-07: EuroPython 2008, Vilnius, Lithuania            41 days to go

:::: Try mxODBC.Zope.DA for Windows,Linux,Solaris,MacOSX for free ! ::::


    eGenix.com Software, Skills and Services GmbH  Pastor-Loeh-Str.48
     D-40764 Langenfeld, Germany. CEO Dipl.-Math. Marc-Andre Lemburg
            Registered at Amtsgericht Duesseldorf: HRB 46611