Ignore:
Timestamp:
Mar 19, 2014, 11:31:01 PM (11 years ago)
Author:
dmik
Message:

python: Merge vendor 2.7.6 to trunk.

Location:
python/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • python/trunk

  • python/trunk/Include/bytesobject.h

    r2 r391  
    2424#define PyBytes_DecodeEscape PyString_DecodeEscape
    2525#define _PyBytes_Join _PyString_Join
    26 #define PyBytes_Decode PyString_Decode
    27 #define PyBytes_Encode PyString_Encode
    28 #define PyBytes_AsEncodedObject PyString_AsEncodedObject
    29 #define PyBytes_AsEncodedString PyString_AsEncodedString
    30 #define PyBytes_AsDecodedObject PyString_AsDecodedObject
    31 #define PyBytes_AsDecodedString PyString_AsDecodedString
    3226#define PyBytes_AsStringAndSize PyString_AsStringAndSize
    3327#define _PyBytes_InsertThousandsGrouping _PyString_InsertThousandsGrouping
Note: See TracChangeset for help on using the changeset viewer.