Attachment #862957 for bug #880651




++ b/_ruamel_yaml.pxd

cdef extern from "_ruamel_yaml.h":

    void malloc(int l)
    void memcpy(unsigned char *d, char *s, int l)
    int strlen(char *s)
    int PyString_CheckExact(object o)
    int PyUnicode_CheckExact(object o)
    char *PyString_AS_STRING(object o)
    int PyString_GET_SIZE(object o)
    object PyString_FromStringAndSize(unsigned char *v, size_t l)
    object PyUnicode_FromString(char *u)
    object PyUnicode_DecodeUTF8(unsigned char *u, size_t s, char *e)
    object PyUnicode_AsUTF8String(object o)
    int PY_MAJOR_VERSION


        YAML_MAPPING_START_EVENT
        YAML_MAPPING_END_EVENT

    ctypedef int yaml_read_handler_t(void *data, unsigned char *buffer,
            size_t size, size_t *size_read) except 0

    ctypedef int yaml_write_handler_t(void *data, unsigned char *buffer,
            size_t size) except 0

    ctypedef struct yaml_mark_t:
        int index

        char *handle
        char *suffix
    ctypedef struct _yaml_token_scalar_data_t:
        unsigned char *value
        int length
        yaml_scalar_style_t style
    ctypedef struct _yaml_token_version_directive_data_t:

    ctypedef struct _yaml_event_scalar_data_t:
        char *anchor
        char *tag
        unsigned char *value
        int length
        int plain_implicit
        int quoted_implicit
++ b/_ruamel_yaml.pyx

                raise error
        return 1

cdef int input_handler(void *data, unsigned char *buffer, size_t size, size_t *read) except 0:
    cdef CParser parser
    parser = <CParser>data
    if parser.stream_cache is None:

            self.ascend_resolver()
        return 1

cdef int output_handler(void *data, unsigned char *buffer, size_t size) except 0:
    cdef CEmitter emitter
    emitter = <CEmitter>data
    if emitter.dump_unicode == 0:

Return to bug 880651

Line Link Here

(-)file_not_specified_in_diff (-13 / +13 lines)
0	-- a/_ruamel_yaml.pxd	0	++ b/_ruamel_yaml.pxd
Lines 2-16 Link Here
2	cdef extern from "_ruamel_yaml.h":	2	cdef extern from "_ruamel_yaml.h":
3		3
4	void malloc(int l)	4	void malloc(int l)
5	void memcpy(char d, char s, int l)	5	void memcpy(unsigned char d, char s, int l)
6	int strlen(char *s)	6	int strlen(char *s)
7	int PyString_CheckExact(object o)	7	int PyString_CheckExact(object o)
8	int PyUnicode_CheckExact(object o)	8	int PyUnicode_CheckExact(object o)
9	char *PyString_AS_STRING(object o)	9	char *PyString_AS_STRING(object o)
10	int PyString_GET_SIZE(object o)	10	int PyString_GET_SIZE(object o)
11	object PyString_FromStringAndSize(char *v, int l)	11	object PyString_FromStringAndSize(unsigned char *v, size_t l)
12	object PyUnicode_FromString(char *u)	12	object PyUnicode_FromString(char *u)
13	object PyUnicode_DecodeUTF8(char u, int s, char e)	13	object PyUnicode_DecodeUTF8(unsigned char u, size_t s, char e)
14	object PyUnicode_AsUTF8String(object o)	14	object PyUnicode_AsUTF8String(object o)
15	int PY_MAJOR_VERSION	15	int PY_MAJOR_VERSION
16		16
Lines 85-95 Link Here
85	YAML_MAPPING_START_EVENT	85	YAML_MAPPING_START_EVENT
86	YAML_MAPPING_END_EVENT	86	YAML_MAPPING_END_EVENT
87		87
88	ctypedef int yaml_read_handler_t(void data, char buffer,	88	ctypedef int yaml_read_handler_t(void data, unsigned char buffer,
89	int size, int *size_read) except 0	89	size_t size, size_t *size_read) except 0
90		90
91	ctypedef int yaml_write_handler_t(void data, char buffer,	91	ctypedef int yaml_write_handler_t(void data, unsigned char buffer,
92	int size) except 0	92	size_t size) except 0
93		93
94	ctypedef struct yaml_mark_t:	94	ctypedef struct yaml_mark_t:
95	int index	95	int index
Lines 112-118 Link Here
112	char *handle	112	char *handle
113	char *suffix	113	char *suffix
114	ctypedef struct _yaml_token_scalar_data_t:	114	ctypedef struct _yaml_token_scalar_data_t:
115	char *value	115	unsigned char *value
116	int length	116	int length
117	yaml_scalar_style_t style	117	yaml_scalar_style_t style
118	ctypedef struct _yaml_token_version_directive_data_t:	118	ctypedef struct _yaml_token_version_directive_data_t:
Lines 151-157 Link Here
151	ctypedef struct _yaml_event_scalar_data_t:	151	ctypedef struct _yaml_event_scalar_data_t:
152	char *anchor	152	char *anchor
153	char *tag	153	char *tag
154	char *value	154	unsigned char *value
155	int length	155	int length
156	int plain_implicit	156	int plain_implicit
157	int quoted_implicit	157	int quoted_implicit
158	-- a/_ruamel_yaml.pyx	158	++ b/_ruamel_yaml.pyx
Lines 904-910 Link Here
904	raise error	904	raise error
905	return 1	905	return 1
906		906
907	cdef int input_handler(void data, char buffer, int size, int *read) except 0:	907	cdef int input_handler(void data, unsigned char buffer, size_t size, size_t *read) except 0:
908	cdef CParser parser	908	cdef CParser parser
909	parser = <CParser>data	909	parser = <CParser>data
910	if parser.stream_cache is None:	910	if parser.stream_cache is None:
Lines 1514-1520 Link Here
1514	self.ascend_resolver()	1514	self.ascend_resolver()
1515	return 1	1515	return 1
1516		1516
1517	cdef int output_handler(void data, char buffer, int size) except 0:	1517	cdef int output_handler(void data, unsigned char buffer, size_t size) except 0:
1518	cdef CEmitter emitter	1518	cdef CEmitter emitter
1519	emitter = <CEmitter>data	1519	emitter = <CEmitter>data
1520	if emitter.dump_unicode == 0:	1520	if emitter.dump_unicode == 0: