diff --git a/cpyamf/amf0.c b/cpyamf/amf0.c index f11b3321..c888784d 100644 --- a/cpyamf/amf0.c +++ b/cpyamf/amf0.c @@ -1,4 +1,4 @@ -/* Generated by Cython 0.13 on Tue Oct 19 17:29:36 2010 */ +/* Generated by Cython 0.13 on Thu Nov 25 19:27:10 2010 */ #define PY_SSIZE_T_CLEAN #include "Python.h" @@ -163,6 +163,25 @@ #define __Pyx_PyNumber_InPlaceDivide(x,y) PyNumber_InPlaceDivide(x,y) #endif +#if (PY_MAJOR_VERSION < 3) || (PY_VERSION_HEX >= 0x03010300) + #define __Pyx_PySequence_GetSlice(obj, a, b) PySequence_GetSlice(obj, a, b) + #define __Pyx_PySequence_SetSlice(obj, a, b, value) PySequence_SetSlice(obj, a, b, value) + #define __Pyx_PySequence_DelSlice(obj, a, b) PySequence_DelSlice(obj, a, b) +#else + #define __Pyx_PySequence_GetSlice(obj, a, b) (unlikely(!(obj)) ? \ + (PyErr_SetString(PyExc_SystemError, "null argument to internal routine"), (PyObject*)0) : \ + (likely((obj)->ob_type->tp_as_mapping) ? (PySequence_GetSlice(obj, a, b)) : \ + (PyErr_Format(PyExc_TypeError, "'%.200s' object is unsliceable", (obj)->ob_type->tp_name), (PyObject*)0))) + #define __Pyx_PySequence_SetSlice(obj, a, b, value) (unlikely(!(obj)) ? \ + (PyErr_SetString(PyExc_SystemError, "null argument to internal routine"), -1) : \ + (likely((obj)->ob_type->tp_as_mapping) ? (PySequence_SetSlice(obj, a, b, value)) : \ + (PyErr_Format(PyExc_TypeError, "'%.200s' object doesn't support slice assignment", (obj)->ob_type->tp_name), -1))) + #define __Pyx_PySequence_DelSlice(obj, a, b) (unlikely(!(obj)) ? \ + (PyErr_SetString(PyExc_SystemError, "null argument to internal routine"), -1) : \ + (likely((obj)->ob_type->tp_as_mapping) ? (PySequence_DelSlice(obj, a, b)) : \ + (PyErr_Format(PyExc_TypeError, "'%.200s' object doesn't support slice deletion", (obj)->ob_type->tp_name), -1))) +#endif + #if PY_MAJOR_VERSION >= 3 #define PyMethod_New(func, self, klass) ((self) ? PyMethod_New(func, self) : PyInstanceMethod_New(func)) #endif @@ -374,7 +393,7 @@ struct __pyx_opt_args_6cpyamf_4amf0_7Encoder_writeList { int is_proxy; }; -/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":509 +/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":512 * return self.stream.write('\x00\x00\x09', 3) * * cpdef int writeObject(self, o, bint is_proxy=0) except -1: # <<<<<<<<<<<<<< @@ -1215,20 +1234,17 @@ static PyObject *__pyx_builtin_OverflowError; static PyObject *__pyx_builtin_ValueError; static PyObject *__pyx_builtin_TypeError; static PyObject *__pyx_builtin_max; -static char __pyx_k_1[] = "Bad boolean read from stream"; -static char __pyx_k_2[] = "\000\000\t"; -static char __pyx_k_3[] = "readObjectAttributes"; -static char __pyx_k_4[] = "TypedObjectClassAlias"; -static char __pyx_k_5[] = "Unknown reference %d"; -static char __pyx_k_6[] = "Unsupported ActionScript type"; -static char __pyx_k_7[] = "utf-8"; -static char __pyx_k_8[] = "expected str from xml.tostring"; -static char __pyx_k_9[] = "\000\000"; -static char __pyx_k_10[] = "getEncodableAttributes"; -static char __pyx_k_11[] = "\nC-extension for L{pyamf.amf3} Python module in L{PyAMF}.\n\n:since: 0.6\n"; -static char __pyx_k_12[] = "Encoder.writeList (line 351)"; -static char __pyx_k_13[] = "Encoder.serialiseString (line 437)"; -static char __pyx_k_14[] = "Encoder.writeObject (line 509)"; +static char __pyx_k_3[] = "Bad boolean read from stream"; +static char __pyx_k_5[] = "\000\000\t"; +static char __pyx_k_6[] = "readObjectAttributes"; +static char __pyx_k_7[] = "TypedObjectClassAlias"; +static char __pyx_k_8[] = "Unknown reference %d"; +static char __pyx_k_9[] = "Unsupported ActionScript type"; +static char __pyx_k_13[] = "utf-8"; +static char __pyx_k_15[] = "expected str from xml.tostring"; +static char __pyx_k_17[] = "\000\000"; +static char __pyx_k_18[] = "getEncodableAttributes"; +static char __pyx_k_19[] = "\nC-extension for L{pyamf.amf3} Python module in L{PyAMF}.\n\n:since: 0.6\n"; static char __pyx_k__a[] = "a"; static char __pyx_k__o[] = "o"; static char __pyx_k__max[] = "max"; @@ -1248,7 +1264,6 @@ static char __pyx_k__write[] = "write"; static char __pyx_k__encode[] = "encode"; static char __pyx_k__stream[] = "stream"; static char __pyx_k__strict[] = "strict"; -static char __pyx_k__Encoder[] = "Encoder"; static char __pyx_k__compile[] = "compile"; static char __pyx_k__context[] = "context"; static char __pyx_k__readXML[] = "readXML"; @@ -1317,20 +1332,16 @@ static char __pyx_k__UnknownClassAlias[] = "UnknownClassAlias"; static char __pyx_k__getBytesForString[] = "getBytesForString"; static char __pyx_k__getStringForBytes[] = "getStringForBytes"; static char __pyx_k__getObjectReference[] = "getObjectReference"; -static PyObject *__pyx_kp_s_1; -static PyObject *__pyx_n_s_10; -static PyObject *__pyx_kp_u_12; -static PyObject *__pyx_kp_u_13; -static PyObject *__pyx_kp_u_14; -static PyObject *__pyx_n_s_3; -static PyObject *__pyx_n_s_4; -static PyObject *__pyx_kp_s_5; -static PyObject *__pyx_kp_s_6; -static PyObject *__pyx_kp_s_7; +static PyObject *__pyx_kp_s_13; +static PyObject *__pyx_kp_s_15; +static PyObject *__pyx_n_s_18; +static PyObject *__pyx_kp_s_3; +static PyObject *__pyx_n_s_6; +static PyObject *__pyx_n_s_7; static PyObject *__pyx_kp_s_8; +static PyObject *__pyx_kp_s_9; static PyObject *__pyx_n_s__ASObject; static PyObject *__pyx_n_s__DecodeError; -static PyObject *__pyx_n_s__Encoder; static PyObject *__pyx_n_s__MixedArray; static PyObject *__pyx_n_s__OverflowError; static PyObject *__pyx_n_s__ReferenceError; @@ -1417,6 +1428,14 @@ static PyObject *__pyx_n_s__write_ulong; static PyObject *__pyx_n_s__write_ushort; static PyObject *__pyx_n_s__xml; static PyObject *__pyx_int_0; +static PyObject *__pyx_k_tuple_1; +static PyObject *__pyx_k_tuple_2; +static PyObject *__pyx_k_tuple_4; +static PyObject *__pyx_k_tuple_10; +static PyObject *__pyx_k_tuple_11; +static PyObject *__pyx_k_tuple_12; +static PyObject *__pyx_k_tuple_14; +static PyObject *__pyx_k_tuple_16; /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":50 * cdef amf3.Context amf3_context @@ -1584,8 +1603,8 @@ static int __pyx_pf_6cpyamf_4amf0_7Decoder___init__(PyObject *__pyx_v_self, PyOb int __pyx_r; PyObject *__pyx_t_1 = NULL; PyObject *__pyx_t_2 = NULL; - PyObject *__pyx_t_3 = NULL; - int __pyx_t_4; + int __pyx_t_3; + PyObject *__pyx_t_4 = NULL; PyObject *__pyx_t_5 = NULL; __Pyx_RefNannySetupContext("__init__"); if (unlikely(__pyx_kwds) && unlikely(!__Pyx_CheckKeywordStrings(__pyx_kwds, "__init__", 1))) return -1; @@ -1604,21 +1623,12 @@ static int __pyx_pf_6cpyamf_4amf0_7Decoder___init__(PyObject *__pyx_v_self, PyOb */ __pyx_t_1 = PyObject_GetAttr(((PyObject *)__pyx_v_kwargs), __pyx_n_s__pop); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 71; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 71; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_k_tuple_1), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 71; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_INCREF(((PyObject *)__pyx_n_s__use_amf3)); - PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_n_s__use_amf3)); - __Pyx_GIVEREF(((PyObject *)__pyx_n_s__use_amf3)); - __Pyx_INCREF(__pyx_int_0); - PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_int_0); - __Pyx_GIVEREF(__pyx_int_0); - __pyx_t_3 = PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 71; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely((__pyx_t_3 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 71; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 71; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - ((struct __pyx_obj_6cpyamf_4amf0_Decoder *)__pyx_v_self)->use_amf3 = __pyx_t_4; + ((struct __pyx_obj_6cpyamf_4amf0_Decoder *)__pyx_v_self)->use_amf3 = __pyx_t_3; /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":72 * def __init__(self, *args, **kwargs): @@ -1627,19 +1637,10 @@ static int __pyx_pf_6cpyamf_4amf0_7Decoder___init__(PyObject *__pyx_v_self, PyOb * * if self.context is None: */ - __pyx_t_3 = PyObject_GetAttr(((PyObject *)__pyx_v_kwargs), __pyx_n_s__pop); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); - __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_kwargs), __pyx_n_s__pop); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_INCREF(((PyObject *)__pyx_n_s__context)); - PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_n_s__context)); - __Pyx_GIVEREF(((PyObject *)__pyx_n_s__context)); - __Pyx_INCREF(Py_None); - PyTuple_SET_ITEM(__pyx_t_2, 1, Py_None); - __Pyx_GIVEREF(Py_None); - __pyx_t_1 = PyObject_Call(__pyx_t_3, __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_k_tuple_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_6cpyamf_4amf0_Context))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GIVEREF(__pyx_t_1); @@ -1655,8 +1656,8 @@ static int __pyx_pf_6cpyamf_4amf0_7Decoder___init__(PyObject *__pyx_v_self, PyOb * self.context = Context() * */ - __pyx_t_4 = (((PyObject *)((struct __pyx_obj_6cpyamf_4amf0_Decoder *)__pyx_v_self)->context) == Py_None); - if (__pyx_t_4) { + __pyx_t_3 = (((PyObject *)((struct __pyx_obj_6cpyamf_4amf0_Decoder *)__pyx_v_self)->context) == Py_None); + if (__pyx_t_3) { /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":75 * @@ -1686,28 +1687,28 @@ static int __pyx_pf_6cpyamf_4amf0_7Decoder___init__(PyObject *__pyx_v_self, PyOb __pyx_t_1 = PyObject_GetAttr(((PyObject *)((PyObject*)__pyx_ptype_6cpyamf_5codec_Codec)), __pyx_n_s____init__); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_v_self); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_self); __Pyx_GIVEREF(__pyx_v_self); - __pyx_t_3 = PySequence_Tuple(((PyObject *)__pyx_v_args)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(((PyObject *)__pyx_t_3)); - __pyx_t_5 = PyNumber_Add(__pyx_t_2, ((PyObject *)__pyx_t_3)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; - __pyx_t_3 = PyEval_CallObjectWithKeywords(__pyx_t_1, __pyx_t_5, ((PyObject *)__pyx_v_kwargs)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __pyx_t_4 = PySequence_Tuple(((PyObject *)__pyx_v_args)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_4)); + __pyx_t_5 = PyNumber_Add(((PyObject *)__pyx_t_2), ((PyObject *)__pyx_t_4)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_5)); + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0; + __pyx_t_4 = PyEval_CallObjectWithKeywords(__pyx_t_1, ((PyObject *)__pyx_t_5), ((PyObject *)__pyx_v_kwargs)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __pyx_r = 0; goto __pyx_L0; __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_1); __Pyx_XDECREF(__pyx_t_2); - __Pyx_XDECREF(__pyx_t_3); + __Pyx_XDECREF(__pyx_t_4); __Pyx_XDECREF(__pyx_t_5); __Pyx_AddTraceback("cpyamf.amf0.Decoder.__init__"); __pyx_r = -1; @@ -1782,13 +1783,13 @@ static PyObject *__pyx_f_6cpyamf_4amf0_7Decoder_readNumber(struct __pyx_obj_6cp __pyx_t_3 = PyFloat_FromDouble(__pyx_v_i); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L4_error;} __Pyx_GOTREF(__pyx_t_3); __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L4_error;} - __Pyx_GOTREF(__pyx_t_4); + __Pyx_GOTREF(((PyObject *)__pyx_t_4)); PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); __Pyx_GIVEREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = PyObject_Call(((PyObject *)((PyObject*)&PyInt_Type)), __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L4_error;} + __pyx_t_3 = PyObject_Call(((PyObject *)((PyObject*)&PyInt_Type)), ((PyObject *)__pyx_t_4), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L4_error;} __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0; __pyx_r = __pyx_t_3; __pyx_t_3 = 0; goto __pyx_L8_try_return; @@ -1909,7 +1910,6 @@ static PyObject *__pyx_f_6cpyamf_4amf0_7Decoder_readBoolean(struct __pyx_obj_6c unsigned char __pyx_t_1; PyObject *__pyx_t_2 = NULL; PyObject *__pyx_t_3 = NULL; - PyObject *__pyx_t_4 = NULL; __Pyx_RefNannySetupContext("readBoolean"); /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":93 @@ -1922,14 +1922,22 @@ static PyObject *__pyx_f_6cpyamf_4amf0_7Decoder_readBoolean(struct __pyx_obj_6c __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self->__pyx_base.__pyx_base.stream->__pyx_vtab)->read_uchar(__pyx_v_self->__pyx_base.__pyx_base.stream, 0); if (unlikely(__pyx_t_1 == 0 && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_v_b = __pyx_t_1; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":95 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":97 + * if b == 1: + * return True + * elif b == 0: # <<<<<<<<<<<<<< + * return False + * + */ + switch (__pyx_v_b) { + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":95 * cdef unsigned char b = self.stream.read_uchar() * * if b == 1: # <<<<<<<<<<<<<< * return True * elif b == 0: */ - switch (__pyx_v_b) { case 1: /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":96 @@ -1984,17 +1992,11 @@ static PyObject *__pyx_f_6cpyamf_4amf0_7Decoder_readBoolean(struct __pyx_obj_6c __pyx_t_3 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__DecodeError); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 100; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 100; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_k_tuple_4), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 100; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_1)); - PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_kp_s_1)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_1)); - __pyx_t_4 = PyObject_Call(__pyx_t_3, __pyx_t_2, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 100; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_Raise(__pyx_t_2, 0, 0); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __Pyx_Raise(__pyx_t_4, 0, 0); - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; {__pyx_filename = __pyx_f[0]; __pyx_lineno = 100; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = Py_None; __Pyx_INCREF(Py_None); @@ -2002,7 +2004,6 @@ static PyObject *__pyx_f_6cpyamf_4amf0_7Decoder_readBoolean(struct __pyx_obj_6c __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_2); __Pyx_XDECREF(__pyx_t_3); - __Pyx_XDECREF(__pyx_t_4); __Pyx_AddTraceback("cpyamf.amf0.Decoder.readBoolean"); __pyx_r = 0; __pyx_L0:; @@ -2244,7 +2245,7 @@ static PyObject *__pyx_f_6cpyamf_4amf0_7Decoder_readObjectAttributes(struct __p * self.stream.seek(3, 1) * */ - __pyx_t_2 = (memcmp(__pyx_v_peek, __pyx_k_2, 3) == 0); + __pyx_t_2 = (memcmp(__pyx_v_peek, __pyx_k_5, 3) == 0); if (__pyx_t_2) { /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":127 @@ -2505,18 +2506,18 @@ static PyObject *__pyx_f_6cpyamf_4amf0_7Decoder_readTypedObject(struct __pyx_ob */ __pyx_t_5 = __Pyx_GetName(__pyx_m, __pyx_n_s__pyamf); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 155; __pyx_clineno = __LINE__; goto __pyx_L5_except_error;} __Pyx_GOTREF(__pyx_t_5); - __pyx_t_6 = PyObject_GetAttr(__pyx_t_5, __pyx_n_s_4); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 155; __pyx_clineno = __LINE__; goto __pyx_L5_except_error;} + __pyx_t_6 = PyObject_GetAttr(__pyx_t_5, __pyx_n_s_7); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 155; __pyx_clineno = __LINE__; goto __pyx_L5_except_error;} __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 155; __pyx_clineno = __LINE__; goto __pyx_L5_except_error;} - __Pyx_GOTREF(__pyx_t_5); + __Pyx_GOTREF(((PyObject *)__pyx_t_5)); __Pyx_INCREF(__pyx_v_class_alias); PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_v_class_alias); __Pyx_GIVEREF(__pyx_v_class_alias); - __pyx_t_7 = PyObject_Call(__pyx_t_6, __pyx_t_5, NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 155; __pyx_clineno = __LINE__; goto __pyx_L5_except_error;} + __pyx_t_7 = PyObject_Call(__pyx_t_6, ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 155; __pyx_clineno = __LINE__; goto __pyx_L5_except_error;} __Pyx_GOTREF(__pyx_t_7); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_v_alias); __pyx_v_alias = __pyx_t_7; __pyx_t_7 = 0; @@ -2601,7 +2602,7 @@ static PyObject *__pyx_f_6cpyamf_4amf0_7Decoder_readTypedObject(struct __pyx_ob __pyx_t_1 = PyObject_GetAttr(__pyx_v_alias, __pyx_n_s__applyAttributes); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 164; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 164; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); __Pyx_INCREF(__pyx_v_obj); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_obj); __Pyx_GIVEREF(__pyx_v_obj); @@ -2611,10 +2612,10 @@ static PyObject *__pyx_f_6cpyamf_4amf0_7Decoder_readTypedObject(struct __pyx_ob __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 164; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_4)); if (PyDict_SetItem(__pyx_t_4, ((PyObject *)__pyx_n_s__codec), ((PyObject *)__pyx_v_self)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 164; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_t_7 = PyEval_CallObjectWithKeywords(__pyx_t_1, __pyx_t_3, ((PyObject *)__pyx_t_4)); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 164; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyEval_CallObjectWithKeywords(__pyx_t_1, ((PyObject *)__pyx_t_3), ((PyObject *)__pyx_t_4)); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 164; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_7); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -2719,22 +2720,22 @@ static PyObject *__pyx_f_6cpyamf_4amf0_7Decoder_readReference(struct __pyx_obj_ __pyx_t_2 = PyInt_FromLong(__pyx_v_idx); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 175; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 175; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); + __Pyx_GOTREF(((PyObject *)__pyx_t_5)); PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_2); __Pyx_GIVEREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyNumber_Remainder(((PyObject *)__pyx_kp_s_5), __pyx_t_5); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 175; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyNumber_Remainder(((PyObject *)__pyx_kp_s_8), ((PyObject *)__pyx_t_5)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 175; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 175; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); + __Pyx_GOTREF(((PyObject *)__pyx_t_5)); PyTuple_SET_ITEM(__pyx_t_5, 0, ((PyObject *)__pyx_t_2)); __Pyx_GIVEREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_Call(__pyx_t_4, __pyx_t_5, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 175; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_4, ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 175; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; __Pyx_Raise(__pyx_t_2, 0, 0); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; {__pyx_filename = __pyx_f[0]; __pyx_lineno = 175; __pyx_clineno = __LINE__; goto __pyx_L1_error;} @@ -2892,13 +2893,13 @@ static PyObject *__pyx_f_6cpyamf_4amf0_7Decoder_readMixedArray(struct __pyx_obj * pass */ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 192; __pyx_clineno = __LINE__; goto __pyx_L5_error;} - __Pyx_GOTREF(__pyx_t_2); + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_v_key); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_key); __Pyx_GIVEREF(__pyx_v_key); - __pyx_t_7 = PyObject_Call(((PyObject *)((PyObject*)&PyInt_Type)), __pyx_t_2, NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 192; __pyx_clineno = __LINE__; goto __pyx_L5_error;} + __pyx_t_7 = PyObject_Call(((PyObject *)((PyObject*)&PyInt_Type)), ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 192; __pyx_clineno = __LINE__; goto __pyx_L5_error;} __Pyx_GOTREF(__pyx_t_7); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_v_key); __pyx_v_key = __pyx_t_7; __pyx_t_7 = 0; @@ -3132,14 +3133,14 @@ static PyObject *__pyx_f_6cpyamf_4amf0_7Decoder_readDate(struct __pyx_obj_6cpya __pyx_t_3 = PyFloat_FromDouble((__pyx_v_ms / 1000.0)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 221; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 221; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); + __Pyx_GOTREF(((PyObject *)__pyx_t_5)); PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_3); __Pyx_GIVEREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = PyObject_Call(__pyx_t_4, __pyx_t_5, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 221; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_t_4, ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 221; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_v_d); __pyx_v_d = __pyx_t_3; __pyx_t_3 = 0; @@ -3366,14 +3367,14 @@ static PyObject *__pyx_f_6cpyamf_4amf0_7Decoder_readXML(struct __pyx_obj_6cpyam __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 247; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); + __Pyx_GOTREF(((PyObject *)__pyx_t_1)); __Pyx_INCREF(__pyx_v_data); PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_data); __Pyx_GIVEREF(__pyx_v_data); - __pyx_t_3 = PyObject_Call(__pyx_t_2, __pyx_t_1, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 247; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 247; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0; __pyx_v_root = __pyx_t_3; __pyx_t_3 = 0; @@ -3550,7 +3551,6 @@ static PyObject *__pyx_f_6cpyamf_4amf0_7Decoder_readConcreteElement(struct __py int __pyx_t_1; PyObject *__pyx_t_2 = NULL; PyObject *__pyx_t_3 = NULL; - PyObject *__pyx_t_4 = NULL; __Pyx_RefNannySetupContext("readConcreteElement"); /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":265 @@ -3956,17 +3956,11 @@ static PyObject *__pyx_f_6cpyamf_4amf0_7Decoder_readConcreteElement(struct __py __pyx_t_3 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__DecodeError); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 296; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 296; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_k_tuple_10), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 296; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_6)); - PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_kp_s_6)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_6)); - __pyx_t_4 = PyObject_Call(__pyx_t_3, __pyx_t_2, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 296; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_Raise(__pyx_t_2, 0, 0); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __Pyx_Raise(__pyx_t_4, 0, 0); - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; {__pyx_filename = __pyx_f[0]; __pyx_lineno = 296; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = Py_None; __Pyx_INCREF(Py_None); @@ -3974,7 +3968,6 @@ static PyObject *__pyx_f_6cpyamf_4amf0_7Decoder_readConcreteElement(struct __py __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_2); __Pyx_XDECREF(__pyx_t_3); - __Pyx_XDECREF(__pyx_t_4); __Pyx_AddTraceback("cpyamf.amf0.Decoder.readConcreteElement"); __pyx_r = 0; __pyx_L0:; @@ -4102,8 +4095,8 @@ static int __pyx_pf_6cpyamf_4amf0_7Encoder___init__(PyObject *__pyx_v_self, PyOb int __pyx_r; PyObject *__pyx_t_1 = NULL; PyObject *__pyx_t_2 = NULL; - PyObject *__pyx_t_3 = NULL; - int __pyx_t_4; + int __pyx_t_3; + PyObject *__pyx_t_4 = NULL; PyObject *__pyx_t_5 = NULL; __Pyx_RefNannySetupContext("__init__"); if (unlikely(__pyx_kwds) && unlikely(!__Pyx_CheckKeywordStrings(__pyx_kwds, "__init__", 1))) return -1; @@ -4122,21 +4115,12 @@ static int __pyx_pf_6cpyamf_4amf0_7Encoder___init__(PyObject *__pyx_v_self, PyOb */ __pyx_t_1 = PyObject_GetAttr(((PyObject *)__pyx_v_kwargs), __pyx_n_s__pop); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 312; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 312; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_k_tuple_11), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 312; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_INCREF(((PyObject *)__pyx_n_s__use_amf3)); - PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_n_s__use_amf3)); - __Pyx_GIVEREF(((PyObject *)__pyx_n_s__use_amf3)); - __Pyx_INCREF(__pyx_int_0); - PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_int_0); - __Pyx_GIVEREF(__pyx_int_0); - __pyx_t_3 = PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 312; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely((__pyx_t_3 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 312; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 312; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - ((struct __pyx_obj_6cpyamf_4amf0_Encoder *)__pyx_v_self)->use_amf3 = __pyx_t_4; + ((struct __pyx_obj_6cpyamf_4amf0_Encoder *)__pyx_v_self)->use_amf3 = __pyx_t_3; /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":314 * self.use_amf3 = kwargs.pop('use_amf3', 0) @@ -4145,19 +4129,10 @@ static int __pyx_pf_6cpyamf_4amf0_7Encoder___init__(PyObject *__pyx_v_self, PyOb * * if self.context is None: */ - __pyx_t_3 = PyObject_GetAttr(((PyObject *)__pyx_v_kwargs), __pyx_n_s__pop); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 314; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); - __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 314; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_kwargs), __pyx_n_s__pop); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 314; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_INCREF(((PyObject *)__pyx_n_s__context)); - PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_n_s__context)); - __Pyx_GIVEREF(((PyObject *)__pyx_n_s__context)); - __Pyx_INCREF(Py_None); - PyTuple_SET_ITEM(__pyx_t_2, 1, Py_None); - __Pyx_GIVEREF(Py_None); - __pyx_t_1 = PyObject_Call(__pyx_t_3, __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 314; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_k_tuple_12), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 314; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_6cpyamf_4amf0_Context))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 314; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GIVEREF(__pyx_t_1); @@ -4173,8 +4148,8 @@ static int __pyx_pf_6cpyamf_4amf0_7Encoder___init__(PyObject *__pyx_v_self, PyOb * self.context = Context() * */ - __pyx_t_4 = (((PyObject *)((struct __pyx_obj_6cpyamf_4amf0_Encoder *)__pyx_v_self)->context) == Py_None); - if (__pyx_t_4) { + __pyx_t_3 = (((PyObject *)((struct __pyx_obj_6cpyamf_4amf0_Encoder *)__pyx_v_self)->context) == Py_None); + if (__pyx_t_3) { /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":317 * @@ -4204,28 +4179,28 @@ static int __pyx_pf_6cpyamf_4amf0_7Encoder___init__(PyObject *__pyx_v_self, PyOb __pyx_t_1 = PyObject_GetAttr(((PyObject *)((PyObject*)__pyx_ptype_6cpyamf_5codec_Codec)), __pyx_n_s____init__); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 319; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 319; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_v_self); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_self); __Pyx_GIVEREF(__pyx_v_self); - __pyx_t_3 = PySequence_Tuple(((PyObject *)__pyx_v_args)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 319; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(((PyObject *)__pyx_t_3)); - __pyx_t_5 = PyNumber_Add(__pyx_t_2, ((PyObject *)__pyx_t_3)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 319; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; - __pyx_t_3 = PyEval_CallObjectWithKeywords(__pyx_t_1, __pyx_t_5, ((PyObject *)__pyx_v_kwargs)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 319; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __pyx_t_4 = PySequence_Tuple(((PyObject *)__pyx_v_args)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 319; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_4)); + __pyx_t_5 = PyNumber_Add(((PyObject *)__pyx_t_2), ((PyObject *)__pyx_t_4)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 319; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_5)); + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0; + __pyx_t_4 = PyEval_CallObjectWithKeywords(__pyx_t_1, ((PyObject *)__pyx_t_5), ((PyObject *)__pyx_v_kwargs)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 319; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __pyx_r = 0; goto __pyx_L0; __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_1); __Pyx_XDECREF(__pyx_t_2); - __Pyx_XDECREF(__pyx_t_3); + __Pyx_XDECREF(__pyx_t_4); __Pyx_XDECREF(__pyx_t_5); __Pyx_AddTraceback("cpyamf.amf0.Encoder.__init__"); __pyx_r = -1; @@ -4503,16 +4478,16 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder_writeList(struct __pyx_obj_6cpyamf_4a __pyx_t_2 = __Pyx_PyBool_FromLong(__pyx_v_is_proxy); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 351; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 351; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); __Pyx_INCREF(__pyx_v_a); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_a); __Pyx_GIVEREF(__pyx_v_a); PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_2); __Pyx_GIVEREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_Call(__pyx_t_1, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 351; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 351; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; __pyx_t_4 = __Pyx_PyInt_AsInt(__pyx_t_2); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 351; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_r = __pyx_t_4; @@ -5171,13 +5146,13 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder_serialiseString(struct __pyx_obj_6cpy __Pyx_GOTREF(__pyx_t_1); if (!PyCFunction_Check(__pyx_t_1) || (PyCFunction_GET_FUNCTION(__pyx_t_1) != (void *)&__pyx_pf_6cpyamf_4amf0_7Encoder_serialiseString)) { __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 437; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_v_u); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_u); __Pyx_GIVEREF(__pyx_v_u); - __pyx_t_3 = PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 437; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 437; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __pyx_t_4 = __Pyx_PyInt_AsInt(__pyx_t_3); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 437; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_r = __pyx_t_4; @@ -5357,14 +5332,14 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder_writeXML(struct __pyx_obj_6cpyamf_4am __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 459; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_v_e); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_e); __Pyx_GIVEREF(__pyx_v_e); - __pyx_t_4 = PyObject_Call(__pyx_t_3, __pyx_t_2, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 459; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 459; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_v_data); __pyx_v_data = __pyx_t_4; __pyx_t_4 = 0; @@ -5388,18 +5363,12 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder_writeXML(struct __pyx_obj_6cpyamf_4am */ __pyx_t_4 = PyObject_GetAttr(__pyx_v_data, __pyx_n_s__encode); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 462; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 462; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_4, ((PyObject *)__pyx_k_tuple_14), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 462; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_7)); - PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_kp_s_7)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_7)); - __pyx_t_3 = PyObject_Call(__pyx_t_4, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 462; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_v_data); - __pyx_v_data = __pyx_t_3; - __pyx_t_3 = 0; + __pyx_v_data = __pyx_t_2; + __pyx_t_2 = 0; goto __pyx_L3; } __pyx_L3:; @@ -5421,14 +5390,8 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder_writeXML(struct __pyx_obj_6cpyamf_4am * * cdef Py_ssize_t l = PyString_GET_SIZE(data) */ - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 465; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_8)); - PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_kp_s_8)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_8)); - __pyx_t_2 = PyObject_Call(__pyx_builtin_TypeError, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 465; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_builtin_TypeError, ((PyObject *)__pyx_k_tuple_16), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 465; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_Raise(__pyx_t_2, 0, 0); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; {__pyx_filename = __pyx_f[0]; __pyx_lineno = 465; __pyx_clineno = __LINE__; goto __pyx_L1_error;} @@ -5539,14 +5502,14 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder_writeDateTime(struct __pyx_obj_6cpyam __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 477; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_v_d); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_d); __Pyx_GIVEREF(__pyx_v_d); - __pyx_t_4 = PyObject_Call(__pyx_t_3, __pyx_t_2, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 477; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 477; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_v_secs); __pyx_v_secs = __pyx_t_4; __pyx_t_4 = 0; @@ -5583,7 +5546,7 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder_writeDateTime(struct __pyx_obj_6cpyam * * cdef int writeDict(self, dict o) except -1: */ - __pyx_t_5 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self->__pyx_base.__pyx_base.stream->__pyx_vtab)->write(__pyx_v_self->__pyx_base.__pyx_base.stream, __pyx_k_9, 2); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 482; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self->__pyx_base.__pyx_base.stream->__pyx_vtab)->write(__pyx_v_self->__pyx_base.__pyx_base.stream, __pyx_k_17, 2); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 482; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = __pyx_t_5; goto __pyx_L0; @@ -5706,6 +5669,11 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder__writeDict(struct __pyx_obj_6cpyamf_4 void *__pyx_t_3; void *__pyx_t_4; int __pyx_t_5; + int __pyx_t_6; + int __pyx_t_7; + PyObject *__pyx_t_8 = NULL; + PyObject *__pyx_t_9 = NULL; + int __pyx_t_10; __Pyx_RefNannySetupContext("_writeDict"); __pyx_v_key = Py_None; __Pyx_INCREF(Py_None); __pyx_v_value = Py_None; __Pyx_INCREF(Py_None); @@ -5714,8 +5682,8 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder__writeDict(struct __pyx_obj_6cpyamf_4 * @param o: The C{dict} data to be encoded to the AMF0 data stream. * """ * for key, value in attrs.iteritems(): # <<<<<<<<<<<<<< - * self.serialiseString(key) - * self.writeElement(value) + * if PyInt_Check(key) or PyLong_Check(key): + * key = str(key) */ __Pyx_INCREF(((PyObject *)__pyx_v_attrs)); __Pyx_XDECREF(__pyx_t_1); @@ -5733,24 +5701,62 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder__writeDict(struct __pyx_obj_6cpyamf_4 /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":501 * """ * for key, value in attrs.iteritems(): + * if PyInt_Check(key) or PyLong_Check(key): # <<<<<<<<<<<<<< + * key = str(key) + * + */ + __pyx_t_5 = PyInt_Check(__pyx_v_key); + if (!__pyx_t_5) { + __pyx_t_6 = PyLong_Check(__pyx_v_key); + __pyx_t_7 = __pyx_t_6; + } else { + __pyx_t_7 = __pyx_t_5; + } + if (__pyx_t_7) { + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":502 + * for key, value in attrs.iteritems(): + * if PyInt_Check(key) or PyLong_Check(key): + * key = str(key) # <<<<<<<<<<<<<< + * + * self.serialiseString(key) + */ + __pyx_t_8 = PyTuple_New(1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 502; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_8)); + __Pyx_INCREF(__pyx_v_key); + PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_v_key); + __Pyx_GIVEREF(__pyx_v_key); + __pyx_t_9 = PyObject_Call(((PyObject *)((PyObject*)&PyString_Type)), ((PyObject *)__pyx_t_8), NULL); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 502; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_9); + __Pyx_DECREF(((PyObject *)__pyx_t_8)); __pyx_t_8 = 0; + __Pyx_DECREF(__pyx_v_key); + __pyx_v_key = __pyx_t_9; + __pyx_t_9 = 0; + goto __pyx_L5; + } + __pyx_L5:; + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":504 + * key = str(key) + * * self.serialiseString(key) # <<<<<<<<<<<<<< * self.writeElement(value) * */ - __pyx_t_5 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.serialiseString(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_key, 0); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 501; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_10 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.serialiseString(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_key, 0); if (unlikely(__pyx_t_10 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 504; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":502 - * for key, value in attrs.iteritems(): + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":505 + * * self.serialiseString(key) * self.writeElement(value) # <<<<<<<<<<<<<< * * return 0 */ - __pyx_t_5 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.writeElement(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_value, 0); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 502; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_10 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.writeElement(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_value, 0); if (unlikely(__pyx_t_10 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 505; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":504 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":507 * self.writeElement(value) * * return 0 # <<<<<<<<<<<<<< @@ -5764,6 +5770,8 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder__writeDict(struct __pyx_obj_6cpyamf_4 goto __pyx_L0; __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_1); + __Pyx_XDECREF(__pyx_t_8); + __Pyx_XDECREF(__pyx_t_9); __Pyx_AddTraceback("cpyamf.amf0.Encoder._writeDict"); __pyx_r = -1; __pyx_L0:; @@ -5773,7 +5781,7 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder__writeDict(struct __pyx_obj_6cpyamf_4 return __pyx_r; } -/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":506 +/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":509 * return 0 * * cdef inline int _writeEndObject(self) except -1: # <<<<<<<<<<<<<< @@ -5786,14 +5794,14 @@ static CYTHON_INLINE int __pyx_f_6cpyamf_4amf0_7Encoder__writeEndObject(struct _ int __pyx_t_1; __Pyx_RefNannySetupContext("_writeEndObject"); - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":507 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":510 * * cdef inline int _writeEndObject(self) except -1: * return self.stream.write('\x00\x00\x09', 3) # <<<<<<<<<<<<<< * * cpdef int writeObject(self, o, bint is_proxy=0) except -1: */ - __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self->__pyx_base.__pyx_base.stream->__pyx_vtab)->write(__pyx_v_self->__pyx_base.__pyx_base.stream, __pyx_k_2, 3); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 507; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self->__pyx_base.__pyx_base.stream->__pyx_vtab)->write(__pyx_v_self->__pyx_base.__pyx_base.stream, __pyx_k_5, 3); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 510; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = __pyx_t_1; goto __pyx_L0; @@ -5807,7 +5815,7 @@ static CYTHON_INLINE int __pyx_f_6cpyamf_4amf0_7Encoder__writeEndObject(struct _ return __pyx_r; } -/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":509 +/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":512 * return self.stream.write('\x00\x00\x09', 3) * * cpdef int writeObject(self, o, bint is_proxy=0) except -1: # <<<<<<<<<<<<<< @@ -5844,23 +5852,23 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ if (unlikely(__pyx_skip_dispatch)) ; /* Check if overriden in Python */ else if (unlikely(Py_TYPE(((PyObject *)__pyx_v_self))->tp_dictoffset != 0)) { - __pyx_t_1 = PyObject_GetAttr(((PyObject *)__pyx_v_self), __pyx_n_s__writeObject); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 509; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_GetAttr(((PyObject *)__pyx_v_self), __pyx_n_s__writeObject); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 512; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); if (!PyCFunction_Check(__pyx_t_1) || (PyCFunction_GET_FUNCTION(__pyx_t_1) != (void *)&__pyx_pf_6cpyamf_4amf0_7Encoder_writeObject)) { - __pyx_t_2 = __Pyx_PyBool_FromLong(__pyx_v_is_proxy); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 509; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyBool_FromLong(__pyx_v_is_proxy); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 512; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 509; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 512; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); __Pyx_INCREF(__pyx_v_o); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_o); __Pyx_GIVEREF(__pyx_v_o); PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_2); __Pyx_GIVEREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_Call(__pyx_t_1, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 509; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 512; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_4 = __Pyx_PyInt_AsInt(__pyx_t_2); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 509; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; + __pyx_t_4 = __Pyx_PyInt_AsInt(__pyx_t_2); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 512; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_r = __pyx_t_4; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; @@ -5869,18 +5877,18 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; } - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":515 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":518 * @param o: The object data to be encoded to the AMF0 data stream. * """ * if self.writeReference(o) != -1: # <<<<<<<<<<<<<< * return 0 * */ - __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->writeReference(__pyx_v_self, __pyx_v_o); if (unlikely(__pyx_t_4 == -2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 515; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->writeReference(__pyx_v_self, __pyx_v_o); if (unlikely(__pyx_t_4 == -2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 518; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_t_5 = (__pyx_t_4 != -1); if (__pyx_t_5) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":516 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":519 * """ * if self.writeReference(o) != -1: * return 0 # <<<<<<<<<<<<<< @@ -5893,147 +5901,147 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ } __pyx_L3:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":518 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":521 * return 0 * * self.context.addObject(o) # <<<<<<<<<<<<<< * alias = self.context.getClassAlias(o.__class__) * */ - __pyx_t_6 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->__pyx_base.addObject(((struct __pyx_obj_6cpyamf_5codec_Context *)__pyx_v_self->context), __pyx_v_o, 0); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 518; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->__pyx_base.addObject(((struct __pyx_obj_6cpyamf_5codec_Context *)__pyx_v_self->context), __pyx_v_o, 0); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 521; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":519 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":522 * * self.context.addObject(o) * alias = self.context.getClassAlias(o.__class__) # <<<<<<<<<<<<<< * * alias.compile() */ - __pyx_t_1 = PyObject_GetAttr(__pyx_v_o, __pyx_n_s____class__); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 519; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_GetAttr(__pyx_v_o, __pyx_n_s____class__); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 522; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->__pyx_base.getClassAlias(((struct __pyx_obj_6cpyamf_5codec_Context *)__pyx_v_self->context), __pyx_t_1, 0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 519; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->__pyx_base.getClassAlias(((struct __pyx_obj_6cpyamf_5codec_Context *)__pyx_v_self->context), __pyx_t_1, 0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 522; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_v_alias); __pyx_v_alias = __pyx_t_2; __pyx_t_2 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":521 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":524 * alias = self.context.getClassAlias(o.__class__) * * alias.compile() # <<<<<<<<<<<<<< * * if alias.amf3: */ - __pyx_t_2 = PyObject_GetAttr(__pyx_v_alias, __pyx_n_s__compile); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 521; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_GetAttr(__pyx_v_alias, __pyx_n_s__compile); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 524; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __pyx_t_1 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 521; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 524; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":523 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":526 * alias.compile() * * if alias.amf3: # <<<<<<<<<<<<<< * return self.writeAMF3(o) * */ - __pyx_t_1 = PyObject_GetAttr(__pyx_v_alias, __pyx_n_s__amf3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 523; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_GetAttr(__pyx_v_alias, __pyx_n_s__amf3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 526; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); - __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_5 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 523; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_5 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 526; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; if (__pyx_t_5) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":524 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":527 * * if alias.amf3: * return self.writeAMF3(o) # <<<<<<<<<<<<<< * * if alias.anonymous: */ - __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->writeAMF3(__pyx_v_self, __pyx_v_o); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 524; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->writeAMF3(__pyx_v_self, __pyx_v_o); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 527; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = __pyx_t_4; goto __pyx_L0; goto __pyx_L4; } __pyx_L4:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":526 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":529 * return self.writeAMF3(o) * * if alias.anonymous: # <<<<<<<<<<<<<< * self.writeType(TYPE_OBJECT) * else: */ - __pyx_t_1 = PyObject_GetAttr(__pyx_v_alias, __pyx_n_s__anonymous); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 526; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_GetAttr(__pyx_v_alias, __pyx_n_s__anonymous); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); - __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_5 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 526; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_5 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; if (__pyx_t_5) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":527 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":530 * * if alias.anonymous: * self.writeType(TYPE_OBJECT) # <<<<<<<<<<<<<< * else: * self.writeType(TYPE_TYPEDOBJECT) */ - __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.writeType(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_6cpyamf_4amf0_TYPE_OBJECT); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 527; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.writeType(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_6cpyamf_4amf0_TYPE_OBJECT); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 530; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L5; } /*else*/ { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":529 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":532 * self.writeType(TYPE_OBJECT) * else: * self.writeType(TYPE_TYPEDOBJECT) # <<<<<<<<<<<<<< * self.serialiseString(alias.alias) * */ - __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.writeType(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_6cpyamf_4amf0_TYPE_TYPEDOBJECT); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.writeType(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_6cpyamf_4amf0_TYPE_TYPEDOBJECT); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 532; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":530 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":533 * else: * self.writeType(TYPE_TYPEDOBJECT) * self.serialiseString(alias.alias) # <<<<<<<<<<<<<< * * cdef dict attrs = alias.getEncodableAttributes(o, codec=self) */ - __pyx_t_1 = PyObject_GetAttr(__pyx_v_alias, __pyx_n_s__alias); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 530; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_GetAttr(__pyx_v_alias, __pyx_n_s__alias); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 533; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); - __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.serialiseString(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_t_1, 0); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 530; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.serialiseString(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_t_1, 0); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 533; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; } __pyx_L5:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":532 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":535 * self.serialiseString(alias.alias) * * cdef dict attrs = alias.getEncodableAttributes(o, codec=self) # <<<<<<<<<<<<<< * * if len(attrs) and alias.static_attrs: */ - __pyx_t_1 = PyObject_GetAttr(__pyx_v_alias, __pyx_n_s_10); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 532; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_GetAttr(__pyx_v_alias, __pyx_n_s_18); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 535; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 532; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 535; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_v_o); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_o); __Pyx_GIVEREF(__pyx_v_o); - __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 532; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 535; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_3)); - if (PyDict_SetItem(__pyx_t_3, ((PyObject *)__pyx_n_s__codec), ((PyObject *)__pyx_v_self)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 532; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_t_7 = PyEval_CallObjectWithKeywords(__pyx_t_1, __pyx_t_2, ((PyObject *)__pyx_t_3)); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 532; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_3, ((PyObject *)__pyx_n_s__codec), ((PyObject *)__pyx_v_self)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 535; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyEval_CallObjectWithKeywords(__pyx_t_1, ((PyObject *)__pyx_t_2), ((PyObject *)__pyx_t_3)); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 535; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_7); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; - if (!(likely(PyDict_CheckExact(__pyx_t_7))||((__pyx_t_7) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected dict, got %.200s", Py_TYPE(__pyx_t_7)->tp_name), 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 532; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(PyDict_CheckExact(__pyx_t_7))||((__pyx_t_7) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected dict, got %.200s", Py_TYPE(__pyx_t_7)->tp_name), 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 535; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_v_attrs = ((PyObject *)__pyx_t_7); __pyx_t_7 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":534 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":537 * cdef dict attrs = alias.getEncodableAttributes(o, codec=self) * * if len(attrs) and alias.static_attrs: # <<<<<<<<<<<<<< @@ -6041,13 +6049,13 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ * value = attrs.pop(key) */ if (unlikely(__pyx_v_attrs == Py_None)) { - PyErr_SetString(PyExc_TypeError, "object of type 'NoneType' has no len()"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 534; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + PyErr_SetString(PyExc_TypeError, "object of type 'NoneType' has no len()"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 537; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } __pyx_t_6 = PyDict_Size(((PyObject *)__pyx_v_attrs)); if (__pyx_t_6) { - __pyx_t_7 = PyObject_GetAttr(__pyx_v_alias, __pyx_n_s__static_attrs); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 534; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyObject_GetAttr(__pyx_v_alias, __pyx_n_s__static_attrs); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 537; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_7); - __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_7); if (unlikely(__pyx_t_5 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 534; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_7); if (unlikely(__pyx_t_5 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 537; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; __pyx_t_8 = __pyx_t_5; } else { @@ -6055,19 +6063,19 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ } if (__pyx_t_8) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":535 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":538 * * if len(attrs) and alias.static_attrs: * for key in alias.static_attrs: # <<<<<<<<<<<<<< * value = attrs.pop(key) * */ - __pyx_t_7 = PyObject_GetAttr(__pyx_v_alias, __pyx_n_s__static_attrs); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 535; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyObject_GetAttr(__pyx_v_alias, __pyx_n_s__static_attrs); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 538; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_7); if (PyList_CheckExact(__pyx_t_7) || PyTuple_CheckExact(__pyx_t_7)) { __pyx_t_6 = 0; __pyx_t_3 = __pyx_t_7; __Pyx_INCREF(__pyx_t_3); } else { - __pyx_t_6 = -1; __pyx_t_3 = PyObject_GetIter(__pyx_t_7); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 535; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = -1; __pyx_t_3 = PyObject_GetIter(__pyx_t_7); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 538; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); } __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -6081,7 +6089,7 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ } else { __pyx_t_7 = PyIter_Next(__pyx_t_3); if (!__pyx_t_7) { - if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 535; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 538; __pyx_clineno = __LINE__; goto __pyx_L1_error;} break; } __Pyx_GOTREF(__pyx_t_7); @@ -6090,81 +6098,81 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ __pyx_v_key = __pyx_t_7; __pyx_t_7 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":536 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":539 * if len(attrs) and alias.static_attrs: * for key in alias.static_attrs: * value = attrs.pop(key) # <<<<<<<<<<<<<< * * self.serialiseString(key) */ - __pyx_t_7 = PyObject_GetAttr(((PyObject *)__pyx_v_attrs), __pyx_n_s__pop); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 536; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyObject_GetAttr(((PyObject *)__pyx_v_attrs), __pyx_n_s__pop); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 539; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_7); - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 536; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 539; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_v_key); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_key); __Pyx_GIVEREF(__pyx_v_key); - __pyx_t_1 = PyObject_Call(__pyx_t_7, __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 536; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_Call(__pyx_t_7, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 539; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_v_value); __pyx_v_value = __pyx_t_1; __pyx_t_1 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":538 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":541 * value = attrs.pop(key) * * self.serialiseString(key) # <<<<<<<<<<<<<< * self.writeElement(value) * */ - __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.serialiseString(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_key, 0); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 538; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.serialiseString(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_key, 0); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 541; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":539 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":542 * * self.serialiseString(key) * self.writeElement(value) # <<<<<<<<<<<<<< * * if attrs: */ - __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.writeElement(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_value, 0); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 539; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.writeElement(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_value, 0); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 542; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; goto __pyx_L6; } __pyx_L6:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":541 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":544 * self.writeElement(value) * * if attrs: # <<<<<<<<<<<<<< * self._writeDict(attrs) * */ - __pyx_t_8 = __Pyx_PyObject_IsTrue(((PyObject *)__pyx_v_attrs)); if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 541; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_8 = __Pyx_PyObject_IsTrue(((PyObject *)__pyx_v_attrs)); if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 544; __pyx_clineno = __LINE__; goto __pyx_L1_error;} if (__pyx_t_8) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":542 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":545 * * if attrs: * self._writeDict(attrs) # <<<<<<<<<<<<<< * * return self._writeEndObject() */ - __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->_writeDict(__pyx_v_self, __pyx_v_attrs); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 542; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->_writeDict(__pyx_v_self, __pyx_v_attrs); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 545; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L9; } __pyx_L9:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":544 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":547 * self._writeDict(attrs) * * return self._writeEndObject() # <<<<<<<<<<<<<< * * cdef int writeMixedArray(self, o) except -1: */ - __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->_writeEndObject(__pyx_v_self); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 544; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->_writeEndObject(__pyx_v_self); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 547; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = __pyx_t_4; goto __pyx_L0; @@ -6186,7 +6194,7 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ return __pyx_r; } -/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":509 +/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":512 * return self.stream.write('\x00\x00\x09', 3) * * cpdef int writeObject(self, o, bint is_proxy=0) except -1: # <<<<<<<<<<<<<< @@ -6226,18 +6234,18 @@ static PyObject *__pyx_pf_6cpyamf_4amf0_7Encoder_writeObject(PyObject *__pyx_v_s } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "writeObject") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 509; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "writeObject") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 512; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } __pyx_v_o = values[0]; if (values[1]) { - __pyx_v_is_proxy = __Pyx_PyObject_IsTrue(values[1]); if (unlikely((__pyx_v_is_proxy == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 509; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_is_proxy = __Pyx_PyObject_IsTrue(values[1]); if (unlikely((__pyx_v_is_proxy == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 512; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_is_proxy = ((int)0); } } else { __pyx_v_is_proxy = ((int)0); switch (PyTuple_GET_SIZE(__pyx_args)) { - case 2: __pyx_v_is_proxy = __Pyx_PyObject_IsTrue(PyTuple_GET_ITEM(__pyx_args, 1)); if (unlikely((__pyx_v_is_proxy == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 509; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + case 2: __pyx_v_is_proxy = __Pyx_PyObject_IsTrue(PyTuple_GET_ITEM(__pyx_args, 1)); if (unlikely((__pyx_v_is_proxy == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 512; __pyx_clineno = __LINE__; goto __pyx_L3_error;} case 1: __pyx_v_o = PyTuple_GET_ITEM(__pyx_args, 0); break; default: goto __pyx_L5_argtuple_error; @@ -6245,7 +6253,7 @@ static PyObject *__pyx_pf_6cpyamf_4amf0_7Encoder_writeObject(PyObject *__pyx_v_s } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("writeObject", 0, 1, 2, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 509; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("writeObject", 0, 1, 2, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 512; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_L3_error:; __Pyx_AddTraceback("cpyamf.amf0.Encoder.writeObject"); __Pyx_RefNannyFinishContext(); @@ -6254,8 +6262,8 @@ static PyObject *__pyx_pf_6cpyamf_4amf0_7Encoder_writeObject(PyObject *__pyx_v_s __Pyx_XDECREF(__pyx_r); __pyx_t_2.__pyx_n = 1; __pyx_t_2.is_proxy = __pyx_v_is_proxy; - __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)((struct __pyx_obj_6cpyamf_4amf0_Encoder *)__pyx_v_self)->__pyx_base.__pyx_vtab)->__pyx_base.writeObject(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_o, 1, &__pyx_t_2); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 509; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_t_3 = PyInt_FromLong(__pyx_t_1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 509; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)((struct __pyx_obj_6cpyamf_4amf0_Encoder *)__pyx_v_self)->__pyx_base.__pyx_vtab)->__pyx_base.writeObject(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_o, 1, &__pyx_t_2); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 512; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyInt_FromLong(__pyx_t_1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 512; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __pyx_r = __pyx_t_3; __pyx_t_3 = 0; @@ -6273,7 +6281,7 @@ static PyObject *__pyx_pf_6cpyamf_4amf0_7Encoder_writeObject(PyObject *__pyx_v_s return __pyx_r; } -/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":546 +/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":549 * return self._writeEndObject() * * cdef int writeMixedArray(self, o) except -1: # <<<<<<<<<<<<<< @@ -6298,18 +6306,18 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder_writeMixedArray(struct __pyx_obj_6cpy __pyx_v_max_index = Py_None; __Pyx_INCREF(Py_None); __pyx_v_y = Py_None; __Pyx_INCREF(Py_None); - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":547 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":550 * * cdef int writeMixedArray(self, o) except -1: * if self.writeReference(o) != -1: # <<<<<<<<<<<<<< * return 0 * */ - __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->writeReference(__pyx_v_self, __pyx_v_o); if (unlikely(__pyx_t_1 == -2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 547; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->writeReference(__pyx_v_self, __pyx_v_o); if (unlikely(__pyx_t_1 == -2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 550; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_t_2 = (__pyx_t_1 != -1); if (__pyx_t_2) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":548 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":551 * cdef int writeMixedArray(self, o) except -1: * if self.writeReference(o) != -1: * return 0 # <<<<<<<<<<<<<< @@ -6322,25 +6330,25 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder_writeMixedArray(struct __pyx_obj_6cpy } __pyx_L3:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":550 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":553 * return 0 * * self.context.addObject(o) # <<<<<<<<<<<<<< * self.writeType(TYPE_MIXEDARRAY) * */ - __pyx_t_3 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->__pyx_base.addObject(((struct __pyx_obj_6cpyamf_5codec_Context *)__pyx_v_self->context), __pyx_v_o, 0); if (unlikely(__pyx_t_3 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 550; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->__pyx_base.addObject(((struct __pyx_obj_6cpyamf_5codec_Context *)__pyx_v_self->context), __pyx_v_o, 0); if (unlikely(__pyx_t_3 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 553; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":551 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":554 * * self.context.addObject(o) * self.writeType(TYPE_MIXEDARRAY) # <<<<<<<<<<<<<< * * # TODO: optimise this */ - __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.writeType(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_6cpyamf_4amf0_TYPE_MIXEDARRAY); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 551; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.writeType(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_6cpyamf_4amf0_TYPE_MIXEDARRAY); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 554; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":555 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":558 * # TODO: optimise this * # work out the highest integer index * try: # <<<<<<<<<<<<<< @@ -6355,24 +6363,24 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder_writeMixedArray(struct __pyx_obj_6cpy __Pyx_XGOTREF(__pyx_save_exc_tb); /*try:*/ { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":557 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":560 * try: * # list comprehensions to save the day * max_index = max([y[0] for y in o.items() # <<<<<<<<<<<<<< * if isinstance(y[0], (int, long))]) * */ - __pyx_t_4 = PyList_New(0); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 557; __pyx_clineno = __LINE__; goto __pyx_L4_error;} + __pyx_t_4 = PyList_New(0); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 560; __pyx_clineno = __LINE__; goto __pyx_L4_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_4)); - __pyx_t_5 = PyObject_GetAttr(__pyx_v_o, __pyx_n_s__items); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 557; __pyx_clineno = __LINE__; goto __pyx_L4_error;} + __pyx_t_5 = PyObject_GetAttr(__pyx_v_o, __pyx_n_s__items); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 560; __pyx_clineno = __LINE__; goto __pyx_L4_error;} __Pyx_GOTREF(__pyx_t_5); - __pyx_t_6 = PyObject_Call(__pyx_t_5, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 557; __pyx_clineno = __LINE__; goto __pyx_L4_error;} + __pyx_t_6 = PyObject_Call(__pyx_t_5, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 560; __pyx_clineno = __LINE__; goto __pyx_L4_error;} __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; if (PyList_CheckExact(__pyx_t_6) || PyTuple_CheckExact(__pyx_t_6)) { __pyx_t_3 = 0; __pyx_t_5 = __pyx_t_6; __Pyx_INCREF(__pyx_t_5); } else { - __pyx_t_3 = -1; __pyx_t_5 = PyObject_GetIter(__pyx_t_6); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 557; __pyx_clineno = __LINE__; goto __pyx_L4_error;} + __pyx_t_3 = -1; __pyx_t_5 = PyObject_GetIter(__pyx_t_6); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 560; __pyx_clineno = __LINE__; goto __pyx_L4_error;} __Pyx_GOTREF(__pyx_t_5); } __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; @@ -6386,7 +6394,7 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder_writeMixedArray(struct __pyx_obj_6cpy } else { __pyx_t_6 = PyIter_Next(__pyx_t_5); if (!__pyx_t_6) { - if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 557; __pyx_clineno = __LINE__; goto __pyx_L4_error;} + if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 560; __pyx_clineno = __LINE__; goto __pyx_L4_error;} break; } __Pyx_GOTREF(__pyx_t_6); @@ -6395,14 +6403,14 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder_writeMixedArray(struct __pyx_obj_6cpy __pyx_v_y = __pyx_t_6; __pyx_t_6 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":558 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":561 * # list comprehensions to save the day * max_index = max([y[0] for y in o.items() * if isinstance(y[0], (int, long))]) # <<<<<<<<<<<<<< * * if max_index < 0: */ - __pyx_t_6 = __Pyx_GetItemInt(__pyx_v_y, 0, sizeof(long), PyInt_FromLong); if (!__pyx_t_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 558; __pyx_clineno = __LINE__; goto __pyx_L4_error;} + __pyx_t_6 = __Pyx_GetItemInt(__pyx_v_y, 0, sizeof(long), PyInt_FromLong); if (!__pyx_t_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 561; __pyx_clineno = __LINE__; goto __pyx_L4_error;} __Pyx_GOTREF(__pyx_t_6); __pyx_t_2 = PyInt_Check(__pyx_t_6); if (!__pyx_t_2) { @@ -6414,49 +6422,49 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder_writeMixedArray(struct __pyx_obj_6cpy __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; if (__pyx_t_8) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":557 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":560 * try: * # list comprehensions to save the day * max_index = max([y[0] for y in o.items() # <<<<<<<<<<<<<< * if isinstance(y[0], (int, long))]) * */ - __pyx_t_6 = __Pyx_GetItemInt(__pyx_v_y, 0, sizeof(long), PyInt_FromLong); if (!__pyx_t_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 557; __pyx_clineno = __LINE__; goto __pyx_L4_error;} + __pyx_t_6 = __Pyx_GetItemInt(__pyx_v_y, 0, sizeof(long), PyInt_FromLong); if (!__pyx_t_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 560; __pyx_clineno = __LINE__; goto __pyx_L4_error;} __Pyx_GOTREF(__pyx_t_6); - if (unlikely(PyList_Append(__pyx_t_4, (PyObject*)__pyx_t_6))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 557; __pyx_clineno = __LINE__; goto __pyx_L4_error;} + if (unlikely(PyList_Append(__pyx_t_4, (PyObject*)__pyx_t_6))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 560; __pyx_clineno = __LINE__; goto __pyx_L4_error;} __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; goto __pyx_L14; } __pyx_L14:; } __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 557; __pyx_clineno = __LINE__; goto __pyx_L4_error;} - __Pyx_GOTREF(__pyx_t_5); + __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 560; __pyx_clineno = __LINE__; goto __pyx_L4_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_5)); __Pyx_INCREF(((PyObject *)__pyx_t_4)); PyTuple_SET_ITEM(__pyx_t_5, 0, ((PyObject *)__pyx_t_4)); __Pyx_GIVEREF(((PyObject *)__pyx_t_4)); __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0; - __pyx_t_4 = PyObject_Call(__pyx_builtin_max, __pyx_t_5, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 557; __pyx_clineno = __LINE__; goto __pyx_L4_error;} + __pyx_t_4 = PyObject_Call(__pyx_builtin_max, ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 560; __pyx_clineno = __LINE__; goto __pyx_L4_error;} __Pyx_GOTREF(__pyx_t_4); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_v_max_index); __pyx_v_max_index = __pyx_t_4; __pyx_t_4 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":560 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":563 * if isinstance(y[0], (int, long))]) * * if max_index < 0: # <<<<<<<<<<<<<< * max_index = 0 * except ValueError: */ - __pyx_t_4 = PyObject_RichCompare(__pyx_v_max_index, __pyx_int_0, Py_LT); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 560; __pyx_clineno = __LINE__; goto __pyx_L4_error;} + __pyx_t_4 = PyObject_RichCompare(__pyx_v_max_index, __pyx_int_0, Py_LT); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 563; __pyx_clineno = __LINE__; goto __pyx_L4_error;} __Pyx_GOTREF(__pyx_t_4); - __pyx_t_8 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 560; __pyx_clineno = __LINE__; goto __pyx_L4_error;} + __pyx_t_8 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 563; __pyx_clineno = __LINE__; goto __pyx_L4_error;} __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; if (__pyx_t_8) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":561 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":564 * * if max_index < 0: * max_index = 0 # <<<<<<<<<<<<<< @@ -6479,7 +6487,7 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder_writeMixedArray(struct __pyx_obj_6cpy __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":562 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":565 * if max_index < 0: * max_index = 0 * except ValueError: # <<<<<<<<<<<<<< @@ -6489,12 +6497,12 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder_writeMixedArray(struct __pyx_obj_6cpy __pyx_t_1 = PyErr_ExceptionMatches(__pyx_builtin_ValueError); if (__pyx_t_1) { __Pyx_AddTraceback("cpyamf.amf0.Encoder.writeMixedArray"); - if (__Pyx_GetException(&__pyx_t_4, &__pyx_t_5, &__pyx_t_6) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 562; __pyx_clineno = __LINE__; goto __pyx_L6_except_error;} + if (__Pyx_GetException(&__pyx_t_4, &__pyx_t_5, &__pyx_t_6) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 565; __pyx_clineno = __LINE__; goto __pyx_L6_except_error;} __Pyx_GOTREF(__pyx_t_4); __Pyx_GOTREF(__pyx_t_5); __Pyx_GOTREF(__pyx_t_6); - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":563 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":566 * max_index = 0 * except ValueError: * max_index = 0 # <<<<<<<<<<<<<< @@ -6523,42 +6531,42 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder_writeMixedArray(struct __pyx_obj_6cpy __pyx_L11_try_end:; } - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":565 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":568 * max_index = 0 * * self.stream.write_ulong(max_index) # <<<<<<<<<<<<<< * * self._writeDict(dict(o)) */ - __pyx_t_9 = __Pyx_PyInt_AsUnsignedLong(__pyx_v_max_index); if (unlikely((__pyx_t_9 == (unsigned long)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 565; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self->__pyx_base.__pyx_base.stream->__pyx_vtab)->write_ulong(__pyx_v_self->__pyx_base.__pyx_base.stream, __pyx_t_9, 0); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 565; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_9 = __Pyx_PyInt_AsUnsignedLong(__pyx_v_max_index); if (unlikely((__pyx_t_9 == (unsigned long)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 568; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self->__pyx_base.__pyx_base.stream->__pyx_vtab)->write_ulong(__pyx_v_self->__pyx_base.__pyx_base.stream, __pyx_t_9, 0); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 568; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":567 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":570 * self.stream.write_ulong(max_index) * * self._writeDict(dict(o)) # <<<<<<<<<<<<<< * self._writeEndObject() * */ - __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 567; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_6); + __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 570; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_6)); __Pyx_INCREF(__pyx_v_o); PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_v_o); __Pyx_GIVEREF(__pyx_v_o); - __pyx_t_5 = PyObject_Call(((PyObject *)((PyObject*)&PyDict_Type)), __pyx_t_6, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 567; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyObject_Call(((PyObject *)((PyObject*)&PyDict_Type)), ((PyObject *)__pyx_t_6), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 570; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->_writeDict(__pyx_v_self, ((PyObject *)__pyx_t_5)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 567; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(((PyObject *)__pyx_t_6)); __pyx_t_6 = 0; + __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->_writeDict(__pyx_v_self, ((PyObject *)__pyx_t_5)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 570; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":568 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":571 * * self._writeDict(dict(o)) * self._writeEndObject() # <<<<<<<<<<<<<< * * cdef int writeAMF3(self, o) except -1: */ - __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->_writeEndObject(__pyx_v_self); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 568; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->_writeEndObject(__pyx_v_self); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 571; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = 0; goto __pyx_L0; @@ -6575,7 +6583,7 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder_writeMixedArray(struct __pyx_obj_6cpy return __pyx_r; } -/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":570 +/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":573 * self._writeEndObject() * * cdef int writeAMF3(self, o) except -1: # <<<<<<<<<<<<<< @@ -6591,7 +6599,7 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder_writeAMF3(struct __pyx_obj_6cpyamf_4a int __pyx_t_4; __Pyx_RefNannySetupContext("writeAMF3"); - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":571 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":574 * * cdef int writeAMF3(self, o) except -1: * if self.amf3_encoder is None: # <<<<<<<<<<<<<< @@ -6601,14 +6609,14 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder_writeAMF3(struct __pyx_obj_6cpyamf_4a __pyx_t_1 = (((PyObject *)__pyx_v_self->amf3_encoder) == Py_None); if (__pyx_t_1) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":572 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":575 * cdef int writeAMF3(self, o) except -1: * if self.amf3_encoder is None: * self.context.amf3_context = amf3.Context() # <<<<<<<<<<<<<< * * self.amf3_encoder = amf3.Encoder( */ - __pyx_t_2 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_6cpyamf_4amf3_Context)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 572; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_6cpyamf_4amf3_Context)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 575; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __Pyx_GIVEREF(__pyx_t_2); __Pyx_GOTREF(__pyx_v_self->context->amf3_context); @@ -6616,47 +6624,47 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder_writeAMF3(struct __pyx_obj_6cpyamf_4a __pyx_v_self->context->amf3_context = ((struct __pyx_obj_6cpyamf_4amf3_Context *)__pyx_t_2); __pyx_t_2 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":574 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":577 * self.context.amf3_context = amf3.Context() * * self.amf3_encoder = amf3.Encoder( # <<<<<<<<<<<<<< * stream=self.stream, * context=self.context.amf3_context, */ - __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 574; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 577; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":575 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":578 * * self.amf3_encoder = amf3.Encoder( * stream=self.stream, # <<<<<<<<<<<<<< * context=self.context.amf3_context, * timezone_offset=self.timezone_offset) */ - if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_n_s__stream), ((PyObject *)__pyx_v_self->__pyx_base.__pyx_base.stream)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 574; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_n_s__stream), ((PyObject *)__pyx_v_self->__pyx_base.__pyx_base.stream)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 577; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":576 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":579 * self.amf3_encoder = amf3.Encoder( * stream=self.stream, * context=self.context.amf3_context, # <<<<<<<<<<<<<< * timezone_offset=self.timezone_offset) * */ - if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_n_s__context), ((PyObject *)__pyx_v_self->context->amf3_context)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 574; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_n_s__context), ((PyObject *)__pyx_v_self->context->amf3_context)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 577; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":577 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":580 * stream=self.stream, * context=self.context.amf3_context, * timezone_offset=self.timezone_offset) # <<<<<<<<<<<<<< * * self.writeType(TYPE_AMF3) */ - if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_n_s__timezone_offset), __pyx_v_self->__pyx_base.__pyx_base.timezone_offset) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 574; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_t_3 = PyEval_CallObjectWithKeywords(((PyObject *)((PyObject*)__pyx_ptype_6cpyamf_4amf3_Encoder)), ((PyObject *)__pyx_empty_tuple), ((PyObject *)__pyx_t_2)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 574; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_n_s__timezone_offset), __pyx_v_self->__pyx_base.__pyx_base.timezone_offset) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 577; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyEval_CallObjectWithKeywords(((PyObject *)((PyObject*)__pyx_ptype_6cpyamf_4amf3_Encoder)), ((PyObject *)__pyx_empty_tuple), ((PyObject *)__pyx_t_2)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 577; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":574 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":577 * self.context.amf3_context = amf3.Context() * * self.amf3_encoder = amf3.Encoder( # <<<<<<<<<<<<<< @@ -6672,23 +6680,23 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder_writeAMF3(struct __pyx_obj_6cpyamf_4a } __pyx_L3:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":579 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":582 * timezone_offset=self.timezone_offset) * * self.writeType(TYPE_AMF3) # <<<<<<<<<<<<<< * self.amf3_encoder.writeElement(o) * */ - __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.writeType(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_6cpyamf_4amf0_TYPE_AMF3); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 579; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.writeType(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_6cpyamf_4amf0_TYPE_AMF3); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 582; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":580 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":583 * * self.writeType(TYPE_AMF3) * self.amf3_encoder.writeElement(o) # <<<<<<<<<<<<<< * * cdef inline int handleBasicTypes(self, object element, object py_type) except -1: */ - __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->amf3_encoder->__pyx_base.__pyx_vtab)->__pyx_base.writeElement(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self->amf3_encoder), __pyx_v_o, 0); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 580; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->amf3_encoder->__pyx_base.__pyx_vtab)->__pyx_base.writeElement(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self->amf3_encoder), __pyx_v_o, 0); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 583; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = 0; goto __pyx_L0; @@ -6702,7 +6710,7 @@ static int __pyx_f_6cpyamf_4amf0_7Encoder_writeAMF3(struct __pyx_obj_6cpyamf_4a return __pyx_r; } -/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":582 +/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":585 * self.amf3_encoder.writeElement(o) * * cdef inline int handleBasicTypes(self, object element, object py_type) except -1: # <<<<<<<<<<<<<< @@ -6715,7 +6723,7 @@ static CYTHON_INLINE int __pyx_f_6cpyamf_4amf0_7Encoder_handleBasicTypes(struct int __pyx_t_1; __Pyx_RefNannySetupContext("handleBasicTypes"); - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":583 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":586 * * cdef inline int handleBasicTypes(self, object element, object py_type) except -1: * if self.use_amf3: # <<<<<<<<<<<<<< @@ -6724,26 +6732,26 @@ static CYTHON_INLINE int __pyx_f_6cpyamf_4amf0_7Encoder_handleBasicTypes(struct */ if (__pyx_v_self->use_amf3) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":584 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":587 * cdef inline int handleBasicTypes(self, object element, object py_type) except -1: * if self.use_amf3: * return self.writeAMF3(element) # <<<<<<<<<<<<<< * * return codec.Encoder.handleBasicTypes(self, element, py_type) */ - __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->writeAMF3(__pyx_v_self, __pyx_v_element); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 584; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4amf0_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->writeAMF3(__pyx_v_self, __pyx_v_element); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 587; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = __pyx_t_1; goto __pyx_L0; goto __pyx_L3; } __pyx_L3:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":586 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":589 * return self.writeAMF3(element) * * return codec.Encoder.handleBasicTypes(self, element, py_type) # <<<<<<<<<<<<<< */ - __pyx_t_1 = __pyx_vtabptr_6cpyamf_5codec_Encoder->handleBasicTypes(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_element, __pyx_v_py_type); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 586; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_vtabptr_6cpyamf_5codec_Encoder->handleBasicTypes(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_element, __pyx_v_py_type); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 589; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = __pyx_t_1; goto __pyx_L0; @@ -6999,7 +7007,7 @@ PyTypeObject __pyx_type_6cpyamf_4amf0_Context = { 0, /*tp_getattro*/ 0, /*tp_setattro*/ &__pyx_tp_as_buffer_Context, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/ + Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC, /*tp_flags*/ 0, /*tp_doc*/ __pyx_tp_traverse_6cpyamf_4amf0_Context, /*tp_traverse*/ __pyx_tp_clear_6cpyamf_4amf0_Context, /*tp_clear*/ @@ -7234,7 +7242,7 @@ PyTypeObject __pyx_type_6cpyamf_4amf0_Decoder = { 0, /*tp_getattro*/ 0, /*tp_setattro*/ &__pyx_tp_as_buffer_Decoder, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/ + Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC, /*tp_flags*/ __Pyx_DOCSTR("\n "), /*tp_doc*/ __pyx_tp_traverse_6cpyamf_4amf0_Decoder, /*tp_traverse*/ __pyx_tp_clear_6cpyamf_4amf0_Decoder, /*tp_clear*/ @@ -7471,7 +7479,7 @@ PyTypeObject __pyx_type_6cpyamf_4amf0_Encoder = { 0, /*tp_getattro*/ 0, /*tp_setattro*/ &__pyx_tp_as_buffer_Encoder, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/ + Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC, /*tp_flags*/ __Pyx_DOCSTR("\n The AMF0 Encoder.\n "), /*tp_doc*/ __pyx_tp_traverse_6cpyamf_4amf0_Encoder, /*tp_traverse*/ __pyx_tp_clear_6cpyamf_4amf0_Encoder, /*tp_clear*/ @@ -7511,7 +7519,7 @@ static PyMethodDef __pyx_methods[] = { static struct PyModuleDef __pyx_moduledef = { PyModuleDef_HEAD_INIT, __Pyx_NAMESTR("amf0"), - __Pyx_DOCSTR(__pyx_k_11), /* m_doc */ + __Pyx_DOCSTR(__pyx_k_19), /* m_doc */ -1, /* m_size */ __pyx_methods /* m_methods */, NULL, /* m_reload */ @@ -7522,20 +7530,16 @@ static struct PyModuleDef __pyx_moduledef = { #endif static __Pyx_StringTabEntry __pyx_string_tab[] = { - {&__pyx_kp_s_1, __pyx_k_1, sizeof(__pyx_k_1), 0, 0, 1, 0}, - {&__pyx_n_s_10, __pyx_k_10, sizeof(__pyx_k_10), 0, 0, 1, 1}, - {&__pyx_kp_u_12, __pyx_k_12, sizeof(__pyx_k_12), 0, 1, 0, 0}, - {&__pyx_kp_u_13, __pyx_k_13, sizeof(__pyx_k_13), 0, 1, 0, 0}, - {&__pyx_kp_u_14, __pyx_k_14, sizeof(__pyx_k_14), 0, 1, 0, 0}, - {&__pyx_n_s_3, __pyx_k_3, sizeof(__pyx_k_3), 0, 0, 1, 1}, - {&__pyx_n_s_4, __pyx_k_4, sizeof(__pyx_k_4), 0, 0, 1, 1}, - {&__pyx_kp_s_5, __pyx_k_5, sizeof(__pyx_k_5), 0, 0, 1, 0}, - {&__pyx_kp_s_6, __pyx_k_6, sizeof(__pyx_k_6), 0, 0, 1, 0}, - {&__pyx_kp_s_7, __pyx_k_7, sizeof(__pyx_k_7), 0, 0, 1, 0}, + {&__pyx_kp_s_13, __pyx_k_13, sizeof(__pyx_k_13), 0, 0, 1, 0}, + {&__pyx_kp_s_15, __pyx_k_15, sizeof(__pyx_k_15), 0, 0, 1, 0}, + {&__pyx_n_s_18, __pyx_k_18, sizeof(__pyx_k_18), 0, 0, 1, 1}, + {&__pyx_kp_s_3, __pyx_k_3, sizeof(__pyx_k_3), 0, 0, 1, 0}, + {&__pyx_n_s_6, __pyx_k_6, sizeof(__pyx_k_6), 0, 0, 1, 1}, + {&__pyx_n_s_7, __pyx_k_7, sizeof(__pyx_k_7), 0, 0, 1, 1}, {&__pyx_kp_s_8, __pyx_k_8, sizeof(__pyx_k_8), 0, 0, 1, 0}, + {&__pyx_kp_s_9, __pyx_k_9, sizeof(__pyx_k_9), 0, 0, 1, 0}, {&__pyx_n_s__ASObject, __pyx_k__ASObject, sizeof(__pyx_k__ASObject), 0, 0, 1, 1}, {&__pyx_n_s__DecodeError, __pyx_k__DecodeError, sizeof(__pyx_k__DecodeError), 0, 0, 1, 1}, - {&__pyx_n_s__Encoder, __pyx_k__Encoder, sizeof(__pyx_k__Encoder), 0, 0, 1, 1}, {&__pyx_n_s__MixedArray, __pyx_k__MixedArray, sizeof(__pyx_k__MixedArray), 0, 0, 1, 1}, {&__pyx_n_s__OverflowError, __pyx_k__OverflowError, sizeof(__pyx_k__OverflowError), 0, 0, 1, 1}, {&__pyx_n_s__ReferenceError, __pyx_k__ReferenceError, sizeof(__pyx_k__ReferenceError), 0, 0, 1, 1}, @@ -7627,12 +7631,145 @@ static int __Pyx_InitCachedBuiltins(void) { __pyx_builtin_OverflowError = __Pyx_GetName(__pyx_b, __pyx_n_s__OverflowError); if (!__pyx_builtin_OverflowError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_builtin_ValueError = __Pyx_GetName(__pyx_b, __pyx_n_s__ValueError); if (!__pyx_builtin_ValueError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 193; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_builtin_TypeError = __Pyx_GetName(__pyx_b, __pyx_n_s__TypeError); if (!__pyx_builtin_TypeError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 465; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_builtin_max = __Pyx_GetName(__pyx_b, __pyx_n_s__max); if (!__pyx_builtin_max) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 557; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_builtin_max = __Pyx_GetName(__pyx_b, __pyx_n_s__max); if (!__pyx_builtin_max) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 560; __pyx_clineno = __LINE__; goto __pyx_L1_error;} return 0; __pyx_L1_error:; return -1; } +static int __Pyx_InitCachedConstants(void) { + __Pyx_RefNannySetupContext("__Pyx_InitCachedConstants"); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":71 + * + * def __init__(self, *args, **kwargs): + * self.use_amf3 = kwargs.pop('use_amf3', 0) # <<<<<<<<<<<<<< + * self.context = kwargs.pop('context', None) + * + */ + __pyx_k_tuple_1 = PyTuple_New(2); if (unlikely(!__pyx_k_tuple_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 71; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_1)); + __Pyx_INCREF(((PyObject *)__pyx_n_s__use_amf3)); + PyTuple_SET_ITEM(__pyx_k_tuple_1, 0, ((PyObject *)__pyx_n_s__use_amf3)); + __Pyx_GIVEREF(((PyObject *)__pyx_n_s__use_amf3)); + __Pyx_INCREF(__pyx_int_0); + PyTuple_SET_ITEM(__pyx_k_tuple_1, 1, __pyx_int_0); + __Pyx_GIVEREF(__pyx_int_0); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_1)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":72 + * def __init__(self, *args, **kwargs): + * self.use_amf3 = kwargs.pop('use_amf3', 0) + * self.context = kwargs.pop('context', None) # <<<<<<<<<<<<<< + * + * if self.context is None: + */ + __pyx_k_tuple_2 = PyTuple_New(2); if (unlikely(!__pyx_k_tuple_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_2)); + __Pyx_INCREF(((PyObject *)__pyx_n_s__context)); + PyTuple_SET_ITEM(__pyx_k_tuple_2, 0, ((PyObject *)__pyx_n_s__context)); + __Pyx_GIVEREF(((PyObject *)__pyx_n_s__context)); + __Pyx_INCREF(Py_None); + PyTuple_SET_ITEM(__pyx_k_tuple_2, 1, Py_None); + __Pyx_GIVEREF(Py_None); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_2)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":100 + * return False + * + * raise pyamf.DecodeError('Bad boolean read from stream') # <<<<<<<<<<<<<< + * + * cdef object readBytes(self): + */ + __pyx_k_tuple_4 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 100; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_4)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_3)); + PyTuple_SET_ITEM(__pyx_k_tuple_4, 0, ((PyObject *)__pyx_kp_s_3)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_3)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_4)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":296 + * return self.readAMF3() + * + * raise pyamf.DecodeError("Unsupported ActionScript type") # <<<<<<<<<<<<<< + * + * + */ + __pyx_k_tuple_10 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_10)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 296; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_10)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_9)); + PyTuple_SET_ITEM(__pyx_k_tuple_10, 0, ((PyObject *)__pyx_kp_s_9)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_9)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_10)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":312 + * + * def __init__(self, *args, **kwargs): + * self.use_amf3 = kwargs.pop('use_amf3', 0) # <<<<<<<<<<<<<< + * + * self.context = kwargs.pop('context', None) + */ + __pyx_k_tuple_11 = PyTuple_New(2); if (unlikely(!__pyx_k_tuple_11)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 312; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_11)); + __Pyx_INCREF(((PyObject *)__pyx_n_s__use_amf3)); + PyTuple_SET_ITEM(__pyx_k_tuple_11, 0, ((PyObject *)__pyx_n_s__use_amf3)); + __Pyx_GIVEREF(((PyObject *)__pyx_n_s__use_amf3)); + __Pyx_INCREF(__pyx_int_0); + PyTuple_SET_ITEM(__pyx_k_tuple_11, 1, __pyx_int_0); + __Pyx_GIVEREF(__pyx_int_0); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_11)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":314 + * self.use_amf3 = kwargs.pop('use_amf3', 0) + * + * self.context = kwargs.pop('context', None) # <<<<<<<<<<<<<< + * + * if self.context is None: + */ + __pyx_k_tuple_12 = PyTuple_New(2); if (unlikely(!__pyx_k_tuple_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 314; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_12)); + __Pyx_INCREF(((PyObject *)__pyx_n_s__context)); + PyTuple_SET_ITEM(__pyx_k_tuple_12, 0, ((PyObject *)__pyx_n_s__context)); + __Pyx_GIVEREF(((PyObject *)__pyx_n_s__context)); + __Pyx_INCREF(Py_None); + PyTuple_SET_ITEM(__pyx_k_tuple_12, 1, Py_None); + __Pyx_GIVEREF(Py_None); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_12)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":462 + * + * if isinstance(data, unicode): + * data = data.encode('utf-8') # <<<<<<<<<<<<<< + * + * if not PyString_CheckExact(data): + */ + __pyx_k_tuple_14 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_14)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 462; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_14)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_13)); + PyTuple_SET_ITEM(__pyx_k_tuple_14, 0, ((PyObject *)__pyx_kp_s_13)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_13)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_14)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf0.pyx":465 + * + * if not PyString_CheckExact(data): + * raise TypeError('expected str from xml.tostring') # <<<<<<<<<<<<<< + * + * cdef Py_ssize_t l = PyString_GET_SIZE(data) + */ + __pyx_k_tuple_16 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_16)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 465; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_16)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_15)); + PyTuple_SET_ITEM(__pyx_k_tuple_16, 0, ((PyObject *)__pyx_kp_s_15)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_15)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_16)); + __Pyx_RefNannyFinishContext(); + return 0; + __pyx_L1_error:; + __Pyx_RefNannyFinishContext(); + return -1; +} + static int __Pyx_InitGlobals(void) { if (__Pyx_InitStrings(__pyx_string_tab) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; __pyx_int_0 = PyInt_FromLong(0); if (unlikely(!__pyx_int_0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; @@ -7651,7 +7788,6 @@ PyMODINIT_FUNC PyInit_amf0(void) { PyObject *__pyx_t_1 = NULL; PyObject *__pyx_t_2 = NULL; - PyObject *__pyx_t_3 = NULL; #if CYTHON_REFNANNY void* __pyx_refnanny = NULL; __Pyx_RefNanny = __Pyx_RefNannyImportAPI("refnanny"); @@ -7677,7 +7813,7 @@ PyMODINIT_FUNC PyInit_amf0(void) #endif /*--- Module creation code ---*/ #if PY_MAJOR_VERSION < 3 - __pyx_m = Py_InitModule4(__Pyx_NAMESTR("amf0"), __pyx_methods, __Pyx_DOCSTR(__pyx_k_11), 0, PYTHON_API_VERSION); + __pyx_m = Py_InitModule4(__Pyx_NAMESTR("amf0"), __pyx_methods, __Pyx_DOCSTR(__pyx_k_19), 0, PYTHON_API_VERSION); #else __pyx_m = PyModule_Create(&__pyx_moduledef); #endif @@ -7695,6 +7831,8 @@ PyMODINIT_FUNC PyInit_amf0(void) } /*--- Builtin init code ---*/ if (unlikely(__Pyx_InitCachedBuiltins() < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + /*--- Constants init code ---*/ + if (unlikely(__Pyx_InitCachedConstants() < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /*--- Global init code ---*/ __pyx_v_6cpyamf_4amf0_ASObject = Py_None; Py_INCREF(Py_None); __pyx_v_6cpyamf_4amf0_UnknownClassAlias = Py_None; Py_INCREF(Py_None); @@ -8029,40 +8167,10 @@ PyMODINIT_FUNC PyInit_amf0(void) */ __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); - __pyx_t_1 = PyObject_GetAttr(__pyx_m, __pyx_n_s__Encoder); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__writeList); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_GetAttrString(__pyx_t_3, "__doc__"); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_kp_u_12), __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = PyObject_GetAttr(__pyx_m, __pyx_n_s__Encoder); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__serialiseString); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_GetAttrString(__pyx_t_3, "__doc__"); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_kp_u_13), __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = PyObject_GetAttr(__pyx_m, __pyx_n_s__Encoder); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__writeObject); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_GetAttrString(__pyx_t_3, "__doc__"); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_kp_u_14), __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_s____test__, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; - /* "/Users/nick/dev/rtmpy/lib/python2.6/site-packages/Cython/Includes/cpython/type.pxd":2 + /* "/Library/Python/2.6/site-packages/Cython/Includes/cpython/type.pxd":2 * * cdef extern from "Python.h": # <<<<<<<<<<<<<< * # The C structure of the objects used to describe built-in types. @@ -8072,7 +8180,6 @@ PyMODINIT_FUNC PyInit_amf0(void) __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_1); __Pyx_XDECREF(__pyx_t_2); - __Pyx_XDECREF(__pyx_t_3); if (__pyx_m) { __Pyx_AddTraceback("init cpyamf.amf0"); Py_DECREF(__pyx_m); __pyx_m = 0; diff --git a/cpyamf/amf0.pyx b/cpyamf/amf0.pyx index ec891b4d..651a7d6f 100644 --- a/cpyamf/amf0.pyx +++ b/cpyamf/amf0.pyx @@ -498,6 +498,9 @@ cdef class Encoder(codec.Encoder): @param o: The C{dict} data to be encoded to the AMF0 data stream. """ for key, value in attrs.iteritems(): + if PyInt_Check(key) or PyLong_Check(key): + key = str(key) + self.serialiseString(key) self.writeElement(value) diff --git a/cpyamf/amf3.c b/cpyamf/amf3.c index 6ca7652e..ecef4611 100644 --- a/cpyamf/amf3.c +++ b/cpyamf/amf3.c @@ -1,4 +1,4 @@ -/* Generated by Cython 0.13 on Tue Oct 19 17:29:37 2010 */ +/* Generated by Cython 0.13 on Thu Nov 25 19:27:11 2010 */ #define PY_SSIZE_T_CLEAN #include "Python.h" @@ -163,6 +163,25 @@ #define __Pyx_PyNumber_InPlaceDivide(x,y) PyNumber_InPlaceDivide(x,y) #endif +#if (PY_MAJOR_VERSION < 3) || (PY_VERSION_HEX >= 0x03010300) + #define __Pyx_PySequence_GetSlice(obj, a, b) PySequence_GetSlice(obj, a, b) + #define __Pyx_PySequence_SetSlice(obj, a, b, value) PySequence_SetSlice(obj, a, b, value) + #define __Pyx_PySequence_DelSlice(obj, a, b) PySequence_DelSlice(obj, a, b) +#else + #define __Pyx_PySequence_GetSlice(obj, a, b) (unlikely(!(obj)) ? \ + (PyErr_SetString(PyExc_SystemError, "null argument to internal routine"), (PyObject*)0) : \ + (likely((obj)->ob_type->tp_as_mapping) ? (PySequence_GetSlice(obj, a, b)) : \ + (PyErr_Format(PyExc_TypeError, "'%.200s' object is unsliceable", (obj)->ob_type->tp_name), (PyObject*)0))) + #define __Pyx_PySequence_SetSlice(obj, a, b, value) (unlikely(!(obj)) ? \ + (PyErr_SetString(PyExc_SystemError, "null argument to internal routine"), -1) : \ + (likely((obj)->ob_type->tp_as_mapping) ? (PySequence_SetSlice(obj, a, b, value)) : \ + (PyErr_Format(PyExc_TypeError, "'%.200s' object doesn't support slice assignment", (obj)->ob_type->tp_name), -1))) + #define __Pyx_PySequence_DelSlice(obj, a, b) (unlikely(!(obj)) ? \ + (PyErr_SetString(PyExc_SystemError, "null argument to internal routine"), -1) : \ + (likely((obj)->ob_type->tp_as_mapping) ? (PySequence_DelSlice(obj, a, b)) : \ + (PyErr_Format(PyExc_TypeError, "'%.200s' object doesn't support slice deletion", (obj)->ob_type->tp_name), -1))) +#endif + #if PY_MAJOR_VERSION >= 3 #define PyMethod_New(func, self, klass) ((self) ? PyMethod_New(func, self) : PyInstanceMethod_New(func)) #endif @@ -359,7 +378,7 @@ struct __pyx_opt_args_6cpyamf_4amf3_7Encoder_writeList { int is_proxy; }; -/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":849 +/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":852 * self.writeElement(n[k]) * * cpdef int writeObject(self, object obj, bint is_proxy=0) except -1: # <<<<<<<<<<<<<< @@ -372,7 +391,7 @@ struct __pyx_opt_args_6cpyamf_4amf3_7Encoder_writeObject { int is_proxy; }; -/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1092 +/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1095 * * * cdef int decode_int(cBufferedByteStream stream, int sign=0) except? -1: # <<<<<<<<<<<<<< @@ -1204,26 +1223,19 @@ static PyObject *__pyx_builtin_TypeError; static PyObject *__pyx_builtin_ValueError; static PyObject *__pyx_builtin_KeyError; static char __pyx_k_1[] = "encodable_properties"; -static char __pyx_k_2[] = "TypedObjectClassAlias"; -static char __pyx_k_3[] = "Unknown reference"; -static char __pyx_k_4[] = "Unknown object encoding"; -static char __pyx_k_5[] = "Unsupported ActionScript type"; -static char __pyx_k_6[] = "Expected str or unicode"; -static char __pyx_k_7[] = ""; -static char __pyx_k_8[] = "dicts cannot contain empty string keys"; -static char __pyx_k_9[] = "Non int/str key value found in dict"; -static char __pyx_k_10[] = "getEncodableAttributes"; -static char __pyx_k_11[] = "Expected dict for encodable attributes"; -static char __pyx_k_12[] = "utf-8"; -static char __pyx_k_13[] = "Expected string from xml serialization"; -static char __pyx_k_14[] = "\nC-extension for L{pyamf.amf3} Python module in L{PyAMF}.\n\n@since: 0.6\n"; -static char __pyx_k_15[] = "Context.clear (line 151)"; -static char __pyx_k_16[] = "Context.addString (line 172)"; -static char __pyx_k_17[] = "Context.getProxyForObject (line 195)"; -static char __pyx_k_18[] = "Context.getObjectForProxy (line 216)"; -static char __pyx_k_19[] = "Context.addProxyObject (line 237)"; -static char __pyx_k_20[] = "Decoder.readString (line 290)"; -static char __pyx_k_21[] = "Encoder.serialiseString (line 626)"; +static char __pyx_k_3[] = "TypedObjectClassAlias"; +static char __pyx_k_4[] = "Unknown reference"; +static char __pyx_k_6[] = "Unknown object encoding"; +static char __pyx_k_8[] = "Unsupported ActionScript type"; +static char __pyx_k_11[] = "Expected str or unicode"; +static char __pyx_k_13[] = ""; +static char __pyx_k_14[] = "dicts cannot contain empty string keys"; +static char __pyx_k_16[] = "Non int/str key value found in dict"; +static char __pyx_k_18[] = "getEncodableAttributes"; +static char __pyx_k_19[] = "Expected dict for encodable attributes"; +static char __pyx_k_21[] = "utf-8"; +static char __pyx_k_23[] = "Expected string from xml serialization"; +static char __pyx_k_25[] = "\nC-extension for L{pyamf.amf3} Python module in L{PyAMF}.\n\n@since: 0.6\n"; static char __pyx_k__n[] = "n"; static char __pyx_k__obj[] = "obj"; static char __pyx_k__pop[] = "pop"; @@ -1251,9 +1263,6 @@ static char __pyx_k__decode[] = "decode"; static char __pyx_k__encode[] = "encode"; static char __pyx_k__stream[] = "stream"; static char __pyx_k__strict[] = "strict"; -static char __pyx_k__Context[] = "Context"; -static char __pyx_k__Decoder[] = "Decoder"; -static char __pyx_k__Encoder[] = "Encoder"; static char __pyx_k__classes[] = "classes"; static char __pyx_k__compile[] = "compile"; static char __pyx_k__context[] = "context"; @@ -1350,34 +1359,24 @@ static char __pyx_k___getClassDefinition[] = "_getClassDefinition"; static char __pyx_k__getClassByReference[] = "getClassByReference"; static char __pyx_k__use_proxies_default[] = "use_proxies_default"; static PyObject *__pyx_n_s_1; -static PyObject *__pyx_n_s_10; static PyObject *__pyx_kp_s_11; -static PyObject *__pyx_kp_s_12; static PyObject *__pyx_kp_s_13; -static PyObject *__pyx_kp_u_15; -static PyObject *__pyx_kp_u_16; -static PyObject *__pyx_kp_u_17; -static PyObject *__pyx_kp_u_18; -static PyObject *__pyx_kp_u_19; -static PyObject *__pyx_n_s_2; -static PyObject *__pyx_kp_u_20; -static PyObject *__pyx_kp_u_21; -static PyObject *__pyx_kp_s_3; +static PyObject *__pyx_kp_s_14; +static PyObject *__pyx_kp_s_16; +static PyObject *__pyx_n_s_18; +static PyObject *__pyx_kp_s_19; +static PyObject *__pyx_kp_s_21; +static PyObject *__pyx_kp_s_23; +static PyObject *__pyx_n_s_3; static PyObject *__pyx_kp_s_4; -static PyObject *__pyx_kp_s_5; static PyObject *__pyx_kp_s_6; -static PyObject *__pyx_kp_s_7; static PyObject *__pyx_kp_s_8; -static PyObject *__pyx_kp_s_9; static PyObject *__pyx_n_s__ASObject; static PyObject *__pyx_n_s__ByteArray; -static PyObject *__pyx_n_s__Context; static PyObject *__pyx_n_s__DataInput; static PyObject *__pyx_n_s__DataOutput; static PyObject *__pyx_n_s__DecodeError; -static PyObject *__pyx_n_s__Decoder; static PyObject *__pyx_n_s__EncodeError; -static PyObject *__pyx_n_s__Encoder; static PyObject *__pyx_n_s__ImportError; static PyObject *__pyx_n_s__KeyError; static PyObject *__pyx_n_s__MixedArray; @@ -1497,6 +1496,19 @@ static PyObject *__pyx_n_s__zlib; static PyObject *__pyx_int_0; static PyObject *__pyx_int_1; static PyObject *__pyx_int_neg_1; +static PyObject *__pyx_k_tuple_2; +static PyObject *__pyx_k_tuple_5; +static PyObject *__pyx_k_tuple_7; +static PyObject *__pyx_k_tuple_9; +static PyObject *__pyx_k_tuple_10; +static PyObject *__pyx_k_tuple_12; +static PyObject *__pyx_k_tuple_15; +static PyObject *__pyx_k_tuple_17; +static PyObject *__pyx_k_tuple_20; +static PyObject *__pyx_k_tuple_22; +static PyObject *__pyx_k_tuple_24; +static PyObject *__pyx_k_tuple_26; +static PyObject *__pyx_k_tuple_27; /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":69 * """ @@ -1970,7 +1982,7 @@ static int __pyx_f_6cpyamf_4amf3_15ClassDefinition_writeReference(struct __pyx_ * * ref |= self.encoding << 2 | REFERENCE_BIT << 1 | REFERENCE_BIT */ - __pyx_v_ref += (__pyx_v_self->attr_len << 4); + __pyx_v_ref = (__pyx_v_ref + (__pyx_v_self->attr_len << 4)); goto __pyx_L4; } __pyx_L4:; @@ -1982,7 +1994,7 @@ static int __pyx_f_6cpyamf_4amf3_15ClassDefinition_writeReference(struct __pyx_ * * try: */ - __pyx_v_ref |= (((__pyx_v_self->encoding << 2) | (__pyx_v_6cpyamf_4amf3_REFERENCE_BIT << 1)) | __pyx_v_6cpyamf_4amf3_REFERENCE_BIT); + __pyx_v_ref = (__pyx_v_ref | (((__pyx_v_self->encoding << 2) | (__pyx_v_6cpyamf_4amf3_REFERENCE_BIT << 1)) | __pyx_v_6cpyamf_4amf3_REFERENCE_BIT)); /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":118 * ref |= self.encoding << 2 | REFERENCE_BIT << 1 | REFERENCE_BIT @@ -2593,13 +2605,13 @@ static PyObject *__pyx_f_6cpyamf_4amf3_7Context_getString(struct __pyx_obj_6cpy __pyx_t_2 = PyInt_FromSsize_t(__pyx_v_ref); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2); __Pyx_GIVEREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_Call(__pyx_t_1, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; __pyx_r = __pyx_t_2; __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; @@ -2702,13 +2714,13 @@ static Py_ssize_t __pyx_f_6cpyamf_4amf3_7Context_getStringReference(struct __py __Pyx_GOTREF(__pyx_t_1); if (!PyCFunction_Check(__pyx_t_1) || (PyCFunction_GET_FUNCTION(__pyx_t_1) != (void *)&__pyx_pf_6cpyamf_4amf3_7Context_getStringReference)) { __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_v_s); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_s); __Pyx_GIVEREF(__pyx_v_s); - __pyx_t_3 = PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __pyx_t_4 = __Pyx_PyIndex_AsSsize_t(__pyx_t_3); if (unlikely((__pyx_t_4 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_r = __pyx_t_4; @@ -2800,13 +2812,13 @@ static Py_ssize_t __pyx_f_6cpyamf_4amf3_7Context_addString(struct __pyx_obj_6cp __Pyx_GOTREF(__pyx_t_1); if (!PyCFunction_Check(__pyx_t_1) || (PyCFunction_GET_FUNCTION(__pyx_t_1) != (void *)&__pyx_pf_6cpyamf_4amf3_7Context_addString)) { __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 172; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_v_s); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_s); __Pyx_GIVEREF(__pyx_v_s); - __pyx_t_3 = PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 172; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 172; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __pyx_t_4 = __Pyx_PyIndex_AsSsize_t(__pyx_t_3); if (unlikely((__pyx_t_4 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 172; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_r = __pyx_t_4; @@ -2901,13 +2913,13 @@ static PyObject *__pyx_f_6cpyamf_4amf3_7Context_getClassByReference(struct __py __pyx_t_2 = PyInt_FromSsize_t(__pyx_v_ref); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 178; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 178; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2); __Pyx_GIVEREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_Call(__pyx_t_1, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 178; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 178; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; __pyx_r = __pyx_t_2; __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; @@ -3016,13 +3028,13 @@ static struct __pyx_obj_6cpyamf_4amf3_ClassDefinition *__pyx_f_6cpyamf_4amf3_7C if (!PyCFunction_Check(__pyx_t_1) || (PyCFunction_GET_FUNCTION(__pyx_t_1) != (void *)&__pyx_pf_6cpyamf_4amf3_7Context_getClass)) { __Pyx_XDECREF(((PyObject *)__pyx_r)); __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 181; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_v_klass); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_klass); __Pyx_GIVEREF(__pyx_v_klass); - __pyx_t_3 = PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 181; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 181; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_6cpyamf_4amf3_ClassDefinition))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 181; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = ((struct __pyx_obj_6cpyamf_4amf3_ClassDefinition *)__pyx_t_3); __pyx_t_3 = 0; @@ -3121,16 +3133,16 @@ static Py_ssize_t __pyx_f_6cpyamf_4amf3_7Context_addClass(struct __pyx_obj_6cpy __Pyx_GOTREF(__pyx_t_1); if (!PyCFunction_Check(__pyx_t_1) || (PyCFunction_GET_FUNCTION(__pyx_t_1) != (void *)&__pyx_pf_6cpyamf_4amf3_7Context_addClass)) { __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(((PyObject *)__pyx_v_alias)); PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_v_alias)); __Pyx_GIVEREF(((PyObject *)__pyx_v_alias)); __Pyx_INCREF(__pyx_v_klass); PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_v_klass); __Pyx_GIVEREF(__pyx_v_klass); - __pyx_t_3 = PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __pyx_t_4 = __Pyx_PyIndex_AsSsize_t(__pyx_t_3); if (unlikely((__pyx_t_4 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_r = __pyx_t_4; @@ -3187,7 +3199,7 @@ static Py_ssize_t __pyx_f_6cpyamf_4amf3_7Context_addClass(struct __pyx_obj_6cpy * * return ref */ - __pyx_v_self->class_idx += 1; + __pyx_v_self->class_idx = (__pyx_v_self->class_idx + 1); /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":193 * self.class_idx += 1 @@ -3323,13 +3335,13 @@ static PyObject *__pyx_f_6cpyamf_4amf3_7Context_getProxyForObject(struct __pyx_ if (!PyCFunction_Check(__pyx_t_1) || (PyCFunction_GET_FUNCTION(__pyx_t_1) != (void *)&__pyx_pf_6cpyamf_4amf3_7Context_getProxyForObject)) { __Pyx_XDECREF(__pyx_r); __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 195; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_v_obj); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_obj); __Pyx_GIVEREF(__pyx_v_obj); - __pyx_t_3 = PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 195; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 195; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __pyx_r = __pyx_t_3; __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; @@ -3408,14 +3420,14 @@ static PyObject *__pyx_f_6cpyamf_4amf3_7Context_getProxyForObject(struct __pyx_ __pyx_t_3 = PyObject_GetAttr(__pyx_v_flex, __pyx_n_s__proxy_object); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 210; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 210; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); + __Pyx_GOTREF(((PyObject *)__pyx_t_1)); __Pyx_INCREF(__pyx_v_obj); PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_obj); __Pyx_GIVEREF(__pyx_v_obj); - __pyx_t_2 = PyObject_Call(__pyx_t_3, __pyx_t_1, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 210; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 210; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_v_proxied); __pyx_v_proxied = __pyx_t_2; __pyx_t_2 = 0; @@ -3521,13 +3533,13 @@ static PyObject *__pyx_f_6cpyamf_4amf3_7Context_getObjectForProxy(struct __pyx_ if (!PyCFunction_Check(__pyx_t_1) || (PyCFunction_GET_FUNCTION(__pyx_t_1) != (void *)&__pyx_pf_6cpyamf_4amf3_7Context_getObjectForProxy)) { __Pyx_XDECREF(__pyx_r); __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 216; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_v_proxy); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_proxy); __Pyx_GIVEREF(__pyx_v_proxy); - __pyx_t_3 = PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 216; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 216; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __pyx_r = __pyx_t_3; __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; @@ -3606,14 +3618,14 @@ static PyObject *__pyx_f_6cpyamf_4amf3_7Context_getObjectForProxy(struct __pyx_ __pyx_t_3 = PyObject_GetAttr(__pyx_v_flex, __pyx_n_s__unproxy_object); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 231; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 231; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); + __Pyx_GOTREF(((PyObject *)__pyx_t_1)); __Pyx_INCREF(__pyx_v_proxy); PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_proxy); __Pyx_GIVEREF(__pyx_v_proxy); - __pyx_t_2 = PyObject_Call(__pyx_t_3, __pyx_t_1, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 231; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 231; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_v_obj); __pyx_v_obj = __pyx_t_2; __pyx_t_2 = 0; @@ -3712,16 +3724,16 @@ static int __pyx_f_6cpyamf_4amf3_7Context_addProxyObject(struct __pyx_obj_6cpya __Pyx_GOTREF(__pyx_t_1); if (!PyCFunction_Check(__pyx_t_1) || (PyCFunction_GET_FUNCTION(__pyx_t_1) != (void *)&__pyx_pf_6cpyamf_4amf3_7Context_addProxyObject)) { __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 237; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_v_obj); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_obj); __Pyx_GIVEREF(__pyx_v_obj); __Pyx_INCREF(__pyx_v_proxied); PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_v_proxied); __Pyx_GIVEREF(__pyx_v_proxied); - __pyx_t_3 = PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 237; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 237; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __pyx_t_4 = __Pyx_PyInt_AsInt(__pyx_t_3); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 237; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_r = __pyx_t_4; @@ -3872,8 +3884,8 @@ static int __pyx_pf_6cpyamf_4amf3_7Decoder___init__(PyObject *__pyx_v_self, PyOb int __pyx_r; PyObject *__pyx_t_1 = NULL; PyObject *__pyx_t_2 = NULL; - PyObject *__pyx_t_3 = NULL; - int __pyx_t_4; + int __pyx_t_3; + PyObject *__pyx_t_4 = NULL; PyObject *__pyx_t_5 = NULL; __Pyx_RefNannySetupContext("__init__"); if (unlikely(__pyx_kwds) && unlikely(!__Pyx_CheckKeywordStrings(__pyx_kwds, "__init__", 1))) return -1; @@ -3893,21 +3905,12 @@ static int __pyx_pf_6cpyamf_4amf3_7Decoder___init__(PyObject *__pyx_v_self, PyOb */ __pyx_t_1 = PyObject_GetAttr(((PyObject *)__pyx_v_kwargs), __pyx_n_s__pop); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 256; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 256; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_k_tuple_2), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 256; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_INCREF(((PyObject *)__pyx_n_s__context)); - PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_n_s__context)); - __Pyx_GIVEREF(((PyObject *)__pyx_n_s__context)); - __Pyx_INCREF(Py_None); - PyTuple_SET_ITEM(__pyx_t_2, 1, Py_None); - __Pyx_GIVEREF(Py_None); - __pyx_t_3 = PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 256; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_v_context); - __pyx_v_context = __pyx_t_3; - __pyx_t_3 = 0; + __pyx_v_context = __pyx_t_2; + __pyx_t_2 = 0; /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":258 * context = kwargs.pop('context', None) @@ -3916,8 +3919,8 @@ static int __pyx_pf_6cpyamf_4amf3_7Decoder___init__(PyObject *__pyx_v_self, PyOb * context = Context() * */ - __pyx_t_4 = (__pyx_v_context == Py_None); - if (__pyx_t_4) { + __pyx_t_3 = (__pyx_v_context == Py_None); + if (__pyx_t_3) { /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":259 * @@ -3926,11 +3929,11 @@ static int __pyx_pf_6cpyamf_4amf3_7Decoder___init__(PyObject *__pyx_v_self, PyOb * * self.context = context */ - __pyx_t_3 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_6cpyamf_4amf3_Context)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 259; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __pyx_t_2 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_6cpyamf_4amf3_Context)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 259; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_v_context); - __pyx_v_context = __pyx_t_3; - __pyx_t_3 = 0; + __pyx_v_context = __pyx_t_2; + __pyx_t_2 = 0; goto __pyx_L5; } __pyx_L5:; @@ -3956,31 +3959,31 @@ static int __pyx_pf_6cpyamf_4amf3_7Decoder___init__(PyObject *__pyx_v_self, PyOb * * cdef object readInteger(self, int signed=1): */ - __pyx_t_3 = PyObject_GetAttr(((PyObject *)((PyObject*)__pyx_ptype_6cpyamf_5codec_Decoder)), __pyx_n_s____init__); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 263; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 263; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_GetAttr(((PyObject *)((PyObject*)__pyx_ptype_6cpyamf_5codec_Decoder)), __pyx_n_s____init__); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 263; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); + __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 263; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_1)); __Pyx_INCREF(__pyx_v_self); - PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_self); + PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_self); __Pyx_GIVEREF(__pyx_v_self); - __pyx_t_1 = PySequence_Tuple(((PyObject *)__pyx_v_args)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 263; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(((PyObject *)__pyx_t_1)); - __pyx_t_5 = PyNumber_Add(__pyx_t_2, ((PyObject *)__pyx_t_1)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 263; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __pyx_t_4 = PySequence_Tuple(((PyObject *)__pyx_v_args)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 263; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_4)); + __pyx_t_5 = PyNumber_Add(((PyObject *)__pyx_t_1), ((PyObject *)__pyx_t_4)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 263; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_5)); __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0; - __pyx_t_1 = PyEval_CallObjectWithKeywords(__pyx_t_3, __pyx_t_5, ((PyObject *)__pyx_v_kwargs)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 263; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0; + __pyx_t_4 = PyEval_CallObjectWithKeywords(__pyx_t_2, ((PyObject *)__pyx_t_5), ((PyObject *)__pyx_v_kwargs)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 263; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_4); + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __pyx_r = 0; goto __pyx_L0; __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_1); __Pyx_XDECREF(__pyx_t_2); - __Pyx_XDECREF(__pyx_t_3); + __Pyx_XDECREF(__pyx_t_4); __Pyx_XDECREF(__pyx_t_5); __Pyx_AddTraceback("cpyamf.amf3.Decoder.__init__"); __pyx_r = -1; @@ -4238,7 +4241,7 @@ static PyObject *__pyx_f_6cpyamf_4amf3_7Decoder_readString(struct __pyx_obj_6cp * * if r == 0: */ - __pyx_v_r >>= 1; + __pyx_v_r = (__pyx_v_r >> 1); /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":303 * r >>= 1 @@ -4446,14 +4449,14 @@ static PyObject *__pyx_f_6cpyamf_4amf3_7Decoder_readDate(struct __pyx_obj_6cpya __pyx_t_3 = PyFloat_FromDouble((__pyx_v_ms / 1000.0)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_6); + __Pyx_GOTREF(((PyObject *)__pyx_t_6)); PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_3); __Pyx_GIVEREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = PyObject_Call(__pyx_t_5, __pyx_t_6, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_t_5, ((PyObject *)__pyx_t_6), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_6)); __pyx_t_6 = 0; __pyx_v_result = __pyx_t_3; __pyx_t_3 = 0; @@ -4591,7 +4594,7 @@ static PyObject *__pyx_f_6cpyamf_4amf3_7Decoder_readList(struct __pyx_obj_6cpya * key = self.readString() * */ - __pyx_v_size >>= 1; + __pyx_v_size = (__pyx_v_size >> 1); /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":353 * @@ -4662,7 +4665,7 @@ static PyObject *__pyx_f_6cpyamf_4amf3_7Decoder_readList(struct __pyx_obj_6cpya } __pyx_t_3 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Decoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.readElement(((struct __pyx_obj_6cpyamf_5codec_Decoder *)__pyx_v_self), 0); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 361; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __pyx_t_5 = PyList_Append(((PyObject *)__pyx_v_result), __pyx_t_3); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 361; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyList_Append(__pyx_v_result, __pyx_t_3); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 361; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; } @@ -4869,7 +4872,7 @@ static struct __pyx_obj_6cpyamf_4amf3_ClassDefinition *__pyx_f_6cpyamf_4amf3_7D * * cdef object name = self.readString() */ - __pyx_v_ref >>= 1; + __pyx_v_ref = (__pyx_v_ref >> 1); /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":387 * ref >>= 1 @@ -5014,18 +5017,18 @@ static struct __pyx_obj_6cpyamf_4amf3_ClassDefinition *__pyx_f_6cpyamf_4amf3_7D */ __pyx_t_6 = __Pyx_GetName(__pyx_m, __pyx_n_s__pyamf); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 400; __pyx_clineno = __LINE__; goto __pyx_L7_except_error;} __Pyx_GOTREF(__pyx_t_6); - __pyx_t_7 = PyObject_GetAttr(__pyx_t_6, __pyx_n_s_2); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 400; __pyx_clineno = __LINE__; goto __pyx_L7_except_error;} + __pyx_t_7 = PyObject_GetAttr(__pyx_t_6, __pyx_n_s_3); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 400; __pyx_clineno = __LINE__; goto __pyx_L7_except_error;} __Pyx_GOTREF(__pyx_t_7); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 400; __pyx_clineno = __LINE__; goto __pyx_L7_except_error;} - __Pyx_GOTREF(__pyx_t_6); + __Pyx_GOTREF(((PyObject *)__pyx_t_6)); __Pyx_INCREF(__pyx_v_name); PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_v_name); __Pyx_GIVEREF(__pyx_v_name); - __pyx_t_8 = PyObject_Call(__pyx_t_7, __pyx_t_6, NULL); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 400; __pyx_clineno = __LINE__; goto __pyx_L7_except_error;} + __pyx_t_8 = PyObject_Call(__pyx_t_7, ((PyObject *)__pyx_t_6), NULL); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 400; __pyx_clineno = __LINE__; goto __pyx_L7_except_error;} __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_6)); __pyx_t_6 = 0; __Pyx_DECREF(__pyx_v_alias); __pyx_v_alias = __pyx_t_8; __pyx_t_8 = 0; @@ -5056,13 +5059,13 @@ static struct __pyx_obj_6cpyamf_4amf3_ClassDefinition *__pyx_f_6cpyamf_4amf3_7D * class_def.encoding = ref & 0x03 */ __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 402; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); + __Pyx_GOTREF(((PyObject *)__pyx_t_5)); __Pyx_INCREF(__pyx_v_alias); PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_v_alias); __Pyx_GIVEREF(__pyx_v_alias); - __pyx_t_3 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_6cpyamf_4amf3_ClassDefinition)), __pyx_t_5, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 402; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_6cpyamf_4amf3_ClassDefinition)), ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 402; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; __pyx_v_class_def = ((struct __pyx_obj_6cpyamf_4amf3_ClassDefinition *)__pyx_t_3); __pyx_t_3 = 0; @@ -5131,7 +5134,7 @@ static struct __pyx_obj_6cpyamf_4amf3_ClassDefinition *__pyx_f_6cpyamf_4amf3_7D } __pyx_t_3 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Decoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.readString(((struct __pyx_obj_6cpyamf_5codec_Decoder *)__pyx_v_self), 0); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 410; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __pyx_t_4 = PyList_Append(((PyObject *)__pyx_v_class_def->static_properties), __pyx_t_3); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 410; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyList_Append(__pyx_v_class_def->static_properties, __pyx_t_3); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 410; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; } goto __pyx_L16; @@ -5449,17 +5452,11 @@ static PyObject *__pyx_f_6cpyamf_4amf3_7Decoder_readObject(struct __pyx_obj_6cp __pyx_t_4 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s__ReferenceError); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 459; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 459; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_t_4, ((PyObject *)__pyx_k_tuple_5), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 459; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_3)); - PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_kp_s_3)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_3)); - __pyx_t_5 = PyObject_Call(__pyx_t_4, __pyx_t_3, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 459; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __Pyx_Raise(__pyx_t_3, 0, 0); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __Pyx_Raise(__pyx_t_5, 0, 0); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; {__pyx_filename = __pyx_f[0]; __pyx_lineno = 459; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L4; } @@ -5483,10 +5480,10 @@ static PyObject *__pyx_f_6cpyamf_4amf3_7Decoder_readObject(struct __pyx_obj_6cp * return obj */ __Pyx_XDECREF(__pyx_r); - __pyx_t_5 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Decoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->readProxy(__pyx_v_self, __pyx_v_obj); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 462; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __pyx_r = __pyx_t_5; - __pyx_t_5 = 0; + __pyx_t_3 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Decoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->readProxy(__pyx_v_self, __pyx_v_obj); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 462; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_3); + __pyx_r = __pyx_t_3; + __pyx_t_3 = 0; goto __pyx_L0; goto __pyx_L5; } @@ -5514,10 +5511,10 @@ static PyObject *__pyx_f_6cpyamf_4amf3_7Decoder_readObject(struct __pyx_obj_6cp * cdef object alias = class_def.alias * */ - __pyx_t_5 = ((PyObject *)((struct __pyx_vtabstruct_6cpyamf_4amf3_Decoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->_getClassDefinition(__pyx_v_self, (__pyx_v_ref >> 1))); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 466; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __pyx_v_class_def = ((struct __pyx_obj_6cpyamf_4amf3_ClassDefinition *)__pyx_t_5); - __pyx_t_5 = 0; + __pyx_t_3 = ((PyObject *)((struct __pyx_vtabstruct_6cpyamf_4amf3_Decoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->_getClassDefinition(__pyx_v_self, (__pyx_v_ref >> 1))); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 466; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_3); + __pyx_v_class_def = ((struct __pyx_obj_6cpyamf_4amf3_ClassDefinition *)__pyx_t_3); + __pyx_t_3 = 0; /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":467 * @@ -5536,18 +5533,18 @@ static PyObject *__pyx_f_6cpyamf_4amf3_7Decoder_readObject(struct __pyx_obj_6cp * cdef dict obj_attrs = {} * */ - __pyx_t_5 = PyObject_GetAttr(__pyx_v_alias, __pyx_n_s__createInstance); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 469; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_GetAttr(__pyx_v_alias, __pyx_n_s__createInstance); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 469; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_3); + __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 469; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_4)); + if (PyDict_SetItem(__pyx_t_4, ((PyObject *)__pyx_n_s__codec), ((PyObject *)__pyx_v_self)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 469; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyEval_CallObjectWithKeywords(__pyx_t_3, ((PyObject *)__pyx_empty_tuple), ((PyObject *)__pyx_t_4)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 469; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); - __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 469; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(((PyObject *)__pyx_t_3)); - if (PyDict_SetItem(__pyx_t_3, ((PyObject *)__pyx_n_s__codec), ((PyObject *)__pyx_v_self)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 469; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_t_4 = PyEval_CallObjectWithKeywords(__pyx_t_5, ((PyObject *)__pyx_empty_tuple), ((PyObject *)__pyx_t_3)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 469; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_v_obj); - __pyx_v_obj = __pyx_t_4; - __pyx_t_4 = 0; + __pyx_v_obj = __pyx_t_5; + __pyx_t_5 = 0; /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":470 * @@ -5556,10 +5553,10 @@ static PyObject *__pyx_f_6cpyamf_4amf3_7Decoder_readObject(struct __pyx_obj_6cp * * self.context.addObject(obj) */ - __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 470; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(((PyObject *)__pyx_t_4)); - __pyx_v_obj_attrs = __pyx_t_4; - __pyx_t_4 = 0; + __pyx_t_5 = PyDict_New(); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 470; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_5)); + __pyx_v_obj_attrs = __pyx_t_5; + __pyx_t_5 = 0; /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":472 * cdef dict obj_attrs = {} @@ -5644,26 +5641,26 @@ static PyObject *__pyx_f_6cpyamf_4amf3_7Decoder_readObject(struct __pyx_obj_6cp * * if self.use_proxies == 1: */ - __pyx_t_4 = PyObject_GetAttr(__pyx_v_obj, __pyx_n_s____readamf__); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 480; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 480; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __pyx_t_5 = PyObject_GetAttr(__pyx_v_obj, __pyx_n_s____readamf__); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 480; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_5); + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 480; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_4)); __Pyx_INCREF(((PyObject *)__pyx_v_self)); - PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_v_self)); + PyTuple_SET_ITEM(__pyx_t_4, 0, ((PyObject *)__pyx_v_self)); __Pyx_GIVEREF(((PyObject *)__pyx_v_self)); - __pyx_t_5 = PyObject_Call(__pyx_v_6cpyamf_4amf3_DataInput, __pyx_t_3, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 480; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 480; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_v_6cpyamf_4amf3_DataInput, ((PyObject *)__pyx_t_4), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 480; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_3); + __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0; + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 480; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_4)); + PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); + __Pyx_GIVEREF(__pyx_t_3); + __pyx_t_3 = 0; + __pyx_t_3 = PyObject_Call(__pyx_t_5, ((PyObject *)__pyx_t_4), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 480; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_5); - __Pyx_GIVEREF(__pyx_t_5); - __pyx_t_5 = 0; - __pyx_t_5 = PyObject_Call(__pyx_t_4, __pyx_t_3, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 480; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0; + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":482 * obj.__readamf__(DataInput(self)) @@ -5683,10 +5680,10 @@ static PyObject *__pyx_f_6cpyamf_4amf3_7Decoder_readObject(struct __pyx_obj_6cp * return obj */ __Pyx_XDECREF(__pyx_r); - __pyx_t_5 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Decoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->readProxy(__pyx_v_self, __pyx_v_obj); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 483; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __pyx_r = __pyx_t_5; - __pyx_t_5 = 0; + __pyx_t_3 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Decoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->readProxy(__pyx_v_self, __pyx_v_obj); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 483; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_3); + __pyx_r = __pyx_t_3; + __pyx_t_3 = 0; goto __pyx_L0; goto __pyx_L7; } @@ -5714,22 +5711,16 @@ static PyObject *__pyx_f_6cpyamf_4amf3_7Decoder_readObject(struct __pyx_obj_6cp * * alias.applyAttributes(obj, obj_attrs, codec=self) */ - __pyx_t_5 = __Pyx_GetName(__pyx_m, __pyx_n_s__pyamf); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 487; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __pyx_t_3 = PyObject_GetAttr(__pyx_t_5, __pyx_n_s__DecodeError); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 487; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_GetName(__pyx_m, __pyx_n_s__pyamf); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 487; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 487; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_4)); - PyTuple_SET_ITEM(__pyx_t_5, 0, ((PyObject *)__pyx_kp_s_4)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_4)); - __pyx_t_4 = PyObject_Call(__pyx_t_3, __pyx_t_5, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 487; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s__DecodeError); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 487; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __Pyx_Raise(__pyx_t_4, 0, 0); + __pyx_t_3 = PyObject_Call(__pyx_t_4, ((PyObject *)__pyx_k_tuple_7), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 487; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __Pyx_Raise(__pyx_t_3, 0, 0); + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; {__pyx_filename = __pyx_f[0]; __pyx_lineno = 487; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } __pyx_L6:; @@ -5741,24 +5732,24 @@ static PyObject *__pyx_f_6cpyamf_4amf3_7Decoder_readObject(struct __pyx_obj_6cp * * if self.use_proxies: */ - __pyx_t_4 = PyObject_GetAttr(__pyx_v_alias, __pyx_n_s__applyAttributes); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 489; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); - __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 489; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); + __pyx_t_3 = PyObject_GetAttr(__pyx_v_alias, __pyx_n_s__applyAttributes); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 489; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_3); + __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 489; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_4)); __Pyx_INCREF(__pyx_v_obj); - PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_v_obj); + PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_v_obj); __Pyx_GIVEREF(__pyx_v_obj); __Pyx_INCREF(((PyObject *)__pyx_v_obj_attrs)); - PyTuple_SET_ITEM(__pyx_t_5, 1, ((PyObject *)__pyx_v_obj_attrs)); + PyTuple_SET_ITEM(__pyx_t_4, 1, ((PyObject *)__pyx_v_obj_attrs)); __Pyx_GIVEREF(((PyObject *)__pyx_v_obj_attrs)); - __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 489; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(((PyObject *)__pyx_t_3)); - if (PyDict_SetItem(__pyx_t_3, ((PyObject *)__pyx_n_s__codec), ((PyObject *)__pyx_v_self)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 489; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_t_9 = PyEval_CallObjectWithKeywords(__pyx_t_4, __pyx_t_5, ((PyObject *)__pyx_t_3)); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 489; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyDict_New(); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 489; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_5)); + if (PyDict_SetItem(__pyx_t_5, ((PyObject *)__pyx_n_s__codec), ((PyObject *)__pyx_v_self)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 489; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_9 = PyEval_CallObjectWithKeywords(__pyx_t_3, ((PyObject *)__pyx_t_4), ((PyObject *)__pyx_t_5)); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 489; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_9); - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":491 @@ -5886,7 +5877,7 @@ static PyObject *__pyx_f_6cpyamf_4amf3_7Decoder_readXML(struct __pyx_obj_6cpyam * * cdef char *buf = NULL */ - __pyx_v_ref >>= 1; + __pyx_v_ref = (__pyx_v_ref >> 1); /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":507 * ref >>= 1 @@ -5932,14 +5923,14 @@ static PyObject *__pyx_f_6cpyamf_4amf3_7Decoder_readXML(struct __pyx_obj_6cpyam __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 513; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); __Pyx_INCREF(__pyx_v_s); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_s); __Pyx_GIVEREF(__pyx_v_s); - __pyx_t_6 = PyObject_Call(__pyx_t_5, __pyx_t_3, NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 513; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = PyObject_Call(__pyx_t_5, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 513; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_v_x); __pyx_v_x = __pyx_t_6; __pyx_t_6 = 0; @@ -6068,7 +6059,7 @@ static PyObject *__pyx_f_6cpyamf_4amf3_7Decoder_readByteArray(struct __pyx_obj_ * * self.stream.read(&buf, ref) */ - __pyx_v_ref >>= 1; + __pyx_v_ref = (__pyx_v_ref >> 1); /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":538 * ref >>= 1 @@ -6133,14 +6124,14 @@ static PyObject *__pyx_f_6cpyamf_4amf3_7Decoder_readByteArray(struct __pyx_obj_ __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 543; __pyx_clineno = __LINE__; goto __pyx_L5_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); __Pyx_INCREF(__pyx_v_s); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_s); __Pyx_GIVEREF(__pyx_v_s); - __pyx_t_6 = PyObject_Call(__pyx_t_5, __pyx_t_3, NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 543; __pyx_clineno = __LINE__; goto __pyx_L5_error;} + __pyx_t_6 = PyObject_Call(__pyx_t_5, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 543; __pyx_clineno = __LINE__; goto __pyx_L5_error;} __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_v_s); __pyx_v_s = __pyx_t_6; __pyx_t_6 = 0; @@ -6227,13 +6218,13 @@ static PyObject *__pyx_f_6cpyamf_4amf3_7Decoder_readByteArray(struct __pyx_obj_ * s.compressed = compressed */ __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 548; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); + __Pyx_GOTREF(((PyObject *)__pyx_t_5)); __Pyx_INCREF(__pyx_v_s); PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_v_s); __Pyx_GIVEREF(__pyx_v_s); - __pyx_t_6 = PyObject_Call(__pyx_v_6cpyamf_4amf3_ByteArrayType, __pyx_t_5, NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 548; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = PyObject_Call(__pyx_v_6cpyamf_4amf3_ByteArrayType, ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 548; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_6); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_v_s); __pyx_v_s = __pyx_t_6; __pyx_t_6 = 0; @@ -6341,7 +6332,6 @@ static PyObject *__pyx_f_6cpyamf_4amf3_7Decoder_readConcreteElement(struct __py PyObject *__pyx_t_2 = NULL; struct __pyx_opt_args_6cpyamf_4amf3_7Decoder_readInteger __pyx_t_3; PyObject *__pyx_t_4 = NULL; - PyObject *__pyx_t_5 = NULL; __Pyx_RefNannySetupContext("readConcreteElement"); /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":565 @@ -6693,17 +6683,11 @@ static PyObject *__pyx_f_6cpyamf_4amf3_7Decoder_readConcreteElement(struct __py __pyx_t_4 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__DecodeError); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 592; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 592; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_4, ((PyObject *)__pyx_k_tuple_9), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 592; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_5)); - PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_kp_s_5)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_5)); - __pyx_t_5 = PyObject_Call(__pyx_t_4, __pyx_t_2, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 592; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __Pyx_Raise(__pyx_t_2, 0, 0); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __Pyx_Raise(__pyx_t_5, 0, 0); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; {__pyx_filename = __pyx_f[0]; __pyx_lineno = 592; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = Py_None; __Pyx_INCREF(Py_None); @@ -6711,7 +6695,6 @@ static PyObject *__pyx_f_6cpyamf_4amf3_7Decoder_readConcreteElement(struct __py __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_2); __Pyx_XDECREF(__pyx_t_4); - __Pyx_XDECREF(__pyx_t_5); __Pyx_AddTraceback("cpyamf.amf3.Decoder.readConcreteElement"); __pyx_r = 0; __pyx_L0:; @@ -6837,17 +6820,17 @@ static int __pyx_pf_6cpyamf_4amf3_7Encoder___init__(PyObject *__pyx_v_self, PyOb __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 601; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(((PyObject *)__pyx_n_s__use_proxies)); PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_n_s__use_proxies)); __Pyx_GIVEREF(((PyObject *)__pyx_n_s__use_proxies)); PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_3); __Pyx_GIVEREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 601; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 601; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 601; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; ((struct __pyx_obj_6cpyamf_4amf3_Encoder *)__pyx_v_self)->use_proxies = __pyx_t_4; @@ -6861,21 +6844,12 @@ static int __pyx_pf_6cpyamf_4amf3_7Encoder___init__(PyObject *__pyx_v_self, PyOb */ __pyx_t_3 = PyObject_GetAttr(((PyObject *)__pyx_v_kwargs), __pyx_n_s__pop); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 602; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 602; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_k_tuple_10), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 602; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_INCREF(((PyObject *)__pyx_n_s__context)); - PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_n_s__context)); - __Pyx_GIVEREF(((PyObject *)__pyx_n_s__context)); - __Pyx_INCREF(Py_None); - PyTuple_SET_ITEM(__pyx_t_2, 1, Py_None); - __Pyx_GIVEREF(Py_None); - __pyx_t_1 = PyObject_Call(__pyx_t_3, __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 602; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_v_context); - __pyx_v_context = __pyx_t_1; - __pyx_t_1 = 0; + __pyx_v_context = __pyx_t_2; + __pyx_t_2 = 0; /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":604 * context = kwargs.pop('context', None) @@ -6894,11 +6868,11 @@ static int __pyx_pf_6cpyamf_4amf3_7Encoder___init__(PyObject *__pyx_v_self, PyOb * * self.context = context */ - __pyx_t_1 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_6cpyamf_4amf3_Context)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 605; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); + __pyx_t_2 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_6cpyamf_4amf3_Context)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 605; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_v_context); - __pyx_v_context = __pyx_t_1; - __pyx_t_1 = 0; + __pyx_v_context = __pyx_t_2; + __pyx_t_2 = 0; goto __pyx_L5; } __pyx_L5:; @@ -6924,24 +6898,24 @@ static int __pyx_pf_6cpyamf_4amf3_7Encoder___init__(PyObject *__pyx_v_self, PyOb * * cdef inline int writeNull(self, n) except -1: */ - __pyx_t_1 = PyObject_GetAttr(((PyObject *)((PyObject*)__pyx_ptype_6cpyamf_5codec_Encoder)), __pyx_n_s____init__); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 609; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 609; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_GetAttr(((PyObject *)((PyObject*)__pyx_ptype_6cpyamf_5codec_Encoder)), __pyx_n_s____init__); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 609; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 609; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); __Pyx_INCREF(__pyx_v_self); - PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_self); + PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_self); __Pyx_GIVEREF(__pyx_v_self); - __pyx_t_3 = PySequence_Tuple(((PyObject *)__pyx_v_args)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 609; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(((PyObject *)__pyx_t_3)); - __pyx_t_5 = PyNumber_Add(__pyx_t_2, ((PyObject *)__pyx_t_3)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 609; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __pyx_t_1 = PySequence_Tuple(((PyObject *)__pyx_v_args)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 609; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_1)); + __pyx_t_5 = PyNumber_Add(((PyObject *)__pyx_t_3), ((PyObject *)__pyx_t_1)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 609; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_5)); __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; - __pyx_t_3 = PyEval_CallObjectWithKeywords(__pyx_t_1, __pyx_t_5, ((PyObject *)__pyx_v_kwargs)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 609; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0; + __pyx_t_1 = PyEval_CallObjectWithKeywords(__pyx_t_2, ((PyObject *)__pyx_t_5), ((PyObject *)__pyx_v_kwargs)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 609; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_1); + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_r = 0; goto __pyx_L0; @@ -7124,13 +7098,13 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_serialiseString(struct __pyx_obj_6cpy __Pyx_GOTREF(__pyx_t_1); if (!PyCFunction_Check(__pyx_t_1) || (PyCFunction_GET_FUNCTION(__pyx_t_1) != (void *)&__pyx_pf_6cpyamf_4amf3_7Encoder_serialiseString)) { __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 626; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_v_u); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_u); __Pyx_GIVEREF(__pyx_v_u); - __pyx_t_3 = PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 626; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 626; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __pyx_t_4 = __Pyx_PyInt_AsInt(__pyx_t_3); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 626; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_r = __pyx_t_4; @@ -7208,16 +7182,10 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_serialiseString(struct __pyx_obj_6cpy * * if l == 0: */ - __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 639; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_Call(__pyx_builtin_TypeError, ((PyObject *)__pyx_k_tuple_12), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 639; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_6)); - PyTuple_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_kp_s_6)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_6)); - __pyx_t_3 = PyObject_Call(__pyx_builtin_TypeError, __pyx_t_1, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 639; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_Raise(__pyx_t_1, 0, 0); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __Pyx_Raise(__pyx_t_3, 0, 0); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; {__pyx_filename = __pyx_f[0]; __pyx_lineno = 639; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } __pyx_L3:; @@ -7254,11 +7222,11 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_serialiseString(struct __pyx_obj_6cpy * if r != -1: */ __pyx_t_6 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->getStringReference(__pyx_v_self->context, __pyx_v_u, 0); if (unlikely(__pyx_t_6 == -2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 645; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_t_3 = PyInt_FromSsize_t(__pyx_t_6); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 645; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __pyx_t_1 = PyInt_FromSsize_t(__pyx_t_6); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 645; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_v_r); - __pyx_v_r = __pyx_t_3; - __pyx_t_3 = 0; + __pyx_v_r = __pyx_t_1; + __pyx_t_1 = 0; /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":647 * r = self.context.getStringReference(u) @@ -7267,10 +7235,10 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_serialiseString(struct __pyx_obj_6cpy * # we have a reference * return _encode_integer(self.stream, r << 1) */ - __pyx_t_3 = PyObject_RichCompare(__pyx_v_r, __pyx_int_neg_1, Py_NE); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 647; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); - __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_5 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 647; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __pyx_t_1 = PyObject_RichCompare(__pyx_v_r, __pyx_int_neg_1, Py_NE); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 647; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_1); + __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_5 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 647; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; if (__pyx_t_5) { /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":649 @@ -7280,10 +7248,10 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_serialiseString(struct __pyx_obj_6cpy * * self.context.addString(u) */ - __pyx_t_3 = PyNumber_Lshift(__pyx_v_r, __pyx_int_1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 649; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); - __pyx_t_4 = __Pyx_PyInt_AsInt(__pyx_t_3); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 649; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __pyx_t_1 = PyNumber_Lshift(__pyx_v_r, __pyx_int_1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 649; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_1); + __pyx_t_4 = __Pyx_PyInt_AsInt(__pyx_t_1); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 649; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_t_7 = __pyx_f_6cpyamf_4amf3__encode_integer(__pyx_v_self->__pyx_base.__pyx_base.stream, __pyx_t_4); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 649; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = __pyx_t_7; goto __pyx_L0; @@ -7316,11 +7284,11 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_serialiseString(struct __pyx_obj_6cpy * l = PyString_GET_SIZE(u) * */ - __pyx_t_3 = ((PyObject *)((struct __pyx_vtabstruct_6cpyamf_4amf3_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->__pyx_base.getBytesForString(((struct __pyx_obj_6cpyamf_5codec_Context *)__pyx_v_self->context), __pyx_v_u, 0)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 654; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __pyx_t_1 = ((PyObject *)((struct __pyx_vtabstruct_6cpyamf_4amf3_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->__pyx_base.getBytesForString(((struct __pyx_obj_6cpyamf_5codec_Context *)__pyx_v_self->context), __pyx_v_u, 0)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 654; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_v_u); - __pyx_v_u = __pyx_t_3; - __pyx_t_3 = 0; + __pyx_v_u = __pyx_t_1; + __pyx_t_1 = 0; /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":655 * if is_unicode: @@ -7775,7 +7743,7 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeNumber(struct __pyx_obj_6cpyamf_ * * self.writeType(TYPE_NUMBER) */ - __pyx_t_1 = PyFloat_AS_DOUBLE(__pyx_v_n); if (unlikely(__pyx_t_1 == -1 && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 693; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyFloat_AS_DOUBLE(__pyx_v_n); if (unlikely(__pyx_t_1 == -1.0 && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 693; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_v_x = __pyx_t_1; /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":695 @@ -7855,16 +7823,16 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeList(struct __pyx_obj_6cpyamf_4a __pyx_t_2 = __Pyx_PyBool_FromLong(__pyx_v_is_proxy); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 700; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 700; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); __Pyx_INCREF(__pyx_v_n); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_n); __Pyx_GIVEREF(__pyx_v_n); PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_2); __Pyx_GIVEREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_Call(__pyx_t_1, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 700; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 700; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; __pyx_t_4 = __Pyx_PyInt_AsInt(__pyx_t_2); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 700; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_r = __pyx_t_4; @@ -8292,6 +8260,8 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeDict(struct __pyx_obj_6cpyamf_4a PyObject *__pyx_t_7 = NULL; void *__pyx_t_8; void *__pyx_t_9; + int __pyx_t_10; + PyObject *__pyx_t_11 = NULL; __Pyx_RefNannySetupContext("writeDict"); __pyx_v_ref = Py_None; __Pyx_INCREF(Py_None); __pyx_v_key = Py_None; __Pyx_INCREF(Py_None); @@ -8442,13 +8412,13 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeDict(struct __pyx_obj_6cpyamf_4a __pyx_t_3 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->__pyx_base.getClassAlias(((struct __pyx_obj_6cpyamf_5codec_Context *)__pyx_v_self->context), ((PyObject *)((PyObject*)&PyDict_Type)), 0); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 773; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 773; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_7); + __Pyx_GOTREF(((PyObject *)__pyx_t_7)); PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_3); __Pyx_GIVEREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_6cpyamf_4amf3_ClassDefinition)), __pyx_t_7, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 773; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_6cpyamf_4amf3_ClassDefinition)), ((PyObject *)__pyx_t_7), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 773; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_7)); __pyx_t_7 = 0; __Pyx_DECREF(((PyObject *)__pyx_v_definition)); __pyx_v_definition = ((struct __pyx_obj_6cpyamf_4amf3_ClassDefinition *)__pyx_t_3); __pyx_t_3 = 0; @@ -8511,8 +8481,8 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeDict(struct __pyx_obj_6cpyamf_4a * self.stream.write(&REF_CHAR, 1) * * for key, value in obj.iteritems(): # <<<<<<<<<<<<<< - * self.serialiseString(key) - * self.writeElement(value) + * if PyInt_Check(key) or PyLong_Check(key): + * key = str(key) */ __Pyx_INCREF(((PyObject *)__pyx_v_obj)); __Pyx_XDECREF(__pyx_t_3); @@ -8530,31 +8500,69 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeDict(struct __pyx_obj_6cpyamf_4a /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":784 * * for key, value in obj.iteritems(): + * if PyInt_Check(key) or PyLong_Check(key): # <<<<<<<<<<<<<< + * key = str(key) + * + */ + __pyx_t_6 = PyInt_Check(__pyx_v_key); + if (!__pyx_t_6) { + __pyx_t_4 = PyLong_Check(__pyx_v_key); + __pyx_t_10 = __pyx_t_4; + } else { + __pyx_t_10 = __pyx_t_6; + } + if (__pyx_t_10) { + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":785 + * for key, value in obj.iteritems(): + * if PyInt_Check(key) or PyLong_Check(key): + * key = str(key) # <<<<<<<<<<<<<< + * + * self.serialiseString(key) + */ + __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 785; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_7)); + __Pyx_INCREF(__pyx_v_key); + PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_v_key); + __Pyx_GIVEREF(__pyx_v_key); + __pyx_t_11 = PyObject_Call(((PyObject *)((PyObject*)&PyString_Type)), ((PyObject *)__pyx_t_7), NULL); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 785; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_11); + __Pyx_DECREF(((PyObject *)__pyx_t_7)); __pyx_t_7 = 0; + __Pyx_DECREF(__pyx_v_key); + __pyx_v_key = __pyx_t_11; + __pyx_t_11 = 0; + goto __pyx_L9; + } + __pyx_L9:; + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":787 + * key = str(key) + * * self.serialiseString(key) # <<<<<<<<<<<<<< * self.writeElement(value) * */ - __pyx_t_5 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.serialiseString(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_key, 0); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 784; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.serialiseString(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_key, 0); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 787; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":785 - * for key, value in obj.iteritems(): + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":788 + * * self.serialiseString(key) * self.writeElement(value) # <<<<<<<<<<<<<< * * return self.stream.write(&REF_CHAR, 1) */ - __pyx_t_5 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.writeElement(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_value, 0); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 785; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.writeElement(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_value, 0); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 788; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":787 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":790 * self.writeElement(value) * * return self.stream.write(&REF_CHAR, 1) # <<<<<<<<<<<<<< * * cdef int writeMixedArray(self, object n) except -1: */ - __pyx_t_5 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self->__pyx_base.__pyx_base.stream->__pyx_vtab)->write(__pyx_v_self->__pyx_base.__pyx_base.stream, (&__pyx_v_6cpyamf_4amf3_REF_CHAR), 1); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 787; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self->__pyx_base.__pyx_base.stream->__pyx_vtab)->write(__pyx_v_self->__pyx_base.__pyx_base.stream, (&__pyx_v_6cpyamf_4amf3_REF_CHAR), 1); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 790; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = __pyx_t_5; goto __pyx_L0; @@ -8563,6 +8571,7 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeDict(struct __pyx_obj_6cpyamf_4a __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_3); __Pyx_XDECREF(__pyx_t_7); + __Pyx_XDECREF(__pyx_t_11); __Pyx_AddTraceback("cpyamf.amf3.Encoder.writeDict"); __pyx_r = -1; __pyx_L0:; @@ -8574,7 +8583,7 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeDict(struct __pyx_obj_6cpyamf_4a return __pyx_r; } -/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":789 +/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":792 * return self.stream.write(&REF_CHAR, 1) * * cdef int writeMixedArray(self, object n) except -1: # <<<<<<<<<<<<<< @@ -8594,12 +8603,12 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeMixedArray(struct __pyx_obj_6cpy int __pyx_t_1; PyObject *__pyx_t_2 = NULL; PyObject *__pyx_t_3 = NULL; - PyObject *__pyx_t_4 = NULL; - int __pyx_t_5; - Py_ssize_t __pyx_t_6; + int __pyx_t_4; + Py_ssize_t __pyx_t_5; + int __pyx_t_6; int __pyx_t_7; int __pyx_t_8; - int __pyx_t_9; + PyObject *__pyx_t_9 = NULL; PyObject *__pyx_t_10 = NULL; __Pyx_RefNannySetupContext("writeMixedArray"); __pyx_v_ref = Py_None; __Pyx_INCREF(Py_None); @@ -8609,45 +8618,39 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeMixedArray(struct __pyx_obj_6cpy __pyx_v_x = Py_None; __Pyx_INCREF(Py_None); __pyx_v_k = Py_None; __Pyx_INCREF(Py_None); - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":793 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":796 * # http://www.docuverse.com/blog/donpark/2007/05/14/flash-9-amf3-bug * # for more info * if '' in n: # <<<<<<<<<<<<<< * raise pyamf.EncodeError("dicts cannot contain empty string keys") * */ - __pyx_t_1 = ((PySequence_Contains(__pyx_v_n, ((PyObject *)__pyx_kp_s_7)))); if (unlikely(__pyx_t_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 793; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = ((PySequence_Contains(__pyx_v_n, ((PyObject *)__pyx_kp_s_13)))); if (unlikely(__pyx_t_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 796; __pyx_clineno = __LINE__; goto __pyx_L1_error;} if (__pyx_t_1) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":794 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":797 * # for more info * if '' in n: * raise pyamf.EncodeError("dicts cannot contain empty string keys") # <<<<<<<<<<<<<< * * if self.use_proxies: */ - __pyx_t_2 = __Pyx_GetName(__pyx_m, __pyx_n_s__pyamf); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 794; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetName(__pyx_m, __pyx_n_s__pyamf); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 797; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__EncodeError); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 794; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__EncodeError); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 797; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 794; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_k_tuple_15), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 797; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_8)); - PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_kp_s_8)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_8)); - __pyx_t_4 = PyObject_Call(__pyx_t_3, __pyx_t_2, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 794; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_Raise(__pyx_t_2, 0, 0); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __Pyx_Raise(__pyx_t_4, 0, 0); - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 794; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 797; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L3; } __pyx_L3:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":796 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":799 * raise pyamf.EncodeError("dicts cannot contain empty string keys") * * if self.use_proxies: # <<<<<<<<<<<<<< @@ -8656,126 +8659,126 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeMixedArray(struct __pyx_obj_6cpy */ if (__pyx_v_self->use_proxies) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":797 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":800 * * if self.use_proxies: * return self.writeProxy(n) # <<<<<<<<<<<<<< * * self.writeType(TYPE_ARRAY) */ - __pyx_t_5 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->writeProxy(__pyx_v_self, __pyx_v_n); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 797; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_r = __pyx_t_5; + __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->writeProxy(__pyx_v_self, __pyx_v_n); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 800; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_r = __pyx_t_4; goto __pyx_L0; goto __pyx_L4; } __pyx_L4:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":799 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":802 * return self.writeProxy(n) * * self.writeType(TYPE_ARRAY) # <<<<<<<<<<<<<< * * ref = self.context.getObjectReference(n) */ - __pyx_t_5 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.writeType(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_6cpyamf_4amf3_TYPE_ARRAY); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 799; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.writeType(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_6cpyamf_4amf3_TYPE_ARRAY); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 802; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":801 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":804 * self.writeType(TYPE_ARRAY) * * ref = self.context.getObjectReference(n) # <<<<<<<<<<<<<< * * if ref != -1: */ - __pyx_t_6 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->__pyx_base.getObjectReference(((struct __pyx_obj_6cpyamf_5codec_Context *)__pyx_v_self->context), __pyx_v_n, 0); if (unlikely(__pyx_t_6 == -2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 801; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_t_4 = PyInt_FromSsize_t(__pyx_t_6); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 801; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); + __pyx_t_5 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->__pyx_base.getObjectReference(((struct __pyx_obj_6cpyamf_5codec_Context *)__pyx_v_self->context), __pyx_v_n, 0); if (unlikely(__pyx_t_5 == -2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 804; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyInt_FromSsize_t(__pyx_t_5); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 804; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_v_ref); - __pyx_v_ref = __pyx_t_4; - __pyx_t_4 = 0; + __pyx_v_ref = __pyx_t_2; + __pyx_t_2 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":803 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":806 * ref = self.context.getObjectReference(n) * * if ref != -1: # <<<<<<<<<<<<<< * return _encode_integer(self.stream, ref << 1) * */ - __pyx_t_4 = PyObject_RichCompare(__pyx_v_ref, __pyx_int_neg_1, Py_NE); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 803; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); - __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 803; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __pyx_t_2 = PyObject_RichCompare(__pyx_v_ref, __pyx_int_neg_1, Py_NE); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 806; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_2); + __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 806; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; if (__pyx_t_1) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":804 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":807 * * if ref != -1: * return _encode_integer(self.stream, ref << 1) # <<<<<<<<<<<<<< * * self.context.addObject(n) */ - __pyx_t_4 = PyNumber_Lshift(__pyx_v_ref, __pyx_int_1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 804; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); - __pyx_t_5 = __Pyx_PyInt_AsInt(__pyx_t_4); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 804; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_7 = __pyx_f_6cpyamf_4amf3__encode_integer(__pyx_v_self->__pyx_base.__pyx_base.stream, __pyx_t_5); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 804; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_r = __pyx_t_7; + __pyx_t_2 = PyNumber_Lshift(__pyx_v_ref, __pyx_int_1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 807; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_2); + __pyx_t_4 = __Pyx_PyInt_AsInt(__pyx_t_2); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 807; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __pyx_t_6 = __pyx_f_6cpyamf_4amf3__encode_integer(__pyx_v_self->__pyx_base.__pyx_base.stream, __pyx_t_4); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 807; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_r = __pyx_t_6; goto __pyx_L0; goto __pyx_L5; } __pyx_L5:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":806 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":809 * return _encode_integer(self.stream, ref << 1) * * self.context.addObject(n) # <<<<<<<<<<<<<< * * # The AMF3 spec demands that all str based indicies be listed first */ - __pyx_t_6 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->__pyx_base.addObject(((struct __pyx_obj_6cpyamf_5codec_Context *)__pyx_v_self->context), __pyx_v_n, 0); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 806; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->__pyx_base.addObject(((struct __pyx_obj_6cpyamf_5codec_Context *)__pyx_v_self->context), __pyx_v_n, 0); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 809; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":809 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":812 * * # The AMF3 spec demands that all str based indicies be listed first * keys = n.keys() # <<<<<<<<<<<<<< * int_keys = [] * str_keys = [] */ - __pyx_t_4 = PyObject_GetAttr(__pyx_v_n, __pyx_n_s__keys); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 809; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); - __pyx_t_2 = PyObject_Call(__pyx_t_4, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 809; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_GetAttr(__pyx_v_n, __pyx_n_s__keys); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 812; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __pyx_t_3 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 812; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_3); + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_v_keys); - __pyx_v_keys = __pyx_t_2; - __pyx_t_2 = 0; + __pyx_v_keys = __pyx_t_3; + __pyx_t_3 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":810 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":813 * # The AMF3 spec demands that all str based indicies be listed first * keys = n.keys() * int_keys = [] # <<<<<<<<<<<<<< * str_keys = [] * */ - __pyx_t_2 = PyList_New(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 810; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(((PyObject *)__pyx_t_2)); + __pyx_t_3 = PyList_New(0); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 813; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); __Pyx_DECREF(((PyObject *)__pyx_v_int_keys)); - __pyx_v_int_keys = __pyx_t_2; - __pyx_t_2 = 0; + __pyx_v_int_keys = __pyx_t_3; + __pyx_t_3 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":811 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":814 * keys = n.keys() * int_keys = [] * str_keys = [] # <<<<<<<<<<<<<< * * for x in keys: */ - __pyx_t_2 = PyList_New(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 811; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(((PyObject *)__pyx_t_2)); + __pyx_t_3 = PyList_New(0); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 814; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); __Pyx_DECREF(((PyObject *)__pyx_v_str_keys)); - __pyx_v_str_keys = __pyx_t_2; - __pyx_t_2 = 0; + __pyx_v_str_keys = __pyx_t_3; + __pyx_t_3 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":813 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":816 * str_keys = [] * * for x in keys: # <<<<<<<<<<<<<< @@ -8783,31 +8786,31 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeMixedArray(struct __pyx_obj_6cpy * int_keys.append(x) */ if (PyList_CheckExact(__pyx_v_keys) || PyTuple_CheckExact(__pyx_v_keys)) { - __pyx_t_6 = 0; __pyx_t_2 = __pyx_v_keys; __Pyx_INCREF(__pyx_t_2); + __pyx_t_5 = 0; __pyx_t_3 = __pyx_v_keys; __Pyx_INCREF(__pyx_t_3); } else { - __pyx_t_6 = -1; __pyx_t_2 = PyObject_GetIter(__pyx_v_keys); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 813; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __pyx_t_5 = -1; __pyx_t_3 = PyObject_GetIter(__pyx_v_keys); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 816; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_3); } for (;;) { - if (likely(PyList_CheckExact(__pyx_t_2))) { - if (__pyx_t_6 >= PyList_GET_SIZE(__pyx_t_2)) break; - __pyx_t_4 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_6); __Pyx_INCREF(__pyx_t_4); __pyx_t_6++; - } else if (likely(PyTuple_CheckExact(__pyx_t_2))) { - if (__pyx_t_6 >= PyTuple_GET_SIZE(__pyx_t_2)) break; - __pyx_t_4 = PyTuple_GET_ITEM(__pyx_t_2, __pyx_t_6); __Pyx_INCREF(__pyx_t_4); __pyx_t_6++; + if (likely(PyList_CheckExact(__pyx_t_3))) { + if (__pyx_t_5 >= PyList_GET_SIZE(__pyx_t_3)) break; + __pyx_t_2 = PyList_GET_ITEM(__pyx_t_3, __pyx_t_5); __Pyx_INCREF(__pyx_t_2); __pyx_t_5++; + } else if (likely(PyTuple_CheckExact(__pyx_t_3))) { + if (__pyx_t_5 >= PyTuple_GET_SIZE(__pyx_t_3)) break; + __pyx_t_2 = PyTuple_GET_ITEM(__pyx_t_3, __pyx_t_5); __Pyx_INCREF(__pyx_t_2); __pyx_t_5++; } else { - __pyx_t_4 = PyIter_Next(__pyx_t_2); - if (!__pyx_t_4) { - if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 813; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyIter_Next(__pyx_t_3); + if (!__pyx_t_2) { + if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 816; __pyx_clineno = __LINE__; goto __pyx_L1_error;} break; } - __Pyx_GOTREF(__pyx_t_4); + __Pyx_GOTREF(__pyx_t_2); } __Pyx_DECREF(__pyx_v_x); - __pyx_v_x = __pyx_t_4; - __pyx_t_4 = 0; + __pyx_v_x = __pyx_t_2; + __pyx_t_2 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":814 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":817 * * for x in keys: * if isinstance(x, (int, long)): # <<<<<<<<<<<<<< @@ -8815,18 +8818,18 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeMixedArray(struct __pyx_obj_6cpy * elif isinstance(x, (str, unicode)): */ __Pyx_INCREF(__pyx_v_x); - __pyx_t_4 = __pyx_v_x; - __pyx_t_1 = PyInt_Check(__pyx_t_4); + __pyx_t_2 = __pyx_v_x; + __pyx_t_1 = PyInt_Check(__pyx_t_2); if (!__pyx_t_1) { - __pyx_t_8 = PyLong_Check(__pyx_t_4); - __pyx_t_9 = __pyx_t_8; + __pyx_t_7 = PyLong_Check(__pyx_t_2); + __pyx_t_8 = __pyx_t_7; } else { - __pyx_t_9 = __pyx_t_1; + __pyx_t_8 = __pyx_t_1; } - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - if (__pyx_t_9) { + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + if (__pyx_t_8) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":815 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":818 * for x in keys: * if isinstance(x, (int, long)): * int_keys.append(x) # <<<<<<<<<<<<<< @@ -8834,13 +8837,13 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeMixedArray(struct __pyx_obj_6cpy * str_keys.append(x) */ if (unlikely(__pyx_v_int_keys == Py_None)) { - PyErr_SetString(PyExc_AttributeError, "'NoneType' object has no attribute 'append'"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 815; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + PyErr_SetString(PyExc_AttributeError, "'NoneType' object has no attribute 'append'"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 818; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } - __pyx_t_7 = PyList_Append(((PyObject *)__pyx_v_int_keys), __pyx_v_x); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 815; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = PyList_Append(__pyx_v_int_keys, __pyx_v_x); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 818; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L8; } - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":816 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":819 * if isinstance(x, (int, long)): * int_keys.append(x) * elif isinstance(x, (str, unicode)): # <<<<<<<<<<<<<< @@ -8848,18 +8851,18 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeMixedArray(struct __pyx_obj_6cpy * else: */ __Pyx_INCREF(__pyx_v_x); - __pyx_t_4 = __pyx_v_x; - __pyx_t_9 = PyString_Check(__pyx_t_4); - if (!__pyx_t_9) { - __pyx_t_1 = PyUnicode_Check(__pyx_t_4); - __pyx_t_8 = __pyx_t_1; + __pyx_t_2 = __pyx_v_x; + __pyx_t_8 = PyString_Check(__pyx_t_2); + if (!__pyx_t_8) { + __pyx_t_1 = PyUnicode_Check(__pyx_t_2); + __pyx_t_7 = __pyx_t_1; } else { - __pyx_t_8 = __pyx_t_9; + __pyx_t_7 = __pyx_t_8; } - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - if (__pyx_t_8) { + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + if (__pyx_t_7) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":817 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":820 * int_keys.append(x) * elif isinstance(x, (str, unicode)): * str_keys.append(x) # <<<<<<<<<<<<<< @@ -8867,37 +8870,31 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeMixedArray(struct __pyx_obj_6cpy * raise ValueError("Non int/str key value found in dict") */ if (unlikely(__pyx_v_str_keys == Py_None)) { - PyErr_SetString(PyExc_AttributeError, "'NoneType' object has no attribute 'append'"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 817; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + PyErr_SetString(PyExc_AttributeError, "'NoneType' object has no attribute 'append'"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 820; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } - __pyx_t_7 = PyList_Append(((PyObject *)__pyx_v_str_keys), __pyx_v_x); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 817; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = PyList_Append(__pyx_v_str_keys, __pyx_v_x); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 820; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L8; } /*else*/ { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":819 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":822 * str_keys.append(x) * else: * raise ValueError("Non int/str key value found in dict") # <<<<<<<<<<<<<< * * # Make sure the integer keys are within range */ - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 819; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_9)); - PyTuple_SET_ITEM(__pyx_t_4, 0, ((PyObject *)__pyx_kp_s_9)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_9)); - __pyx_t_3 = PyObject_Call(__pyx_builtin_ValueError, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 819; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __Pyx_Raise(__pyx_t_3, 0, 0); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 819; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_k_tuple_17), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 822; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_2); + __Pyx_Raise(__pyx_t_2, 0, 0); + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 822; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } __pyx_L8:; } - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":822 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":825 * * # Make sure the integer keys are within range * l = len(int_keys) # <<<<<<<<<<<<<< @@ -8905,12 +8902,12 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeMixedArray(struct __pyx_obj_6cpy * for x in int_keys: */ if (unlikely(__pyx_v_int_keys == Py_None)) { - PyErr_SetString(PyExc_TypeError, "object of type 'NoneType' has no len()"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 822; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + PyErr_SetString(PyExc_TypeError, "object of type 'NoneType' has no len()"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 825; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } - __pyx_t_6 = PyList_GET_SIZE(((PyObject *)__pyx_v_int_keys)); - __pyx_v_l = __pyx_t_6; + __pyx_t_5 = PyList_GET_SIZE(((PyObject *)__pyx_v_int_keys)); + __pyx_v_l = __pyx_t_5; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":824 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":827 * l = len(int_keys) * * for x in int_keys: # <<<<<<<<<<<<<< @@ -8918,39 +8915,39 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeMixedArray(struct __pyx_obj_6cpy * # treat as a string key */ if (likely(((PyObject *)__pyx_v_int_keys) != Py_None)) { - __pyx_t_6 = 0; __pyx_t_2 = ((PyObject *)__pyx_v_int_keys); __Pyx_INCREF(__pyx_t_2); + __pyx_t_5 = 0; __pyx_t_3 = ((PyObject *)__pyx_v_int_keys); __Pyx_INCREF(__pyx_t_3); } else { - PyErr_SetString(PyExc_TypeError, "'NoneType' object is not iterable"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 824; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + PyErr_SetString(PyExc_TypeError, "'NoneType' object is not iterable"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 827; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } for (;;) { - if (__pyx_t_6 >= PyList_GET_SIZE(__pyx_t_2)) break; - __pyx_t_3 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_6); __Pyx_INCREF(__pyx_t_3); __pyx_t_6++; + if (__pyx_t_5 >= PyList_GET_SIZE(__pyx_t_3)) break; + __pyx_t_2 = PyList_GET_ITEM(__pyx_t_3, __pyx_t_5); __Pyx_INCREF(__pyx_t_2); __pyx_t_5++; __Pyx_DECREF(__pyx_v_x); - __pyx_v_x = __pyx_t_3; - __pyx_t_3 = 0; + __pyx_v_x = __pyx_t_2; + __pyx_t_2 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":825 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":828 * * for x in int_keys: * if l < x <= 0: # <<<<<<<<<<<<<< * # treat as a string key * str_keys.append(x) */ - __pyx_t_3 = PyInt_FromSsize_t(__pyx_v_l); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 825; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); - __pyx_t_4 = PyObject_RichCompare(__pyx_t_3, __pyx_v_x, Py_LT); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 825; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); - if (__Pyx_PyObject_IsTrue(__pyx_t_4)) { - __Pyx_DECREF(__pyx_t_4); - __pyx_t_4 = PyObject_RichCompare(__pyx_v_x, __pyx_int_0, Py_LE); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 825; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); + __pyx_t_2 = PyInt_FromSsize_t(__pyx_v_l); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 828; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_2); + __pyx_t_9 = PyObject_RichCompare(__pyx_t_2, __pyx_v_x, Py_LT); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 828; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_9); + if (__Pyx_PyObject_IsTrue(__pyx_t_9)) { + __Pyx_DECREF(__pyx_t_9); + __pyx_t_9 = PyObject_RichCompare(__pyx_v_x, __pyx_int_0, Py_LE); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 828; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_9); } - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_8 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 825; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - if (__pyx_t_8) { + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_t_9); if (unlikely(__pyx_t_7 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 828; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; + if (__pyx_t_7) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":827 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":830 * if l < x <= 0: * # treat as a string key * str_keys.append(x) # <<<<<<<<<<<<<< @@ -8958,37 +8955,37 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeMixedArray(struct __pyx_obj_6cpy * */ if (unlikely(__pyx_v_str_keys == Py_None)) { - PyErr_SetString(PyExc_AttributeError, "'NoneType' object has no attribute 'append'"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 827; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + PyErr_SetString(PyExc_AttributeError, "'NoneType' object has no attribute 'append'"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 830; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } - __pyx_t_7 = PyList_Append(((PyObject *)__pyx_v_str_keys), __pyx_v_x); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 827; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = PyList_Append(__pyx_v_str_keys, __pyx_v_x); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 830; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":828 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":831 * # treat as a string key * str_keys.append(x) * del int_keys[int_keys.index(x)] # <<<<<<<<<<<<<< * * int_keys.sort() */ - __pyx_t_4 = PyObject_GetAttr(((PyObject *)__pyx_v_int_keys), __pyx_n_s__index); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 828; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 828; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __pyx_t_9 = PyObject_GetAttr(((PyObject *)__pyx_v_int_keys), __pyx_n_s__index); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 831; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_9); + __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 831; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_v_x); - PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_x); + PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_x); __Pyx_GIVEREF(__pyx_v_x); - __pyx_t_10 = PyObject_Call(__pyx_t_4, __pyx_t_3, NULL); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 828; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_10 = PyObject_Call(__pyx_t_9, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 831; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_10); - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - if (PyObject_DelItem(((PyObject *)__pyx_v_int_keys), __pyx_t_10) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 828; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; + if (PyObject_DelItem(((PyObject *)__pyx_v_int_keys), __pyx_t_10) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 831; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; goto __pyx_L11; } __pyx_L11:; } - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":830 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":833 * del int_keys[int_keys.index(x)] * * int_keys.sort() # <<<<<<<<<<<<<< @@ -8996,11 +8993,11 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeMixedArray(struct __pyx_obj_6cpy * # If integer keys don't start at 0, they will be treated as strings */ if (unlikely(__pyx_v_int_keys == Py_None)) { - PyErr_SetString(PyExc_AttributeError, "'NoneType' object has no attribute 'sort'"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 830; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + PyErr_SetString(PyExc_AttributeError, "'NoneType' object has no attribute 'sort'"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 833; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } - __pyx_t_7 = PyList_Sort(((PyObject *)__pyx_v_int_keys)); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 830; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = PyList_Sort(((PyObject *)__pyx_v_int_keys)); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 833; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":833 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":836 * * # If integer keys don't start at 0, they will be treated as strings * if len(int_keys) > 0 and int_keys[0] != 0: # <<<<<<<<<<<<<< @@ -9008,25 +9005,25 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeMixedArray(struct __pyx_obj_6cpy * str_keys.append(str(x)) */ if (unlikely(__pyx_v_int_keys == Py_None)) { - PyErr_SetString(PyExc_TypeError, "object of type 'NoneType' has no len()"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 833; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + PyErr_SetString(PyExc_TypeError, "object of type 'NoneType' has no len()"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 836; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } - __pyx_t_6 = PyList_GET_SIZE(((PyObject *)__pyx_v_int_keys)); - __pyx_t_8 = (__pyx_t_6 > 0); - if (__pyx_t_8) { - __pyx_t_2 = __Pyx_GetItemInt_List(((PyObject *)__pyx_v_int_keys), 0, sizeof(long), PyInt_FromLong); if (!__pyx_t_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 833; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_10 = PyObject_RichCompare(__pyx_t_2, __pyx_int_0, Py_NE); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 833; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyList_GET_SIZE(((PyObject *)__pyx_v_int_keys)); + __pyx_t_7 = (__pyx_t_5 > 0); + if (__pyx_t_7) { + __pyx_t_3 = __Pyx_GetItemInt_List(((PyObject *)__pyx_v_int_keys), 0, sizeof(long), PyInt_FromLong); if (!__pyx_t_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 836; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_3); + __pyx_t_10 = PyObject_RichCompare(__pyx_t_3, __pyx_int_0, Py_NE); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 836; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_10); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_9 = __Pyx_PyObject_IsTrue(__pyx_t_10); if (unlikely(__pyx_t_9 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 833; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __pyx_t_8 = __Pyx_PyObject_IsTrue(__pyx_t_10); if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 836; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; - __pyx_t_1 = __pyx_t_9; - } else { __pyx_t_1 = __pyx_t_8; + } else { + __pyx_t_1 = __pyx_t_7; } if (__pyx_t_1) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":834 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":837 * # If integer keys don't start at 0, they will be treated as strings * if len(int_keys) > 0 and int_keys[0] != 0: * for x in int_keys: # <<<<<<<<<<<<<< @@ -9034,18 +9031,18 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeMixedArray(struct __pyx_obj_6cpy * del int_keys[int_keys.index(x)] */ if (likely(((PyObject *)__pyx_v_int_keys) != Py_None)) { - __pyx_t_6 = 0; __pyx_t_10 = ((PyObject *)__pyx_v_int_keys); __Pyx_INCREF(__pyx_t_10); + __pyx_t_5 = 0; __pyx_t_10 = ((PyObject *)__pyx_v_int_keys); __Pyx_INCREF(__pyx_t_10); } else { - PyErr_SetString(PyExc_TypeError, "'NoneType' object is not iterable"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 834; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + PyErr_SetString(PyExc_TypeError, "'NoneType' object is not iterable"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 837; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } for (;;) { - if (__pyx_t_6 >= PyList_GET_SIZE(__pyx_t_10)) break; - __pyx_t_2 = PyList_GET_ITEM(__pyx_t_10, __pyx_t_6); __Pyx_INCREF(__pyx_t_2); __pyx_t_6++; + if (__pyx_t_5 >= PyList_GET_SIZE(__pyx_t_10)) break; + __pyx_t_3 = PyList_GET_ITEM(__pyx_t_10, __pyx_t_5); __Pyx_INCREF(__pyx_t_3); __pyx_t_5++; __Pyx_DECREF(__pyx_v_x); - __pyx_v_x = __pyx_t_2; - __pyx_t_2 = 0; + __pyx_v_x = __pyx_t_3; + __pyx_t_3 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":835 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":838 * if len(int_keys) > 0 and int_keys[0] != 0: * for x in int_keys: * str_keys.append(str(x)) # <<<<<<<<<<<<<< @@ -9053,46 +9050,46 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeMixedArray(struct __pyx_obj_6cpy * */ if (unlikely(__pyx_v_str_keys == Py_None)) { - PyErr_SetString(PyExc_AttributeError, "'NoneType' object has no attribute 'append'"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 835; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + PyErr_SetString(PyExc_AttributeError, "'NoneType' object has no attribute 'append'"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 838; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 835; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 838; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); __Pyx_INCREF(__pyx_v_x); - PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_x); + PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_x); __Pyx_GIVEREF(__pyx_v_x); - __pyx_t_3 = PyObject_Call(((PyObject *)((PyObject*)&PyString_Type)), __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 835; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __pyx_t_2 = PyObject_Call(((PyObject *)((PyObject*)&PyString_Type)), ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 838; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_2); + __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; + __pyx_t_6 = PyList_Append(__pyx_v_str_keys, __pyx_t_2); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 838; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_7 = PyList_Append(((PyObject *)__pyx_v_str_keys), __pyx_t_3); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 835; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":836 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":839 * for x in int_keys: * str_keys.append(str(x)) * del int_keys[int_keys.index(x)] # <<<<<<<<<<<<<< * * _encode_integer(self.stream, len(int_keys) << 1 | REFERENCE_BIT) */ - __pyx_t_3 = PyObject_GetAttr(((PyObject *)__pyx_v_int_keys), __pyx_n_s__index); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 836; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 836; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_int_keys), __pyx_n_s__index); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 839; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 839; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); __Pyx_INCREF(__pyx_v_x); - PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_x); + PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_x); __Pyx_GIVEREF(__pyx_v_x); - __pyx_t_4 = PyObject_Call(__pyx_t_3, __pyx_t_2, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 836; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __pyx_t_9 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 839; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_9); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - if (PyObject_DelItem(((PyObject *)__pyx_v_int_keys), __pyx_t_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 836; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; + if (PyObject_DelItem(((PyObject *)__pyx_v_int_keys), __pyx_t_9) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 839; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; } __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; goto __pyx_L12; } __pyx_L12:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":838 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":841 * del int_keys[int_keys.index(x)] * * _encode_integer(self.stream, len(int_keys) << 1 | REFERENCE_BIT) # <<<<<<<<<<<<<< @@ -9100,12 +9097,12 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeMixedArray(struct __pyx_obj_6cpy * for x in str_keys: */ if (unlikely(__pyx_v_int_keys == Py_None)) { - PyErr_SetString(PyExc_TypeError, "object of type 'NoneType' has no len()"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 838; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + PyErr_SetString(PyExc_TypeError, "object of type 'NoneType' has no len()"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 841; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } - __pyx_t_6 = PyList_GET_SIZE(((PyObject *)__pyx_v_int_keys)); - __pyx_t_7 = __pyx_f_6cpyamf_4amf3__encode_integer(__pyx_v_self->__pyx_base.__pyx_base.stream, ((__pyx_t_6 << 1) | __pyx_v_6cpyamf_4amf3_REFERENCE_BIT)); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 838; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyList_GET_SIZE(((PyObject *)__pyx_v_int_keys)); + __pyx_t_6 = __pyx_f_6cpyamf_4amf3__encode_integer(__pyx_v_self->__pyx_base.__pyx_base.stream, ((__pyx_t_5 << 1) | __pyx_v_6cpyamf_4amf3_REFERENCE_BIT)); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 841; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":840 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":843 * _encode_integer(self.stream, len(int_keys) << 1 | REFERENCE_BIT) * * for x in str_keys: # <<<<<<<<<<<<<< @@ -9113,50 +9110,50 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeMixedArray(struct __pyx_obj_6cpy * self.writeElement(n[x]) */ if (likely(((PyObject *)__pyx_v_str_keys) != Py_None)) { - __pyx_t_6 = 0; __pyx_t_10 = ((PyObject *)__pyx_v_str_keys); __Pyx_INCREF(__pyx_t_10); + __pyx_t_5 = 0; __pyx_t_10 = ((PyObject *)__pyx_v_str_keys); __Pyx_INCREF(__pyx_t_10); } else { - PyErr_SetString(PyExc_TypeError, "'NoneType' object is not iterable"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 840; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + PyErr_SetString(PyExc_TypeError, "'NoneType' object is not iterable"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 843; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } for (;;) { - if (__pyx_t_6 >= PyList_GET_SIZE(__pyx_t_10)) break; - __pyx_t_4 = PyList_GET_ITEM(__pyx_t_10, __pyx_t_6); __Pyx_INCREF(__pyx_t_4); __pyx_t_6++; + if (__pyx_t_5 >= PyList_GET_SIZE(__pyx_t_10)) break; + __pyx_t_9 = PyList_GET_ITEM(__pyx_t_10, __pyx_t_5); __Pyx_INCREF(__pyx_t_9); __pyx_t_5++; __Pyx_DECREF(__pyx_v_x); - __pyx_v_x = __pyx_t_4; - __pyx_t_4 = 0; + __pyx_v_x = __pyx_t_9; + __pyx_t_9 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":841 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":844 * * for x in str_keys: * self.serialiseString(x) # <<<<<<<<<<<<<< * self.writeElement(n[x]) * */ - __pyx_t_7 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.serialiseString(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_x, 0); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 841; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.serialiseString(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_x, 0); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 844; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":842 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":845 * for x in str_keys: * self.serialiseString(x) * self.writeElement(n[x]) # <<<<<<<<<<<<<< * * self.stream.write_uchar(0x01) */ - __pyx_t_4 = PyObject_GetItem(__pyx_v_n, __pyx_v_x); if (!__pyx_t_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 842; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); - __pyx_t_7 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.writeElement(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_t_4, 0); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 842; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __pyx_t_9 = PyObject_GetItem(__pyx_v_n, __pyx_v_x); if (!__pyx_t_9) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 845; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_9); + __pyx_t_6 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.writeElement(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_t_9, 0); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 845; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; } __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":844 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":847 * self.writeElement(n[x]) * * self.stream.write_uchar(0x01) # <<<<<<<<<<<<<< * * for k in int_keys: */ - __pyx_t_7 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self->__pyx_base.__pyx_base.stream->__pyx_vtab)->write_uchar(__pyx_v_self->__pyx_base.__pyx_base.stream, 0x01, 0); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 844; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self->__pyx_base.__pyx_base.stream->__pyx_vtab)->write_uchar(__pyx_v_self->__pyx_base.__pyx_base.stream, 0x01, 0); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 847; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":846 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":849 * self.stream.write_uchar(0x01) * * for k in int_keys: # <<<<<<<<<<<<<< @@ -9164,28 +9161,28 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeMixedArray(struct __pyx_obj_6cpy * */ if (likely(((PyObject *)__pyx_v_int_keys) != Py_None)) { - __pyx_t_6 = 0; __pyx_t_10 = ((PyObject *)__pyx_v_int_keys); __Pyx_INCREF(__pyx_t_10); + __pyx_t_5 = 0; __pyx_t_10 = ((PyObject *)__pyx_v_int_keys); __Pyx_INCREF(__pyx_t_10); } else { - PyErr_SetString(PyExc_TypeError, "'NoneType' object is not iterable"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 846; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + PyErr_SetString(PyExc_TypeError, "'NoneType' object is not iterable"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 849; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } for (;;) { - if (__pyx_t_6 >= PyList_GET_SIZE(__pyx_t_10)) break; - __pyx_t_4 = PyList_GET_ITEM(__pyx_t_10, __pyx_t_6); __Pyx_INCREF(__pyx_t_4); __pyx_t_6++; + if (__pyx_t_5 >= PyList_GET_SIZE(__pyx_t_10)) break; + __pyx_t_9 = PyList_GET_ITEM(__pyx_t_10, __pyx_t_5); __Pyx_INCREF(__pyx_t_9); __pyx_t_5++; __Pyx_DECREF(__pyx_v_k); - __pyx_v_k = __pyx_t_4; - __pyx_t_4 = 0; + __pyx_v_k = __pyx_t_9; + __pyx_t_9 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":847 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":850 * * for k in int_keys: * self.writeElement(n[k]) # <<<<<<<<<<<<<< * * cpdef int writeObject(self, object obj, bint is_proxy=0) except -1: */ - __pyx_t_4 = PyObject_GetItem(__pyx_v_n, __pyx_v_k); if (!__pyx_t_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 847; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); - __pyx_t_7 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.writeElement(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_t_4, 0); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 847; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __pyx_t_9 = PyObject_GetItem(__pyx_v_n, __pyx_v_k); if (!__pyx_t_9) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 850; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_9); + __pyx_t_6 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.writeElement(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_t_9, 0); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 850; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; } __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; @@ -9194,7 +9191,7 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeMixedArray(struct __pyx_obj_6cpy __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_2); __Pyx_XDECREF(__pyx_t_3); - __Pyx_XDECREF(__pyx_t_4); + __Pyx_XDECREF(__pyx_t_9); __Pyx_XDECREF(__pyx_t_10); __Pyx_AddTraceback("cpyamf.amf3.Encoder.writeMixedArray"); __pyx_r = -1; @@ -9209,7 +9206,7 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeMixedArray(struct __pyx_obj_6cpy return __pyx_r; } -/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":849 +/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":852 * self.writeElement(n[k]) * * cpdef int writeObject(self, object obj, bint is_proxy=0) except -1: # <<<<<<<<<<<<<< @@ -9254,23 +9251,23 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ if (unlikely(__pyx_skip_dispatch)) ; /* Check if overriden in Python */ else if (unlikely(Py_TYPE(((PyObject *)__pyx_v_self))->tp_dictoffset != 0)) { - __pyx_t_1 = PyObject_GetAttr(((PyObject *)__pyx_v_self), __pyx_n_s__writeObject); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 849; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_GetAttr(((PyObject *)__pyx_v_self), __pyx_n_s__writeObject); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 852; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); if (!PyCFunction_Check(__pyx_t_1) || (PyCFunction_GET_FUNCTION(__pyx_t_1) != (void *)&__pyx_pf_6cpyamf_4amf3_7Encoder_writeObject)) { - __pyx_t_2 = __Pyx_PyBool_FromLong(__pyx_v_is_proxy); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 849; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyBool_FromLong(__pyx_v_is_proxy); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 852; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 849; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 852; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); __Pyx_INCREF(__pyx_v_obj); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_obj); __Pyx_GIVEREF(__pyx_v_obj); PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_2); __Pyx_GIVEREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_Call(__pyx_t_1, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 849; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 852; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_4 = __Pyx_PyInt_AsInt(__pyx_t_2); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 849; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; + __pyx_t_4 = __Pyx_PyInt_AsInt(__pyx_t_2); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 852; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_r = __pyx_t_4; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; @@ -9279,7 +9276,7 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; } - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":853 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":856 * cdef object kls * cdef ClassDefinition definition * cdef object alias = None # <<<<<<<<<<<<<< @@ -9289,7 +9286,7 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ __Pyx_INCREF(Py_None); __pyx_v_alias = Py_None; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":854 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":857 * cdef ClassDefinition definition * cdef object alias = None * cdef int class_ref = 0 # <<<<<<<<<<<<<< @@ -9298,7 +9295,7 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ */ __pyx_v_class_ref = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":855 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":858 * cdef object alias = None * cdef int class_ref = 0 * cdef int ret = 0 # <<<<<<<<<<<<<< @@ -9307,7 +9304,7 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ */ __pyx_v_ret = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":856 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":859 * cdef int class_ref = 0 * cdef int ret = 0 * cdef char *buf = NULL # <<<<<<<<<<<<<< @@ -9316,7 +9313,7 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ */ __pyx_v_buf = NULL; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":861 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":864 * cdef object attrs * * if self.use_proxies and not is_proxy: # <<<<<<<<<<<<<< @@ -9331,40 +9328,40 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ } if (__pyx_t_6) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":862 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":865 * * if self.use_proxies and not is_proxy: * return self.writeProxy(obj) # <<<<<<<<<<<<<< * * self.writeType(TYPE_OBJECT) */ - __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->writeProxy(__pyx_v_self, __pyx_v_obj); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 862; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->writeProxy(__pyx_v_self, __pyx_v_obj); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 865; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = __pyx_t_4; goto __pyx_L0; goto __pyx_L3; } __pyx_L3:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":864 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":867 * return self.writeProxy(obj) * * self.writeType(TYPE_OBJECT) # <<<<<<<<<<<<<< * * ref = self.context.getObjectReference(obj) */ - __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.writeType(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_6cpyamf_4amf3_TYPE_OBJECT); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 864; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.writeType(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_6cpyamf_4amf3_TYPE_OBJECT); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 867; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":866 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":869 * self.writeType(TYPE_OBJECT) * * ref = self.context.getObjectReference(obj) # <<<<<<<<<<<<<< * * if ref != -1: */ - __pyx_t_7 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->__pyx_base.getObjectReference(((struct __pyx_obj_6cpyamf_5codec_Context *)__pyx_v_self->context), __pyx_v_obj, 0); if (unlikely(__pyx_t_7 == -2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 866; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->__pyx_base.getObjectReference(((struct __pyx_obj_6cpyamf_5codec_Context *)__pyx_v_self->context), __pyx_v_obj, 0); if (unlikely(__pyx_t_7 == -2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 869; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_v_ref = __pyx_t_7; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":868 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":871 * ref = self.context.getObjectReference(obj) * * if ref != -1: # <<<<<<<<<<<<<< @@ -9374,16 +9371,16 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ __pyx_t_6 = (__pyx_v_ref != -1); if (__pyx_t_6) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":869 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":872 * * if ref != -1: * _encode_integer(self.stream, ref << 1) # <<<<<<<<<<<<<< * * return 0 */ - __pyx_t_4 = __pyx_f_6cpyamf_4amf3__encode_integer(__pyx_v_self->__pyx_base.__pyx_base.stream, (__pyx_v_ref << 1)); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 869; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __pyx_f_6cpyamf_4amf3__encode_integer(__pyx_v_self->__pyx_base.__pyx_base.stream, (__pyx_v_ref << 1)); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 872; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":871 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":874 * _encode_integer(self.stream, ref << 1) * * return 0 # <<<<<<<<<<<<<< @@ -9396,52 +9393,52 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ } __pyx_L4:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":873 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":876 * return 0 * * self.context.addObject(obj) # <<<<<<<<<<<<<< * * # object is not referenced, serialise it */ - __pyx_t_7 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->__pyx_base.addObject(((struct __pyx_obj_6cpyamf_5codec_Context *)__pyx_v_self->context), __pyx_v_obj, 0); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 873; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->__pyx_base.addObject(((struct __pyx_obj_6cpyamf_5codec_Context *)__pyx_v_self->context), __pyx_v_obj, 0); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 876; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":876 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":879 * * # object is not referenced, serialise it * kls = obj.__class__ # <<<<<<<<<<<<<< * definition = self.context.getClass(kls) * */ - __pyx_t_1 = PyObject_GetAttr(__pyx_v_obj, __pyx_n_s____class__); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 876; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_GetAttr(__pyx_v_obj, __pyx_n_s____class__); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 879; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_v_kls); __pyx_v_kls = __pyx_t_1; __pyx_t_1 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":877 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":880 * # object is not referenced, serialise it * kls = obj.__class__ * definition = self.context.getClass(kls) # <<<<<<<<<<<<<< * * if definition: */ - __pyx_t_1 = ((PyObject *)((struct __pyx_vtabstruct_6cpyamf_4amf3_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->getClass(__pyx_v_self->context, __pyx_v_kls, 0)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 877; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = ((PyObject *)((struct __pyx_vtabstruct_6cpyamf_4amf3_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->getClass(__pyx_v_self->context, __pyx_v_kls, 0)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 880; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(((PyObject *)__pyx_v_definition)); __pyx_v_definition = ((struct __pyx_obj_6cpyamf_4amf3_ClassDefinition *)__pyx_t_1); __pyx_t_1 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":879 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":882 * definition = self.context.getClass(kls) * * if definition: # <<<<<<<<<<<<<< * class_ref = 1 * alias = definition.alias */ - __pyx_t_6 = __Pyx_PyObject_IsTrue(((PyObject *)__pyx_v_definition)); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 879; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_IsTrue(((PyObject *)__pyx_v_definition)); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 882; __pyx_clineno = __LINE__; goto __pyx_L1_error;} if (__pyx_t_6) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":880 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":883 * * if definition: * class_ref = 1 # <<<<<<<<<<<<<< @@ -9450,7 +9447,7 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ */ __pyx_v_class_ref = 1; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":881 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":884 * if definition: * class_ref = 1 * alias = definition.alias # <<<<<<<<<<<<<< @@ -9464,53 +9461,53 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ } /*else*/ { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":883 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":886 * alias = definition.alias * else: * alias = self.context.getClassAlias(kls) # <<<<<<<<<<<<<< * definition = ClassDefinition(alias) * */ - __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->__pyx_base.getClassAlias(((struct __pyx_obj_6cpyamf_5codec_Context *)__pyx_v_self->context), __pyx_v_kls, 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 883; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->__pyx_base.getClassAlias(((struct __pyx_obj_6cpyamf_5codec_Context *)__pyx_v_self->context), __pyx_v_kls, 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 886; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_v_alias); __pyx_v_alias = __pyx_t_1; __pyx_t_1 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":884 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":887 * else: * alias = self.context.getClassAlias(kls) * definition = ClassDefinition(alias) # <<<<<<<<<<<<<< * * self.context.addClass(definition, alias.klass) */ - __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 884; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); + __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 887; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_1)); __Pyx_INCREF(__pyx_v_alias); PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_alias); __Pyx_GIVEREF(__pyx_v_alias); - __pyx_t_2 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_6cpyamf_4amf3_ClassDefinition)), __pyx_t_1, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 884; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_6cpyamf_4amf3_ClassDefinition)), ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 887; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0; __Pyx_DECREF(((PyObject *)__pyx_v_definition)); __pyx_v_definition = ((struct __pyx_obj_6cpyamf_4amf3_ClassDefinition *)__pyx_t_2); __pyx_t_2 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":886 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":889 * definition = ClassDefinition(alias) * * self.context.addClass(definition, alias.klass) # <<<<<<<<<<<<<< * * definition.writeReference(self.stream) */ - __pyx_t_2 = PyObject_GetAttr(__pyx_v_alias, __pyx_n_s__klass); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 886; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_GetAttr(__pyx_v_alias, __pyx_n_s__klass); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 889; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __pyx_t_7 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->addClass(__pyx_v_self->context, __pyx_v_definition, __pyx_t_2, 0); if (unlikely(__pyx_t_7 == -1 && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 886; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->addClass(__pyx_v_self->context, __pyx_v_definition, __pyx_t_2, 0); if (unlikely(__pyx_t_7 == -1 && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 889; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; } __pyx_L5:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":888 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":891 * self.context.addClass(definition, alias.klass) * * definition.writeReference(self.stream) # <<<<<<<<<<<<<< @@ -9519,7 +9516,7 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ */ ((struct __pyx_vtabstruct_6cpyamf_4amf3_ClassDefinition *)__pyx_v_definition->__pyx_vtab)->writeReference(__pyx_v_definition, __pyx_v_self->__pyx_base.__pyx_base.stream); - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":890 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":893 * definition.writeReference(self.stream) * * if class_ref == 0: # <<<<<<<<<<<<<< @@ -9529,41 +9526,41 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ __pyx_t_6 = (__pyx_v_class_ref == 0); if (__pyx_t_6) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":891 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":894 * * if class_ref == 0: * if alias.anonymous: # <<<<<<<<<<<<<< * self.stream.write(&REF_CHAR, 1) * else: */ - __pyx_t_2 = PyObject_GetAttr(__pyx_v_alias, __pyx_n_s__anonymous); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 891; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_GetAttr(__pyx_v_alias, __pyx_n_s__anonymous); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 894; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 891; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 894; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; if (__pyx_t_6) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":892 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":895 * if class_ref == 0: * if alias.anonymous: * self.stream.write(&REF_CHAR, 1) # <<<<<<<<<<<<<< * else: * self.serialiseString(alias.alias) */ - __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self->__pyx_base.__pyx_base.stream->__pyx_vtab)->write(__pyx_v_self->__pyx_base.__pyx_base.stream, (&__pyx_v_6cpyamf_4amf3_REF_CHAR), 1); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 892; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self->__pyx_base.__pyx_base.stream->__pyx_vtab)->write(__pyx_v_self->__pyx_base.__pyx_base.stream, (&__pyx_v_6cpyamf_4amf3_REF_CHAR), 1); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 895; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L7; } /*else*/ { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":894 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":897 * self.stream.write(&REF_CHAR, 1) * else: * self.serialiseString(alias.alias) # <<<<<<<<<<<<<< * * # work out what the final reference for the class will be. */ - __pyx_t_2 = PyObject_GetAttr(__pyx_v_alias, __pyx_n_s__alias); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 894; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_GetAttr(__pyx_v_alias, __pyx_n_s__alias); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 897; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.serialiseString(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_t_2, 0); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 894; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.serialiseString(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_t_2, 0); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 897; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; } __pyx_L7:; @@ -9571,48 +9568,48 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ } __pyx_L6:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":901 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":904 * # again. * * if alias.external: # <<<<<<<<<<<<<< * obj.__writeamf__(DataOutput(self)) * */ - __pyx_t_2 = PyObject_GetAttr(__pyx_v_alias, __pyx_n_s__external); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 901; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_GetAttr(__pyx_v_alias, __pyx_n_s__external); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 904; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 901; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 904; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; if (__pyx_t_6) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":902 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":905 * * if alias.external: * obj.__writeamf__(DataOutput(self)) # <<<<<<<<<<<<<< * * return 0 */ - __pyx_t_2 = PyObject_GetAttr(__pyx_v_obj, __pyx_n_s____writeamf__); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 902; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_GetAttr(__pyx_v_obj, __pyx_n_s____writeamf__); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 905; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 902; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); + __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 905; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_1)); __Pyx_INCREF(((PyObject *)__pyx_v_self)); PyTuple_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_v_self)); __Pyx_GIVEREF(((PyObject *)__pyx_v_self)); - __pyx_t_3 = PyObject_Call(__pyx_v_6cpyamf_4amf3_DataOutput, __pyx_t_1, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 902; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_v_6cpyamf_4amf3_DataOutput, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 905; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 902; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); + __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0; + __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 905; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_1)); PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_3); __Pyx_GIVEREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = PyObject_Call(__pyx_t_2, __pyx_t_1, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 902; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 905; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":904 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":907 * obj.__writeamf__(DataOutput(self)) * * return 0 # <<<<<<<<<<<<<< @@ -9625,33 +9622,33 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ } __pyx_L8:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":906 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":909 * return 0 * * attrs = alias.getEncodableAttributes(obj, codec=self) # <<<<<<<<<<<<<< * * if PyDict_CheckExact(attrs) != 1: */ - __pyx_t_3 = PyObject_GetAttr(__pyx_v_alias, __pyx_n_s_10); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 906; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_GetAttr(__pyx_v_alias, __pyx_n_s_18); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 909; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 906; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); + __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 909; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_1)); __Pyx_INCREF(__pyx_v_obj); PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_obj); __Pyx_GIVEREF(__pyx_v_obj); - __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 906; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 909; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); - if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_n_s__codec), ((PyObject *)__pyx_v_self)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 906; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_t_8 = PyEval_CallObjectWithKeywords(__pyx_t_3, __pyx_t_1, ((PyObject *)__pyx_t_2)); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 906; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_n_s__codec), ((PyObject *)__pyx_v_self)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 909; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_8 = PyEval_CallObjectWithKeywords(__pyx_t_3, ((PyObject *)__pyx_t_1), ((PyObject *)__pyx_t_2)); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 909; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0; __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_v_attrs); __pyx_v_attrs = __pyx_t_8; __pyx_t_8 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":908 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":911 * attrs = alias.getEncodableAttributes(obj, codec=self) * * if PyDict_CheckExact(attrs) != 1: # <<<<<<<<<<<<<< @@ -9661,29 +9658,23 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ __pyx_t_6 = (PyDict_CheckExact(__pyx_v_attrs) != 1); if (__pyx_t_6) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":909 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":912 * * if PyDict_CheckExact(attrs) != 1: * raise TypeError('Expected dict for encodable attributes') # <<<<<<<<<<<<<< * * if definition.attr_len > 0: */ - __pyx_t_8 = PyTuple_New(1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 909; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_8 = PyObject_Call(__pyx_builtin_TypeError, ((PyObject *)__pyx_k_tuple_20), NULL); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 912; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_8); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_11)); - PyTuple_SET_ITEM(__pyx_t_8, 0, ((PyObject *)__pyx_kp_s_11)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_11)); - __pyx_t_2 = PyObject_Call(__pyx_builtin_TypeError, __pyx_t_8, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 909; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __Pyx_Raise(__pyx_t_8, 0, 0); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - __Pyx_Raise(__pyx_t_2, 0, 0); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 909; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 912; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L9; } __pyx_L9:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":911 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":914 * raise TypeError('Expected dict for encodable attributes') * * if definition.attr_len > 0: # <<<<<<<<<<<<<< @@ -9693,7 +9684,7 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ __pyx_t_6 = (__pyx_v_definition->attr_len > 0); if (__pyx_t_6) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":912 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":915 * * if definition.attr_len > 0: * if class_ref == 0: # <<<<<<<<<<<<<< @@ -9703,7 +9694,7 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ __pyx_t_6 = (__pyx_v_class_ref == 0); if (__pyx_t_6) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":913 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":916 * if definition.attr_len > 0: * if class_ref == 0: * for attr in definition.static_properties: # <<<<<<<<<<<<<< @@ -9711,32 +9702,32 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ * */ if (likely(((PyObject *)__pyx_v_definition->static_properties) != Py_None)) { - __pyx_t_7 = 0; __pyx_t_2 = ((PyObject *)__pyx_v_definition->static_properties); __Pyx_INCREF(__pyx_t_2); + __pyx_t_7 = 0; __pyx_t_8 = ((PyObject *)__pyx_v_definition->static_properties); __Pyx_INCREF(__pyx_t_8); } else { - PyErr_SetString(PyExc_TypeError, "'NoneType' object is not iterable"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 913; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + PyErr_SetString(PyExc_TypeError, "'NoneType' object is not iterable"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 916; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } for (;;) { - if (__pyx_t_7 >= PyList_GET_SIZE(__pyx_t_2)) break; - __pyx_t_8 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_7); __Pyx_INCREF(__pyx_t_8); __pyx_t_7++; + if (__pyx_t_7 >= PyList_GET_SIZE(__pyx_t_8)) break; + __pyx_t_2 = PyList_GET_ITEM(__pyx_t_8, __pyx_t_7); __Pyx_INCREF(__pyx_t_2); __pyx_t_7++; __Pyx_DECREF(__pyx_v_attr); - __pyx_v_attr = __pyx_t_8; - __pyx_t_8 = 0; + __pyx_v_attr = __pyx_t_2; + __pyx_t_2 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":914 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":917 * if class_ref == 0: * for attr in definition.static_properties: * self.serialiseString(attr) # <<<<<<<<<<<<<< * * for attr in definition.static_properties: */ - __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.serialiseString(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_attr, 0); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 914; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.serialiseString(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_attr, 0); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 917; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; goto __pyx_L11; } __pyx_L11:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":916 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":919 * self.serialiseString(attr) * * for attr in definition.static_properties: # <<<<<<<<<<<<<< @@ -9744,18 +9735,18 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ * */ if (likely(((PyObject *)__pyx_v_definition->static_properties) != Py_None)) { - __pyx_t_7 = 0; __pyx_t_2 = ((PyObject *)__pyx_v_definition->static_properties); __Pyx_INCREF(__pyx_t_2); + __pyx_t_7 = 0; __pyx_t_8 = ((PyObject *)__pyx_v_definition->static_properties); __Pyx_INCREF(__pyx_t_8); } else { - PyErr_SetString(PyExc_TypeError, "'NoneType' object is not iterable"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 916; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + PyErr_SetString(PyExc_TypeError, "'NoneType' object is not iterable"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 919; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } for (;;) { - if (__pyx_t_7 >= PyList_GET_SIZE(__pyx_t_2)) break; - __pyx_t_8 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_7); __Pyx_INCREF(__pyx_t_8); __pyx_t_7++; + if (__pyx_t_7 >= PyList_GET_SIZE(__pyx_t_8)) break; + __pyx_t_2 = PyList_GET_ITEM(__pyx_t_8, __pyx_t_7); __Pyx_INCREF(__pyx_t_2); __pyx_t_7++; __Pyx_DECREF(__pyx_v_attr); - __pyx_v_attr = __pyx_t_8; - __pyx_t_8 = 0; + __pyx_v_attr = __pyx_t_2; + __pyx_t_2 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":917 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":920 * * for attr in definition.static_properties: * value = PyDict_GetItem(attrs, attr) # <<<<<<<<<<<<<< @@ -9764,7 +9755,7 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ */ __pyx_v_value = PyDict_GetItem(__pyx_v_attrs, __pyx_v_attr); - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":919 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":922 * value = PyDict_GetItem(attrs, attr) * * if value == NULL: # <<<<<<<<<<<<<< @@ -9774,7 +9765,7 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ __pyx_t_6 = (__pyx_v_value == NULL); if (__pyx_t_6) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":920 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":923 * * if value == NULL: * raise KeyError # <<<<<<<<<<<<<< @@ -9782,23 +9773,23 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ * if PyDict_DelItem(attrs, attr) == -1: */ __Pyx_Raise(__pyx_builtin_KeyError, 0, 0); - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 920; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 923; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L16; } __pyx_L16:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":922 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":925 * raise KeyError * * if PyDict_DelItem(attrs, attr) == -1: # <<<<<<<<<<<<<< * return -1 * */ - __pyx_t_4 = PyDict_DelItem(__pyx_v_attrs, __pyx_v_attr); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 922; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyDict_DelItem(__pyx_v_attrs, __pyx_v_attr); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_t_6 = (__pyx_t_4 == -1); if (__pyx_t_6) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":923 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":926 * * if PyDict_DelItem(attrs, attr) == -1: * return -1 # <<<<<<<<<<<<<< @@ -9806,24 +9797,24 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ * self.writeElement(value) */ __pyx_r = -1; - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; goto __pyx_L0; goto __pyx_L17; } __pyx_L17:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":925 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":928 * return -1 * * self.writeElement(value) # <<<<<<<<<<<<<< * * if definition.encoding == OBJECT_ENCODING_STATIC: */ - __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.writeElement(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), ((PyObject *)__pyx_v_value), 0); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.writeElement(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), ((PyObject *)__pyx_v_value), 0); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":927 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":930 * self.writeElement(value) * * if definition.encoding == OBJECT_ENCODING_STATIC: # <<<<<<<<<<<<<< @@ -9833,7 +9824,7 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ __pyx_t_6 = (__pyx_v_definition->encoding == __pyx_v_6cpyamf_4amf3_OBJECT_ENCODING_STATIC); if (__pyx_t_6) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":928 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":931 * * if definition.encoding == OBJECT_ENCODING_STATIC: * return 0 # <<<<<<<<<<<<<< @@ -9849,7 +9840,7 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ } __pyx_L10:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":930 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":933 * return 0 * * if definition.encoding == OBJECT_ENCODING_DYNAMIC: # <<<<<<<<<<<<<< @@ -9859,7 +9850,7 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ __pyx_t_6 = (__pyx_v_definition->encoding == __pyx_v_6cpyamf_4amf3_OBJECT_ENCODING_DYNAMIC); if (__pyx_t_6) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":931 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":934 * * if definition.encoding == OBJECT_ENCODING_DYNAMIC: * ref = 0 # <<<<<<<<<<<<<< @@ -9868,7 +9859,7 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ */ __pyx_v_ref = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":932 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":935 * if definition.encoding == OBJECT_ENCODING_DYNAMIC: * ref = 0 * key = NULL # <<<<<<<<<<<<<< @@ -9877,7 +9868,7 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ */ __pyx_v_key = NULL; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":933 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":936 * ref = 0 * key = NULL * value = NULL # <<<<<<<<<<<<<< @@ -9886,7 +9877,7 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ */ __pyx_v_value = NULL; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":935 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":938 * value = NULL * * while PyDict_Next(attrs, &ref, &key, &value): # <<<<<<<<<<<<<< @@ -9897,38 +9888,38 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ __pyx_t_4 = PyDict_Next(__pyx_v_attrs, (&__pyx_v_ref), (&__pyx_v_key), (&__pyx_v_value)); if (!__pyx_t_4) break; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":936 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":939 * * while PyDict_Next(attrs, &ref, &key, &value): * self.serialiseString(key) # <<<<<<<<<<<<<< * self.writeElement(value) * */ - __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.serialiseString(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), ((PyObject *)__pyx_v_key), 0); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 936; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.serialiseString(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), ((PyObject *)__pyx_v_key), 0); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 939; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":937 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":940 * while PyDict_Next(attrs, &ref, &key, &value): * self.serialiseString(key) * self.writeElement(value) # <<<<<<<<<<<<<< * * self.stream.write(&REF_CHAR, 1) */ - __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.writeElement(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), ((PyObject *)__pyx_v_value), 0); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 937; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.writeElement(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), ((PyObject *)__pyx_v_value), 0); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 940; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":939 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":942 * self.writeElement(value) * * self.stream.write(&REF_CHAR, 1) # <<<<<<<<<<<<<< * * return 0 */ - __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self->__pyx_base.__pyx_base.stream->__pyx_vtab)->write(__pyx_v_self->__pyx_base.__pyx_base.stream, (&__pyx_v_6cpyamf_4amf3_REF_CHAR), 1); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 939; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self->__pyx_base.__pyx_base.stream->__pyx_vtab)->write(__pyx_v_self->__pyx_base.__pyx_base.stream, (&__pyx_v_6cpyamf_4amf3_REF_CHAR), 1); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 942; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L19; } __pyx_L19:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":941 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":944 * self.stream.write(&REF_CHAR, 1) * * return 0 # <<<<<<<<<<<<<< @@ -9957,7 +9948,7 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeObject(struct __pyx_obj_6cpyamf_ return __pyx_r; } -/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":849 +/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":852 * self.writeElement(n[k]) * * cpdef int writeObject(self, object obj, bint is_proxy=0) except -1: # <<<<<<<<<<<<<< @@ -9996,18 +9987,18 @@ static PyObject *__pyx_pf_6cpyamf_4amf3_7Encoder_writeObject(PyObject *__pyx_v_s } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "writeObject") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 849; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "writeObject") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 852; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } __pyx_v_obj = values[0]; if (values[1]) { - __pyx_v_is_proxy = __Pyx_PyObject_IsTrue(values[1]); if (unlikely((__pyx_v_is_proxy == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 849; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_is_proxy = __Pyx_PyObject_IsTrue(values[1]); if (unlikely((__pyx_v_is_proxy == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 852; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_is_proxy = ((int)0); } } else { __pyx_v_is_proxy = ((int)0); switch (PyTuple_GET_SIZE(__pyx_args)) { - case 2: __pyx_v_is_proxy = __Pyx_PyObject_IsTrue(PyTuple_GET_ITEM(__pyx_args, 1)); if (unlikely((__pyx_v_is_proxy == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 849; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + case 2: __pyx_v_is_proxy = __Pyx_PyObject_IsTrue(PyTuple_GET_ITEM(__pyx_args, 1)); if (unlikely((__pyx_v_is_proxy == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 852; __pyx_clineno = __LINE__; goto __pyx_L3_error;} case 1: __pyx_v_obj = PyTuple_GET_ITEM(__pyx_args, 0); break; default: goto __pyx_L5_argtuple_error; @@ -10015,7 +10006,7 @@ static PyObject *__pyx_pf_6cpyamf_4amf3_7Encoder_writeObject(PyObject *__pyx_v_s } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("writeObject", 0, 1, 2, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 849; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("writeObject", 0, 1, 2, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 852; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_L3_error:; __Pyx_AddTraceback("cpyamf.amf3.Encoder.writeObject"); __Pyx_RefNannyFinishContext(); @@ -10024,8 +10015,8 @@ static PyObject *__pyx_pf_6cpyamf_4amf3_7Encoder_writeObject(PyObject *__pyx_v_s __Pyx_XDECREF(__pyx_r); __pyx_t_2.__pyx_n = 1; __pyx_t_2.is_proxy = __pyx_v_is_proxy; - __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)((struct __pyx_obj_6cpyamf_4amf3_Encoder *)__pyx_v_self)->__pyx_base.__pyx_vtab)->__pyx_base.writeObject(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_obj, 1, &__pyx_t_2); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 849; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_t_3 = PyInt_FromLong(__pyx_t_1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 849; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)((struct __pyx_obj_6cpyamf_4amf3_Encoder *)__pyx_v_self)->__pyx_base.__pyx_vtab)->__pyx_base.writeObject(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_obj, 1, &__pyx_t_2); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 852; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyInt_FromLong(__pyx_t_1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 852; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __pyx_r = __pyx_t_3; __pyx_t_3 = 0; @@ -10043,7 +10034,7 @@ static PyObject *__pyx_pf_6cpyamf_4amf3_7Encoder_writeObject(PyObject *__pyx_v_s return __pyx_r; } -/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":943 +/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":946 * return 0 * * cdef int writeByteArray(self, object obj) except -1: # <<<<<<<<<<<<<< @@ -10067,26 +10058,26 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeByteArray(struct __pyx_obj_6cpya __pyx_v_buf = Py_None; __Pyx_INCREF(Py_None); __pyx_v_l = Py_None; __Pyx_INCREF(Py_None); - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":953 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":956 * cdef object buf * * self.writeType(TYPE_BYTEARRAY) # <<<<<<<<<<<<<< * * ref = self.context.getObjectReference(obj) */ - __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.writeType(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_6cpyamf_4amf3_TYPE_BYTEARRAY); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 953; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.writeType(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_6cpyamf_4amf3_TYPE_BYTEARRAY); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 956; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":955 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":958 * self.writeType(TYPE_BYTEARRAY) * * ref = self.context.getObjectReference(obj) # <<<<<<<<<<<<<< * * if ref != -1: */ - __pyx_t_2 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->__pyx_base.getObjectReference(((struct __pyx_obj_6cpyamf_5codec_Context *)__pyx_v_self->context), __pyx_v_obj, 0); if (unlikely(__pyx_t_2 == -2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 955; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->__pyx_base.getObjectReference(((struct __pyx_obj_6cpyamf_5codec_Context *)__pyx_v_self->context), __pyx_v_obj, 0); if (unlikely(__pyx_t_2 == -2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 958; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_v_ref = __pyx_t_2; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":957 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":960 * ref = self.context.getObjectReference(obj) * * if ref != -1: # <<<<<<<<<<<<<< @@ -10096,16 +10087,16 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeByteArray(struct __pyx_obj_6cpya __pyx_t_3 = (__pyx_v_ref != -1); if (__pyx_t_3) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":958 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":961 * * if ref != -1: * _encode_integer(self.stream, ref << 1) # <<<<<<<<<<<<<< * * return 0 */ - __pyx_t_1 = __pyx_f_6cpyamf_4amf3__encode_integer(__pyx_v_self->__pyx_base.__pyx_base.stream, (__pyx_v_ref << 1)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 958; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_6cpyamf_4amf3__encode_integer(__pyx_v_self->__pyx_base.__pyx_base.stream, (__pyx_v_ref << 1)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 961; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":960 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":963 * _encode_integer(self.stream, ref << 1) * * return 0 # <<<<<<<<<<<<<< @@ -10118,77 +10109,77 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeByteArray(struct __pyx_obj_6cpya } __pyx_L3:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":962 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":965 * return 0 * * self.context.addObject(obj) # <<<<<<<<<<<<<< * * buf = str(obj) */ - __pyx_t_2 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->__pyx_base.addObject(((struct __pyx_obj_6cpyamf_5codec_Context *)__pyx_v_self->context), __pyx_v_obj, 0); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 962; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->__pyx_base.addObject(((struct __pyx_obj_6cpyamf_5codec_Context *)__pyx_v_self->context), __pyx_v_obj, 0); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 965; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":964 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":967 * self.context.addObject(obj) * * buf = str(obj) # <<<<<<<<<<<<<< * l = PyString_GET_SIZE(buf) * */ - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 964; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 967; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_4)); __Pyx_INCREF(__pyx_v_obj); PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_v_obj); __Pyx_GIVEREF(__pyx_v_obj); - __pyx_t_5 = PyObject_Call(((PyObject *)((PyObject*)&PyString_Type)), __pyx_t_4, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 964; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyObject_Call(((PyObject *)((PyObject*)&PyString_Type)), ((PyObject *)__pyx_t_4), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 967; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_v_buf); __pyx_v_buf = __pyx_t_5; __pyx_t_5 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":965 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":968 * * buf = str(obj) * l = PyString_GET_SIZE(buf) # <<<<<<<<<<<<<< * * _encode_integer(self.stream, (l << 1) | REFERENCE_BIT) */ - __pyx_t_5 = PyInt_FromSsize_t(PyString_GET_SIZE(__pyx_v_buf)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 965; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyInt_FromSsize_t(PyString_GET_SIZE(__pyx_v_buf)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 968; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_v_l); __pyx_v_l = __pyx_t_5; __pyx_t_5 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":967 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":970 * l = PyString_GET_SIZE(buf) * * _encode_integer(self.stream, (l << 1) | REFERENCE_BIT) # <<<<<<<<<<<<<< * self.stream.write(PyString_AS_STRING(buf), l) * */ - __pyx_t_5 = PyNumber_Lshift(__pyx_v_l, __pyx_int_1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 967; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyNumber_Lshift(__pyx_v_l, __pyx_int_1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 970; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); - __pyx_t_4 = PyLong_FromUnsignedLong(__pyx_v_6cpyamf_4amf3_REFERENCE_BIT); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 967; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyLong_FromUnsignedLong(__pyx_v_6cpyamf_4amf3_REFERENCE_BIT); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 970; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); - __pyx_t_6 = PyNumber_Or(__pyx_t_5, __pyx_t_4); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 967; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = PyNumber_Or(__pyx_t_5, __pyx_t_4); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 970; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_t_6); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 967; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_t_6); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 970; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - __pyx_t_7 = __pyx_f_6cpyamf_4amf3__encode_integer(__pyx_v_self->__pyx_base.__pyx_base.stream, __pyx_t_1); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 967; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = __pyx_f_6cpyamf_4amf3__encode_integer(__pyx_v_self->__pyx_base.__pyx_base.stream, __pyx_t_1); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 970; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":968 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":971 * * _encode_integer(self.stream, (l << 1) | REFERENCE_BIT) * self.stream.write(PyString_AS_STRING(buf), l) # <<<<<<<<<<<<<< * * return 0 */ - __pyx_t_2 = __Pyx_PyIndex_AsSsize_t(__pyx_v_l); if (unlikely((__pyx_t_2 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 968; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_t_7 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self->__pyx_base.__pyx_base.stream->__pyx_vtab)->write(__pyx_v_self->__pyx_base.__pyx_base.stream, PyString_AS_STRING(__pyx_v_buf), __pyx_t_2); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 968; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyIndex_AsSsize_t(__pyx_v_l); if (unlikely((__pyx_t_2 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 971; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self->__pyx_base.__pyx_base.stream->__pyx_vtab)->write(__pyx_v_self->__pyx_base.__pyx_base.stream, PyString_AS_STRING(__pyx_v_buf), __pyx_t_2); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 971; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":970 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":973 * self.stream.write(PyString_AS_STRING(buf), l) * * return 0 # <<<<<<<<<<<<<< @@ -10213,7 +10204,7 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeByteArray(struct __pyx_obj_6cpya return __pyx_r; } -/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":972 +/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":975 * return 0 * * cdef int writeXML(self, obj) except -1: # <<<<<<<<<<<<<< @@ -10236,56 +10227,56 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeXML(struct __pyx_obj_6cpyamf_4am __pyx_v_i = Py_None; __Pyx_INCREF(Py_None); __pyx_v_s = Py_None; __Pyx_INCREF(Py_None); - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":973 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":976 * * cdef int writeXML(self, obj) except -1: * self.writeType(TYPE_XMLSTRING) # <<<<<<<<<<<<<< * * i = self.context.getObjectReference(obj) */ - __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.writeType(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_6cpyamf_4amf3_TYPE_XMLSTRING); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 973; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.writeType(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_6cpyamf_4amf3_TYPE_XMLSTRING); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 976; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":975 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":978 * self.writeType(TYPE_XMLSTRING) * * i = self.context.getObjectReference(obj) # <<<<<<<<<<<<<< * * if i != -1: */ - __pyx_t_2 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->__pyx_base.getObjectReference(((struct __pyx_obj_6cpyamf_5codec_Context *)__pyx_v_self->context), __pyx_v_obj, 0); if (unlikely(__pyx_t_2 == -2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 975; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_t_3 = PyInt_FromSsize_t(__pyx_t_2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 975; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->__pyx_base.getObjectReference(((struct __pyx_obj_6cpyamf_5codec_Context *)__pyx_v_self->context), __pyx_v_obj, 0); if (unlikely(__pyx_t_2 == -2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 978; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyInt_FromSsize_t(__pyx_t_2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 978; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_v_i); __pyx_v_i = __pyx_t_3; __pyx_t_3 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":977 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":980 * i = self.context.getObjectReference(obj) * * if i != -1: # <<<<<<<<<<<<<< * _encode_integer(self.stream, i << 1) * */ - __pyx_t_3 = PyObject_RichCompare(__pyx_v_i, __pyx_int_neg_1, Py_NE); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 977; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_RichCompare(__pyx_v_i, __pyx_int_neg_1, Py_NE); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 980; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 977; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 980; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; if (__pyx_t_4) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":978 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":981 * * if i != -1: * _encode_integer(self.stream, i << 1) # <<<<<<<<<<<<<< * * return 0 */ - __pyx_t_3 = PyNumber_Lshift(__pyx_v_i, __pyx_int_1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 978; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyNumber_Lshift(__pyx_v_i, __pyx_int_1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 981; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_t_3); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 978; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_t_3); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 981; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_5 = __pyx_f_6cpyamf_4amf3__encode_integer(__pyx_v_self->__pyx_base.__pyx_base.stream, __pyx_t_1); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 978; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __pyx_f_6cpyamf_4amf3__encode_integer(__pyx_v_self->__pyx_base.__pyx_base.stream, __pyx_t_1); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 981; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":980 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":983 * _encode_integer(self.stream, i << 1) * * return 0 # <<<<<<<<<<<<<< @@ -10298,53 +10289,47 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeXML(struct __pyx_obj_6cpyamf_4am } __pyx_L3:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":982 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":985 * return 0 * * self.context.addObject(obj) # <<<<<<<<<<<<<< * * s = xml.tostring(obj).encode('utf-8') */ - __pyx_t_2 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->__pyx_base.addObject(((struct __pyx_obj_6cpyamf_5codec_Context *)__pyx_v_self->context), __pyx_v_obj, 0); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 982; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->__pyx_base.addObject(((struct __pyx_obj_6cpyamf_5codec_Context *)__pyx_v_self->context), __pyx_v_obj, 0); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 985; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":984 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":987 * self.context.addObject(obj) * * s = xml.tostring(obj).encode('utf-8') # <<<<<<<<<<<<<< * * if not PyString_CheckExact(s): */ - __pyx_t_3 = __Pyx_GetName(__pyx_m, __pyx_n_s__xml); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 984; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_GetName(__pyx_m, __pyx_n_s__xml); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 987; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __pyx_t_6 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s__tostring); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 984; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s__tostring); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 987; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 984; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 987; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); __Pyx_INCREF(__pyx_v_obj); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_obj); __Pyx_GIVEREF(__pyx_v_obj); - __pyx_t_7 = PyObject_Call(__pyx_t_6, __pyx_t_3, NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 984; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyObject_Call(__pyx_t_6, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 987; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_7); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = PyObject_GetAttr(__pyx_t_7, __pyx_n_s__encode); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 984; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; + __pyx_t_3 = PyObject_GetAttr(__pyx_t_7, __pyx_n_s__encode); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 987; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 984; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_k_tuple_22), NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 987; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_7); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_12)); - PyTuple_SET_ITEM(__pyx_t_7, 0, ((PyObject *)__pyx_kp_s_12)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_12)); - __pyx_t_6 = PyObject_Call(__pyx_t_3, __pyx_t_7, NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 984; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; __Pyx_DECREF(__pyx_v_s); - __pyx_v_s = __pyx_t_6; - __pyx_t_6 = 0; + __pyx_v_s = __pyx_t_7; + __pyx_t_7 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":986 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":989 * s = xml.tostring(obj).encode('utf-8') * * if not PyString_CheckExact(s): # <<<<<<<<<<<<<< @@ -10354,71 +10339,65 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeXML(struct __pyx_obj_6cpyamf_4am __pyx_t_4 = (!PyString_CheckExact(__pyx_v_s)); if (__pyx_t_4) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":987 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":990 * * if not PyString_CheckExact(s): * raise TypeError('Expected string from xml serialization') # <<<<<<<<<<<<<< * * i = PyString_GET_SIZE(s) */ - __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 987; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_6); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_13)); - PyTuple_SET_ITEM(__pyx_t_6, 0, ((PyObject *)__pyx_kp_s_13)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_13)); - __pyx_t_7 = PyObject_Call(__pyx_builtin_TypeError, __pyx_t_6, NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 987; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyObject_Call(__pyx_builtin_TypeError, ((PyObject *)__pyx_k_tuple_24), NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 990; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_7); - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_Raise(__pyx_t_7, 0, 0); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 987; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 990; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L4; } __pyx_L4:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":989 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":992 * raise TypeError('Expected string from xml serialization') * * i = PyString_GET_SIZE(s) # <<<<<<<<<<<<<< * * _encode_integer(self.stream, (i << 1) | REFERENCE_BIT) */ - __pyx_t_7 = PyInt_FromSsize_t(PyString_GET_SIZE(__pyx_v_s)); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 989; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyInt_FromSsize_t(PyString_GET_SIZE(__pyx_v_s)); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 992; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_7); __Pyx_DECREF(__pyx_v_i); __pyx_v_i = __pyx_t_7; __pyx_t_7 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":991 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":994 * i = PyString_GET_SIZE(s) * * _encode_integer(self.stream, (i << 1) | REFERENCE_BIT) # <<<<<<<<<<<<<< * self.stream.write(PyString_AS_STRING(s), i) * */ - __pyx_t_7 = PyNumber_Lshift(__pyx_v_i, __pyx_int_1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 991; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyNumber_Lshift(__pyx_v_i, __pyx_int_1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 994; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_7); - __pyx_t_6 = PyLong_FromUnsignedLong(__pyx_v_6cpyamf_4amf3_REFERENCE_BIT); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 991; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_6); - __pyx_t_3 = PyNumber_Or(__pyx_t_7, __pyx_t_6); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 991; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyLong_FromUnsignedLong(__pyx_v_6cpyamf_4amf3_REFERENCE_BIT); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 994; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); + __pyx_t_6 = PyNumber_Or(__pyx_t_7, __pyx_t_3); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 994; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - __pyx_t_5 = __Pyx_PyInt_AsInt(__pyx_t_3); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 991; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_1 = __pyx_f_6cpyamf_4amf3__encode_integer(__pyx_v_self->__pyx_base.__pyx_base.stream, __pyx_t_5); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 991; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyInt_AsInt(__pyx_t_6); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 994; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; + __pyx_t_1 = __pyx_f_6cpyamf_4amf3__encode_integer(__pyx_v_self->__pyx_base.__pyx_base.stream, __pyx_t_5); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 994; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":992 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":995 * * _encode_integer(self.stream, (i << 1) | REFERENCE_BIT) * self.stream.write(PyString_AS_STRING(s), i) # <<<<<<<<<<<<<< * * return 0 */ - __pyx_t_2 = __Pyx_PyIndex_AsSsize_t(__pyx_v_i); if (unlikely((__pyx_t_2 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 992; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self->__pyx_base.__pyx_base.stream->__pyx_vtab)->write(__pyx_v_self->__pyx_base.__pyx_base.stream, PyString_AS_STRING(__pyx_v_s), __pyx_t_2); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 992; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyIndex_AsSsize_t(__pyx_v_i); if (unlikely((__pyx_t_2 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 995; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self->__pyx_base.__pyx_base.stream->__pyx_vtab)->write(__pyx_v_self->__pyx_base.__pyx_base.stream, PyString_AS_STRING(__pyx_v_s), __pyx_t_2); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 995; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":994 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":997 * self.stream.write(PyString_AS_STRING(s), i) * * return 0 # <<<<<<<<<<<<<< @@ -10443,7 +10422,7 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeXML(struct __pyx_obj_6cpyamf_4am return __pyx_r; } -/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":996 +/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":999 * return 0 * * cdef int writeDateTime(self, obj) except -1: # <<<<<<<<<<<<<< @@ -10465,26 +10444,26 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeDateTime(struct __pyx_obj_6cpyam __Pyx_RefNannySetupContext("writeDateTime"); __Pyx_INCREF(__pyx_v_obj); - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1000 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1003 * Writes an L{datetime.datetime} object to the stream * """ * cdef Py_ssize_t ref = self.context.getObjectReference(obj) # <<<<<<<<<<<<<< * * self.writeType(TYPE_DATE) */ - __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->__pyx_base.getObjectReference(((struct __pyx_obj_6cpyamf_5codec_Context *)__pyx_v_self->context), __pyx_v_obj, 0); if (unlikely(__pyx_t_1 == -2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1000; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->__pyx_base.getObjectReference(((struct __pyx_obj_6cpyamf_5codec_Context *)__pyx_v_self->context), __pyx_v_obj, 0); if (unlikely(__pyx_t_1 == -2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1003; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_v_ref = __pyx_t_1; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1002 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1005 * cdef Py_ssize_t ref = self.context.getObjectReference(obj) * * self.writeType(TYPE_DATE) # <<<<<<<<<<<<<< * * if ref != -1: */ - __pyx_t_2 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.writeType(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_6cpyamf_4amf3_TYPE_DATE); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1002; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.writeType(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_6cpyamf_4amf3_TYPE_DATE); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1005; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1004 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1007 * self.writeType(TYPE_DATE) * * if ref != -1: # <<<<<<<<<<<<<< @@ -10494,16 +10473,16 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeDateTime(struct __pyx_obj_6cpyam __pyx_t_3 = (__pyx_v_ref != -1); if (__pyx_t_3) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1005 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1008 * * if ref != -1: * _encode_integer(self.stream, ref << 1) # <<<<<<<<<<<<<< * * return 0 */ - __pyx_t_2 = __pyx_f_6cpyamf_4amf3__encode_integer(__pyx_v_self->__pyx_base.__pyx_base.stream, (__pyx_v_ref << 1)); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1005; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __pyx_f_6cpyamf_4amf3__encode_integer(__pyx_v_self->__pyx_base.__pyx_base.stream, (__pyx_v_ref << 1)); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1008; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1007 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1010 * _encode_integer(self.stream, ref << 1) * * return 0 # <<<<<<<<<<<<<< @@ -10516,25 +10495,25 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeDateTime(struct __pyx_obj_6cpyam } __pyx_L3:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1009 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1012 * return 0 * * self.context.addObject(obj) # <<<<<<<<<<<<<< * self.stream.write(&REF_CHAR, 1) * */ - __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->__pyx_base.addObject(((struct __pyx_obj_6cpyamf_5codec_Context *)__pyx_v_self->context), __pyx_v_obj, 0); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1009; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->__pyx_base.addObject(((struct __pyx_obj_6cpyamf_5codec_Context *)__pyx_v_self->context), __pyx_v_obj, 0); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1012; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1010 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1013 * * self.context.addObject(obj) * self.stream.write(&REF_CHAR, 1) # <<<<<<<<<<<<<< * * if self.timezone_offset is not None: */ - __pyx_t_2 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self->__pyx_base.__pyx_base.stream->__pyx_vtab)->write(__pyx_v_self->__pyx_base.__pyx_base.stream, (&__pyx_v_6cpyamf_4amf3_REF_CHAR), 1); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1010; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self->__pyx_base.__pyx_base.stream->__pyx_vtab)->write(__pyx_v_self->__pyx_base.__pyx_base.stream, (&__pyx_v_6cpyamf_4amf3_REF_CHAR), 1); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1013; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1012 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1015 * self.stream.write(&REF_CHAR, 1) * * if self.timezone_offset is not None: # <<<<<<<<<<<<<< @@ -10544,14 +10523,14 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeDateTime(struct __pyx_obj_6cpyam __pyx_t_3 = (__pyx_v_self->__pyx_base.__pyx_base.timezone_offset != Py_None); if (__pyx_t_3) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1013 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1016 * * if self.timezone_offset is not None: * obj -= self.timezone_offset # <<<<<<<<<<<<<< * * ms = util.get_timestamp(obj) */ - __pyx_t_4 = PyNumber_InPlaceSubtract(__pyx_v_obj, __pyx_v_self->__pyx_base.__pyx_base.timezone_offset); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1013; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyNumber_InPlaceSubtract(__pyx_v_obj, __pyx_v_self->__pyx_base.__pyx_base.timezone_offset); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1016; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_v_obj); __pyx_v_obj = __pyx_t_4; @@ -10560,39 +10539,39 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeDateTime(struct __pyx_obj_6cpyam } __pyx_L4:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1015 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1018 * obj -= self.timezone_offset * * ms = util.get_timestamp(obj) # <<<<<<<<<<<<<< * self.stream.write_double(ms * 1000.0) * */ - __pyx_t_4 = __Pyx_GetName(__pyx_m, __pyx_n_s__util); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1015; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_GetName(__pyx_m, __pyx_n_s__util); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1018; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_4, __pyx_n_s__get_timestamp); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1015; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyObject_GetAttr(__pyx_t_4, __pyx_n_s__get_timestamp); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1018; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1015; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1018; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_4)); __Pyx_INCREF(__pyx_v_obj); PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_v_obj); __Pyx_GIVEREF(__pyx_v_obj); - __pyx_t_6 = PyObject_Call(__pyx_t_5, __pyx_t_4, NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1015; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = PyObject_Call(__pyx_t_5, ((PyObject *)__pyx_t_4), NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1018; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_7 = __pyx_PyFloat_AsDouble(__pyx_t_6); if (unlikely((__pyx_t_7 == (double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1015; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0; + __pyx_t_7 = __pyx_PyFloat_AsDouble(__pyx_t_6); if (unlikely((__pyx_t_7 == (double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1018; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; __pyx_v_ms = __pyx_t_7; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1016 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1019 * * ms = util.get_timestamp(obj) * self.stream.write_double(ms * 1000.0) # <<<<<<<<<<<<<< * * cdef int writeProxy(self, obj) except -1: */ - __pyx_t_2 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self->__pyx_base.__pyx_base.stream->__pyx_vtab)->write_double(__pyx_v_self->__pyx_base.__pyx_base.stream, (__pyx_v_ms * 1000.0), 0); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1016; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self->__pyx_base.__pyx_base.stream->__pyx_vtab)->write_double(__pyx_v_self->__pyx_base.__pyx_base.stream, (__pyx_v_ms * 1000.0), 0); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1019; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = 0; goto __pyx_L0; @@ -10608,7 +10587,7 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeDateTime(struct __pyx_obj_6cpyam return __pyx_r; } -/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1018 +/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1021 * self.stream.write_double(ms * 1000.0) * * cdef int writeProxy(self, obj) except -1: # <<<<<<<<<<<<<< @@ -10624,19 +10603,19 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeProxy(struct __pyx_obj_6cpyamf_4 struct __pyx_opt_args_6cpyamf_5codec_7Encoder_writeObject __pyx_t_3; __Pyx_RefNannySetupContext("writeProxy"); - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1024 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1027 * @since: 0.6 * """ * cdef object proxy = self.context.getProxyForObject(obj) # <<<<<<<<<<<<<< * * return self.writeObject(proxy, 1) */ - __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->getProxyForObject(__pyx_v_self->context, __pyx_v_obj, 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1024; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Context *)__pyx_v_self->context->__pyx_base.__pyx_vtab)->getProxyForObject(__pyx_v_self->context, __pyx_v_obj, 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1027; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); __pyx_v_proxy = __pyx_t_1; __pyx_t_1 = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1026 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1029 * cdef object proxy = self.context.getProxyForObject(obj) * * return self.writeObject(proxy, 1) # <<<<<<<<<<<<<< @@ -10645,7 +10624,7 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeProxy(struct __pyx_obj_6cpyamf_4 */ __pyx_t_3.__pyx_n = 1; __pyx_t_3.is_proxy = 1; - __pyx_t_2 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.writeObject(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_proxy, 0, &__pyx_t_3); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1026; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->__pyx_base.writeObject(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_proxy, 0, &__pyx_t_3); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1029; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = __pyx_t_2; goto __pyx_L0; @@ -10661,7 +10640,7 @@ static int __pyx_f_6cpyamf_4amf3_7Encoder_writeProxy(struct __pyx_obj_6cpyamf_4 return __pyx_r; } -/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1028 +/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1031 * return self.writeObject(proxy, 1) * * cdef inline int handleBasicTypes(self, object element, object py_type) except -1: # <<<<<<<<<<<<<< @@ -10676,17 +10655,17 @@ static CYTHON_INLINE int __pyx_f_6cpyamf_4amf3_7Encoder_handleBasicTypes(struct int __pyx_t_2; __Pyx_RefNannySetupContext("handleBasicTypes"); - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1029 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1032 * * cdef inline int handleBasicTypes(self, object element, object py_type) except -1: * cdef int ret = codec.Encoder.handleBasicTypes(self, element, py_type) # <<<<<<<<<<<<<< * * if ret == 1: # not handled */ - __pyx_t_1 = __pyx_vtabptr_6cpyamf_5codec_Encoder->handleBasicTypes(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_element, __pyx_v_py_type); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1029; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_vtabptr_6cpyamf_5codec_Encoder->handleBasicTypes(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_element, __pyx_v_py_type); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1032; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_v_ret = __pyx_t_1; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1031 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1034 * cdef int ret = codec.Encoder.handleBasicTypes(self, element, py_type) * * if ret == 1: # not handled # <<<<<<<<<<<<<< @@ -10696,7 +10675,7 @@ static CYTHON_INLINE int __pyx_f_6cpyamf_4amf3_7Encoder_handleBasicTypes(struct __pyx_t_2 = (__pyx_v_ret == 1); if (__pyx_t_2) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1032 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1035 * * if ret == 1: # not handled * if py_type is ByteArrayType: # <<<<<<<<<<<<<< @@ -10706,14 +10685,14 @@ static CYTHON_INLINE int __pyx_f_6cpyamf_4amf3_7Encoder_handleBasicTypes(struct __pyx_t_2 = (__pyx_v_py_type == __pyx_v_6cpyamf_4amf3_ByteArrayType); if (__pyx_t_2) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1033 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1036 * if ret == 1: # not handled * if py_type is ByteArrayType: * return self.writeByteArray(element) # <<<<<<<<<<<<<< * * return ret */ - __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->writeByteArray(__pyx_v_self, __pyx_v_element); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1033; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4amf3_Encoder *)__pyx_v_self->__pyx_base.__pyx_vtab)->writeByteArray(__pyx_v_self, __pyx_v_element); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1036; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = __pyx_t_1; goto __pyx_L0; goto __pyx_L4; @@ -10723,7 +10702,7 @@ static CYTHON_INLINE int __pyx_f_6cpyamf_4amf3_7Encoder_handleBasicTypes(struct } __pyx_L3:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1035 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1038 * return self.writeByteArray(element) * * return ret # <<<<<<<<<<<<<< @@ -10817,7 +10796,7 @@ static PyObject *__pyx_pf_6cpyamf_4amf3_7Encoder_7context___get__(PyObject *__py return __pyx_r; } -/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1038 +/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1041 * * * cdef int encode_int(long i, char **buf) except -1: # <<<<<<<<<<<<<< @@ -10835,7 +10814,7 @@ static int __pyx_f_6cpyamf_4amf3_encode_int(long __pyx_v_i, char **__pyx_v_buf) PyObject *__pyx_t_2; __Pyx_RefNannySetupContext("encode_int"); - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1040 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1043 * cdef int encode_int(long i, char **buf) except -1: * # Use typecasting to get the twos complement representation of i * cdef unsigned long n = (((&i)))[0] # <<<<<<<<<<<<<< @@ -10844,7 +10823,7 @@ static int __pyx_f_6cpyamf_4amf3_encode_int(long __pyx_v_i, char **__pyx_v_buf) */ __pyx_v_n = (((unsigned long *)((void *)(&__pyx_v_i)))[0]); - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1042 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1045 * cdef unsigned long n = (((&i)))[0] * * cdef unsigned long real_value = n # <<<<<<<<<<<<<< @@ -10853,7 +10832,7 @@ static int __pyx_f_6cpyamf_4amf3_encode_int(long __pyx_v_i, char **__pyx_v_buf) */ __pyx_v_real_value = __pyx_v_n; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1043 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1046 * * cdef unsigned long real_value = n * cdef unsigned char count = 0 # <<<<<<<<<<<<<< @@ -10862,7 +10841,7 @@ static int __pyx_f_6cpyamf_4amf3_encode_int(long __pyx_v_i, char **__pyx_v_buf) */ __pyx_v_count = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1044 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1047 * cdef unsigned long real_value = n * cdef unsigned char count = 0 * cdef char *bytes = NULL # <<<<<<<<<<<<<< @@ -10871,7 +10850,7 @@ static int __pyx_f_6cpyamf_4amf3_encode_int(long __pyx_v_i, char **__pyx_v_buf) */ __pyx_v_bytes = NULL; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1046 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1049 * cdef char *bytes = NULL * * if n > 0x1fffff: # <<<<<<<<<<<<<< @@ -10881,7 +10860,7 @@ static int __pyx_f_6cpyamf_4amf3_encode_int(long __pyx_v_i, char **__pyx_v_buf) __pyx_t_1 = (__pyx_v_n > 0x1fffff); if (__pyx_t_1) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1047 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1050 * * if n > 0x1fffff: * bytes = malloc(4) # <<<<<<<<<<<<<< @@ -10890,7 +10869,7 @@ static int __pyx_f_6cpyamf_4amf3_encode_int(long __pyx_v_i, char **__pyx_v_buf) */ __pyx_v_bytes = ((char *)malloc(4)); - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1049 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1052 * bytes = malloc(4) * * if bytes == NULL: # <<<<<<<<<<<<<< @@ -10900,19 +10879,19 @@ static int __pyx_f_6cpyamf_4amf3_encode_int(long __pyx_v_i, char **__pyx_v_buf) __pyx_t_1 = (__pyx_v_bytes == NULL); if (__pyx_t_1) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1050 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1053 * * if bytes == NULL: * PyErr_NoMemory() # <<<<<<<<<<<<<< * * n = n >> 1 */ - __pyx_t_2 = PyErr_NoMemory(); if (unlikely(__pyx_t_2 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1050; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyErr_NoMemory(); if (unlikely(__pyx_t_2 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1053; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L4; } __pyx_L4:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1052 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1055 * PyErr_NoMemory() * * n = n >> 1 # <<<<<<<<<<<<<< @@ -10921,7 +10900,7 @@ static int __pyx_f_6cpyamf_4amf3_encode_int(long __pyx_v_i, char **__pyx_v_buf) */ __pyx_v_n = (__pyx_v_n >> 1); - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1053 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1056 * * n = n >> 1 * bytes[count] = 0x80 | ((n >> 21) & 0xff) # <<<<<<<<<<<<<< @@ -10930,19 +10909,19 @@ static int __pyx_f_6cpyamf_4amf3_encode_int(long __pyx_v_i, char **__pyx_v_buf) */ (__pyx_v_bytes[__pyx_v_count]) = (0x80 | ((__pyx_v_n >> 21) & 0xff)); - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1054 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1057 * n = n >> 1 * bytes[count] = 0x80 | ((n >> 21) & 0xff) * count += 1 # <<<<<<<<<<<<<< * * if n > 0x3fff: */ - __pyx_v_count += 1; + __pyx_v_count = (__pyx_v_count + 1); goto __pyx_L3; } __pyx_L3:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1056 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1059 * count += 1 * * if n > 0x3fff: # <<<<<<<<<<<<<< @@ -10952,7 +10931,7 @@ static int __pyx_f_6cpyamf_4amf3_encode_int(long __pyx_v_i, char **__pyx_v_buf) __pyx_t_1 = (__pyx_v_n > 0x3fff); if (__pyx_t_1) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1057 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1060 * * if n > 0x3fff: * if bytes == NULL: # <<<<<<<<<<<<<< @@ -10962,7 +10941,7 @@ static int __pyx_f_6cpyamf_4amf3_encode_int(long __pyx_v_i, char **__pyx_v_buf) __pyx_t_1 = (__pyx_v_bytes == NULL); if (__pyx_t_1) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1058 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1061 * if n > 0x3fff: * if bytes == NULL: * bytes = malloc(3) # <<<<<<<<<<<<<< @@ -10971,7 +10950,7 @@ static int __pyx_f_6cpyamf_4amf3_encode_int(long __pyx_v_i, char **__pyx_v_buf) */ __pyx_v_bytes = ((char *)malloc(3)); - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1060 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1063 * bytes = malloc(3) * * if bytes == NULL: # <<<<<<<<<<<<<< @@ -10981,14 +10960,14 @@ static int __pyx_f_6cpyamf_4amf3_encode_int(long __pyx_v_i, char **__pyx_v_buf) __pyx_t_1 = (__pyx_v_bytes == NULL); if (__pyx_t_1) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1061 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1064 * * if bytes == NULL: * PyErr_NoMemory() # <<<<<<<<<<<<<< * * bytes[count] = 0x80 | ((n >> 14) & 0xff) */ - __pyx_t_2 = PyErr_NoMemory(); if (unlikely(__pyx_t_2 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1061; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyErr_NoMemory(); if (unlikely(__pyx_t_2 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1064; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L7; } __pyx_L7:; @@ -10996,7 +10975,7 @@ static int __pyx_f_6cpyamf_4amf3_encode_int(long __pyx_v_i, char **__pyx_v_buf) } __pyx_L6:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1063 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1066 * PyErr_NoMemory() * * bytes[count] = 0x80 | ((n >> 14) & 0xff) # <<<<<<<<<<<<<< @@ -11005,19 +10984,19 @@ static int __pyx_f_6cpyamf_4amf3_encode_int(long __pyx_v_i, char **__pyx_v_buf) */ (__pyx_v_bytes[__pyx_v_count]) = (0x80 | ((__pyx_v_n >> 14) & 0xff)); - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1064 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1067 * * bytes[count] = 0x80 | ((n >> 14) & 0xff) * count += 1 # <<<<<<<<<<<<<< * * if n > 0x7f: */ - __pyx_v_count += 1; + __pyx_v_count = (__pyx_v_count + 1); goto __pyx_L5; } __pyx_L5:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1066 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1069 * count += 1 * * if n > 0x7f: # <<<<<<<<<<<<<< @@ -11027,7 +11006,7 @@ static int __pyx_f_6cpyamf_4amf3_encode_int(long __pyx_v_i, char **__pyx_v_buf) __pyx_t_1 = (__pyx_v_n > 0x7f); if (__pyx_t_1) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1067 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1070 * * if n > 0x7f: * if bytes == NULL: # <<<<<<<<<<<<<< @@ -11037,7 +11016,7 @@ static int __pyx_f_6cpyamf_4amf3_encode_int(long __pyx_v_i, char **__pyx_v_buf) __pyx_t_1 = (__pyx_v_bytes == NULL); if (__pyx_t_1) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1068 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1071 * if n > 0x7f: * if bytes == NULL: * bytes = malloc(2) # <<<<<<<<<<<<<< @@ -11046,7 +11025,7 @@ static int __pyx_f_6cpyamf_4amf3_encode_int(long __pyx_v_i, char **__pyx_v_buf) */ __pyx_v_bytes = ((char *)malloc(2)); - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1070 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1073 * bytes = malloc(2) * * if bytes == NULL: # <<<<<<<<<<<<<< @@ -11056,14 +11035,14 @@ static int __pyx_f_6cpyamf_4amf3_encode_int(long __pyx_v_i, char **__pyx_v_buf) __pyx_t_1 = (__pyx_v_bytes == NULL); if (__pyx_t_1) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1071 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1074 * * if bytes == NULL: * PyErr_NoMemory() # <<<<<<<<<<<<<< * * bytes[count] = 0x80 | ((n >> 7) & 0xff) */ - __pyx_t_2 = PyErr_NoMemory(); if (unlikely(__pyx_t_2 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1071; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyErr_NoMemory(); if (unlikely(__pyx_t_2 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1074; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L10; } __pyx_L10:; @@ -11071,7 +11050,7 @@ static int __pyx_f_6cpyamf_4amf3_encode_int(long __pyx_v_i, char **__pyx_v_buf) } __pyx_L9:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1073 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1076 * PyErr_NoMemory() * * bytes[count] = 0x80 | ((n >> 7) & 0xff) # <<<<<<<<<<<<<< @@ -11080,19 +11059,19 @@ static int __pyx_f_6cpyamf_4amf3_encode_int(long __pyx_v_i, char **__pyx_v_buf) */ (__pyx_v_bytes[__pyx_v_count]) = (0x80 | ((__pyx_v_n >> 7) & 0xff)); - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1074 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1077 * * bytes[count] = 0x80 | ((n >> 7) & 0xff) * count += 1 # <<<<<<<<<<<<<< * * if bytes == NULL: */ - __pyx_v_count += 1; + __pyx_v_count = (__pyx_v_count + 1); goto __pyx_L8; } __pyx_L8:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1076 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1079 * count += 1 * * if bytes == NULL: # <<<<<<<<<<<<<< @@ -11102,7 +11081,7 @@ static int __pyx_f_6cpyamf_4amf3_encode_int(long __pyx_v_i, char **__pyx_v_buf) __pyx_t_1 = (__pyx_v_bytes == NULL); if (__pyx_t_1) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1077 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1080 * * if bytes == NULL: * bytes = malloc(1) # <<<<<<<<<<<<<< @@ -11111,7 +11090,7 @@ static int __pyx_f_6cpyamf_4amf3_encode_int(long __pyx_v_i, char **__pyx_v_buf) */ __pyx_v_bytes = ((char *)malloc(1)); - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1079 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1082 * bytes = malloc(1) * * if bytes == NULL: # <<<<<<<<<<<<<< @@ -11121,14 +11100,14 @@ static int __pyx_f_6cpyamf_4amf3_encode_int(long __pyx_v_i, char **__pyx_v_buf) __pyx_t_1 = (__pyx_v_bytes == NULL); if (__pyx_t_1) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1080 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1083 * * if bytes == NULL: * PyErr_NoMemory() # <<<<<<<<<<<<<< * * if real_value > 0x1fffff: */ - __pyx_t_2 = PyErr_NoMemory(); if (unlikely(__pyx_t_2 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1080; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyErr_NoMemory(); if (unlikely(__pyx_t_2 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1083; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L12; } __pyx_L12:; @@ -11136,7 +11115,7 @@ static int __pyx_f_6cpyamf_4amf3_encode_int(long __pyx_v_i, char **__pyx_v_buf) } __pyx_L11:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1082 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1085 * PyErr_NoMemory() * * if real_value > 0x1fffff: # <<<<<<<<<<<<<< @@ -11146,7 +11125,7 @@ static int __pyx_f_6cpyamf_4amf3_encode_int(long __pyx_v_i, char **__pyx_v_buf) __pyx_t_1 = (__pyx_v_real_value > 0x1fffff); if (__pyx_t_1) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1083 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1086 * * if real_value > 0x1fffff: * bytes[count] = real_value & 0xff # <<<<<<<<<<<<<< @@ -11158,7 +11137,7 @@ static int __pyx_f_6cpyamf_4amf3_encode_int(long __pyx_v_i, char **__pyx_v_buf) } /*else*/ { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1085 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1088 * bytes[count] = real_value & 0xff * else: * bytes[count] = real_value & 0x7f # <<<<<<<<<<<<<< @@ -11169,7 +11148,7 @@ static int __pyx_f_6cpyamf_4amf3_encode_int(long __pyx_v_i, char **__pyx_v_buf) } __pyx_L13:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1087 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1090 * bytes[count] = real_value & 0x7f * * buf[0] = bytes # <<<<<<<<<<<<<< @@ -11178,7 +11157,7 @@ static int __pyx_f_6cpyamf_4amf3_encode_int(long __pyx_v_i, char **__pyx_v_buf) */ (__pyx_v_buf[0]) = __pyx_v_bytes; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1089 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1092 * buf[0] = bytes * * return count + 1 # <<<<<<<<<<<<<< @@ -11198,7 +11177,7 @@ static int __pyx_f_6cpyamf_4amf3_encode_int(long __pyx_v_i, char **__pyx_v_buf) return __pyx_r; } -/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1092 +/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1095 * * * cdef int decode_int(cBufferedByteStream stream, int sign=0) except? -1: # <<<<<<<<<<<<<< @@ -11223,7 +11202,7 @@ static int __pyx_f_6cpyamf_4amf3_decode_int(struct __pyx_obj_6cpyamf_4util_cBuf } } - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1093 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1096 * * cdef int decode_int(cBufferedByteStream stream, int sign=0) except? -1: * cdef int n = 0 # <<<<<<<<<<<<<< @@ -11232,7 +11211,7 @@ static int __pyx_f_6cpyamf_4amf3_decode_int(struct __pyx_obj_6cpyamf_4util_cBuf */ __pyx_v_n = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1094 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1097 * cdef int decode_int(cBufferedByteStream stream, int sign=0) except? -1: * cdef int n = 0 * cdef int result = 0 # <<<<<<<<<<<<<< @@ -11241,17 +11220,17 @@ static int __pyx_f_6cpyamf_4amf3_decode_int(struct __pyx_obj_6cpyamf_4util_cBuf */ __pyx_v_result = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1095 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1098 * cdef int n = 0 * cdef int result = 0 * cdef unsigned char b = stream.read_uchar() # <<<<<<<<<<<<<< * * while b & 0x80 != 0 and n < 3: */ - __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_stream->__pyx_vtab)->read_uchar(__pyx_v_stream, 0); if (unlikely(__pyx_t_1 == 0 && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_stream->__pyx_vtab)->read_uchar(__pyx_v_stream, 0); if (unlikely(__pyx_t_1 == 0 && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1098; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_v_b = __pyx_t_1; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1097 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1100 * cdef unsigned char b = stream.read_uchar() * * while b & 0x80 != 0 and n < 3: # <<<<<<<<<<<<<< @@ -11268,45 +11247,45 @@ static int __pyx_f_6cpyamf_4amf3_decode_int(struct __pyx_obj_6cpyamf_4util_cBuf } if (!__pyx_t_4) break; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1098 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1101 * * while b & 0x80 != 0 and n < 3: * result <<= 7 # <<<<<<<<<<<<<< * result |= b & 0x7f * */ - __pyx_v_result <<= 7; + __pyx_v_result = (__pyx_v_result << 7); - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1099 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1102 * while b & 0x80 != 0 and n < 3: * result <<= 7 * result |= b & 0x7f # <<<<<<<<<<<<<< * * b = stream.read_uchar() */ - __pyx_v_result |= (__pyx_v_b & 0x7f); + __pyx_v_result = (__pyx_v_result | (__pyx_v_b & 0x7f)); - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1101 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1104 * result |= b & 0x7f * * b = stream.read_uchar() # <<<<<<<<<<<<<< * * n += 1 */ - __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_stream->__pyx_vtab)->read_uchar(__pyx_v_stream, 0); if (unlikely(__pyx_t_1 == 0 && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1101; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_stream->__pyx_vtab)->read_uchar(__pyx_v_stream, 0); if (unlikely(__pyx_t_1 == 0 && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1104; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_v_b = __pyx_t_1; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1103 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1106 * b = stream.read_uchar() * * n += 1 # <<<<<<<<<<<<<< * * if n < 3: */ - __pyx_v_n += 1; + __pyx_v_n = (__pyx_v_n + 1); } - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1105 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1108 * n += 1 * * if n < 3: # <<<<<<<<<<<<<< @@ -11316,46 +11295,46 @@ static int __pyx_f_6cpyamf_4amf3_decode_int(struct __pyx_obj_6cpyamf_4util_cBuf __pyx_t_4 = (__pyx_v_n < 3); if (__pyx_t_4) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1106 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1109 * * if n < 3: * result <<= 7 # <<<<<<<<<<<<<< * result |= b * else: */ - __pyx_v_result <<= 7; + __pyx_v_result = (__pyx_v_result << 7); - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1107 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1110 * if n < 3: * result <<= 7 * result |= b # <<<<<<<<<<<<<< * else: * result <<= 8 */ - __pyx_v_result |= __pyx_v_b; + __pyx_v_result = (__pyx_v_result | __pyx_v_b); goto __pyx_L5; } /*else*/ { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1109 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1112 * result |= b * else: * result <<= 8 # <<<<<<<<<<<<<< * result |= b * */ - __pyx_v_result <<= 8; + __pyx_v_result = (__pyx_v_result << 8); - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1110 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1113 * else: * result <<= 8 * result |= b # <<<<<<<<<<<<<< * * if result & 0x10000000 != 0: */ - __pyx_v_result |= __pyx_v_b; + __pyx_v_result = (__pyx_v_result | __pyx_v_b); - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1112 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1115 * result |= b * * if result & 0x10000000 != 0: # <<<<<<<<<<<<<< @@ -11365,7 +11344,7 @@ static int __pyx_f_6cpyamf_4amf3_decode_int(struct __pyx_obj_6cpyamf_4util_cBuf __pyx_t_4 = ((__pyx_v_result & 0x10000000) != 0); if (__pyx_t_4) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1113 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1116 * * if result & 0x10000000 != 0: * if sign == 1: # <<<<<<<<<<<<<< @@ -11375,35 +11354,35 @@ static int __pyx_f_6cpyamf_4amf3_decode_int(struct __pyx_obj_6cpyamf_4util_cBuf __pyx_t_4 = (__pyx_v_sign == 1); if (__pyx_t_4) { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1114 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1117 * if result & 0x10000000 != 0: * if sign == 1: * result -= 0x20000000 # <<<<<<<<<<<<<< * else: * result <<= 1 */ - __pyx_v_result -= 0x20000000; + __pyx_v_result = (__pyx_v_result - 0x20000000); goto __pyx_L7; } /*else*/ { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1116 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1119 * result -= 0x20000000 * else: * result <<= 1 # <<<<<<<<<<<<<< * result += 1 * */ - __pyx_v_result <<= 1; + __pyx_v_result = (__pyx_v_result << 1); - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1117 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1120 * else: * result <<= 1 * result += 1 # <<<<<<<<<<<<<< * * return result */ - __pyx_v_result += 1; + __pyx_v_result = (__pyx_v_result + 1); } __pyx_L7:; goto __pyx_L6; @@ -11412,7 +11391,7 @@ static int __pyx_f_6cpyamf_4amf3_decode_int(struct __pyx_obj_6cpyamf_4util_cBuf } __pyx_L5:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1119 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1122 * result += 1 * * return result # <<<<<<<<<<<<<< @@ -11432,7 +11411,7 @@ static int __pyx_f_6cpyamf_4amf3_decode_int(struct __pyx_obj_6cpyamf_4util_cBuf return __pyx_r; } -/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1122 +/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1125 * * * cdef inline int _encode_integer(cBufferedByteStream stream, int i) except -1: # <<<<<<<<<<<<<< @@ -11447,7 +11426,7 @@ static CYTHON_INLINE int __pyx_f_6cpyamf_4amf3__encode_integer(struct __pyx_obj_ int __pyx_t_1; __Pyx_RefNannySetupContext("_encode_integer"); - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1123 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1126 * * cdef inline int _encode_integer(cBufferedByteStream stream, int i) except -1: * cdef char *buf = NULL # <<<<<<<<<<<<<< @@ -11456,7 +11435,7 @@ static CYTHON_INLINE int __pyx_f_6cpyamf_4amf3__encode_integer(struct __pyx_obj_ */ __pyx_v_buf = NULL; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1124 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1127 * cdef inline int _encode_integer(cBufferedByteStream stream, int i) except -1: * cdef char *buf = NULL * cdef int size = 0 # <<<<<<<<<<<<<< @@ -11465,7 +11444,7 @@ static CYTHON_INLINE int __pyx_f_6cpyamf_4amf3__encode_integer(struct __pyx_obj_ */ __pyx_v_size = 0; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1126 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1129 * cdef int size = 0 * * try: # <<<<<<<<<<<<<< @@ -11474,29 +11453,29 @@ static CYTHON_INLINE int __pyx_f_6cpyamf_4amf3__encode_integer(struct __pyx_obj_ */ /*try:*/ { - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1127 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1130 * * try: * size = encode_int(i, &buf) # <<<<<<<<<<<<<< * * return stream.write(buf, size) */ - __pyx_t_1 = __pyx_f_6cpyamf_4amf3_encode_int(__pyx_v_i, (&__pyx_v_buf)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1127; __pyx_clineno = __LINE__; goto __pyx_L4;} + __pyx_t_1 = __pyx_f_6cpyamf_4amf3_encode_int(__pyx_v_i, (&__pyx_v_buf)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1130; __pyx_clineno = __LINE__; goto __pyx_L4;} __pyx_v_size = __pyx_t_1; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1129 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1132 * size = encode_int(i, &buf) * * return stream.write(buf, size) # <<<<<<<<<<<<<< * finally: * free(buf) */ - __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_stream->__pyx_vtab)->write(__pyx_v_stream, __pyx_v_buf, __pyx_v_size); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1129; __pyx_clineno = __LINE__; goto __pyx_L4;} + __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_stream->__pyx_vtab)->write(__pyx_v_stream, __pyx_v_buf, __pyx_v_size); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1132; __pyx_clineno = __LINE__; goto __pyx_L4;} __pyx_r = __pyx_t_1; goto __pyx_L3; } - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1131 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1134 * return stream.write(buf, size) * finally: * free(buf) # <<<<<<<<<<<<<< @@ -11542,7 +11521,7 @@ static CYTHON_INLINE int __pyx_f_6cpyamf_4amf3__encode_integer(struct __pyx_obj_ return __pyx_r; } -/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1134 +/* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1137 * * * cdef inline Py_ssize_t _read_ref(cBufferedByteStream stream) except -1: # <<<<<<<<<<<<<< @@ -11555,14 +11534,14 @@ static CYTHON_INLINE Py_ssize_t __pyx_f_6cpyamf_4amf3__read_ref(struct __pyx_obj struct __pyx_opt_args_6cpyamf_4amf3_decode_int __pyx_t_2; __Pyx_RefNannySetupContext("_read_ref"); - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1135 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":1138 * * cdef inline Py_ssize_t _read_ref(cBufferedByteStream stream) except -1: * return decode_int(stream, 0) # <<<<<<<<<<<<<< */ __pyx_t_2.__pyx_n = 1; __pyx_t_2.sign = 0; - __pyx_t_1 = __pyx_f_6cpyamf_4amf3_decode_int(__pyx_v_stream, &__pyx_t_2); if (unlikely(__pyx_t_1 == -1 && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1135; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_6cpyamf_4amf3_decode_int(__pyx_v_stream, &__pyx_t_2); if (unlikely(__pyx_t_1 == -1 && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1138; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = ((Py_ssize_t)__pyx_t_1); goto __pyx_L0; @@ -11781,7 +11760,7 @@ PyTypeObject __pyx_type_6cpyamf_4amf3_ClassDefinition = { 0, /*tp_getattro*/ 0, /*tp_setattro*/ &__pyx_tp_as_buffer_ClassDefinition, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/ + Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC, /*tp_flags*/ __Pyx_DOCSTR("\n Holds transient class trait info for an individual encode/decode.\n "), /*tp_doc*/ __pyx_tp_traverse_6cpyamf_4amf3_ClassDefinition, /*tp_traverse*/ __pyx_tp_clear_6cpyamf_4amf3_ClassDefinition, /*tp_clear*/ @@ -12017,7 +11996,7 @@ PyTypeObject __pyx_type_6cpyamf_4amf3_Context = { 0, /*tp_getattro*/ 0, /*tp_setattro*/ &__pyx_tp_as_buffer_Context, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/ + Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC, /*tp_flags*/ __Pyx_DOCSTR("\n I hold the AMF3 context for en/decoding streams.\n "), /*tp_doc*/ __pyx_tp_traverse_6cpyamf_4amf3_Context, /*tp_traverse*/ __pyx_tp_clear_6cpyamf_4amf3_Context, /*tp_clear*/ @@ -12241,7 +12220,7 @@ PyTypeObject __pyx_type_6cpyamf_4amf3_Decoder = { 0, /*tp_getattro*/ 0, /*tp_setattro*/ &__pyx_tp_as_buffer_Decoder, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/ + Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC, /*tp_flags*/ __Pyx_DOCSTR("\n Decodes an AMF3 data stream.\n "), /*tp_doc*/ __pyx_tp_traverse_6cpyamf_4amf3_Decoder, /*tp_traverse*/ __pyx_tp_clear_6cpyamf_4amf3_Decoder, /*tp_clear*/ @@ -12467,7 +12446,7 @@ PyTypeObject __pyx_type_6cpyamf_4amf3_Encoder = { 0, /*tp_getattro*/ 0, /*tp_setattro*/ &__pyx_tp_as_buffer_Encoder, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/ + Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC, /*tp_flags*/ __Pyx_DOCSTR("\n The AMF3 Encoder.\n "), /*tp_doc*/ __pyx_tp_traverse_6cpyamf_4amf3_Encoder, /*tp_traverse*/ __pyx_tp_clear_6cpyamf_4amf3_Encoder, /*tp_clear*/ @@ -12507,7 +12486,7 @@ static PyMethodDef __pyx_methods[] = { static struct PyModuleDef __pyx_moduledef = { PyModuleDef_HEAD_INIT, __Pyx_NAMESTR("amf3"), - __Pyx_DOCSTR(__pyx_k_14), /* m_doc */ + __Pyx_DOCSTR(__pyx_k_25), /* m_doc */ -1, /* m_size */ __pyx_methods /* m_methods */, NULL, /* m_reload */ @@ -12519,34 +12498,24 @@ static struct PyModuleDef __pyx_moduledef = { static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_n_s_1, __pyx_k_1, sizeof(__pyx_k_1), 0, 0, 1, 1}, - {&__pyx_n_s_10, __pyx_k_10, sizeof(__pyx_k_10), 0, 0, 1, 1}, {&__pyx_kp_s_11, __pyx_k_11, sizeof(__pyx_k_11), 0, 0, 1, 0}, - {&__pyx_kp_s_12, __pyx_k_12, sizeof(__pyx_k_12), 0, 0, 1, 0}, {&__pyx_kp_s_13, __pyx_k_13, sizeof(__pyx_k_13), 0, 0, 1, 0}, - {&__pyx_kp_u_15, __pyx_k_15, sizeof(__pyx_k_15), 0, 1, 0, 0}, - {&__pyx_kp_u_16, __pyx_k_16, sizeof(__pyx_k_16), 0, 1, 0, 0}, - {&__pyx_kp_u_17, __pyx_k_17, sizeof(__pyx_k_17), 0, 1, 0, 0}, - {&__pyx_kp_u_18, __pyx_k_18, sizeof(__pyx_k_18), 0, 1, 0, 0}, - {&__pyx_kp_u_19, __pyx_k_19, sizeof(__pyx_k_19), 0, 1, 0, 0}, - {&__pyx_n_s_2, __pyx_k_2, sizeof(__pyx_k_2), 0, 0, 1, 1}, - {&__pyx_kp_u_20, __pyx_k_20, sizeof(__pyx_k_20), 0, 1, 0, 0}, - {&__pyx_kp_u_21, __pyx_k_21, sizeof(__pyx_k_21), 0, 1, 0, 0}, - {&__pyx_kp_s_3, __pyx_k_3, sizeof(__pyx_k_3), 0, 0, 1, 0}, + {&__pyx_kp_s_14, __pyx_k_14, sizeof(__pyx_k_14), 0, 0, 1, 0}, + {&__pyx_kp_s_16, __pyx_k_16, sizeof(__pyx_k_16), 0, 0, 1, 0}, + {&__pyx_n_s_18, __pyx_k_18, sizeof(__pyx_k_18), 0, 0, 1, 1}, + {&__pyx_kp_s_19, __pyx_k_19, sizeof(__pyx_k_19), 0, 0, 1, 0}, + {&__pyx_kp_s_21, __pyx_k_21, sizeof(__pyx_k_21), 0, 0, 1, 0}, + {&__pyx_kp_s_23, __pyx_k_23, sizeof(__pyx_k_23), 0, 0, 1, 0}, + {&__pyx_n_s_3, __pyx_k_3, sizeof(__pyx_k_3), 0, 0, 1, 1}, {&__pyx_kp_s_4, __pyx_k_4, sizeof(__pyx_k_4), 0, 0, 1, 0}, - {&__pyx_kp_s_5, __pyx_k_5, sizeof(__pyx_k_5), 0, 0, 1, 0}, {&__pyx_kp_s_6, __pyx_k_6, sizeof(__pyx_k_6), 0, 0, 1, 0}, - {&__pyx_kp_s_7, __pyx_k_7, sizeof(__pyx_k_7), 0, 0, 1, 0}, {&__pyx_kp_s_8, __pyx_k_8, sizeof(__pyx_k_8), 0, 0, 1, 0}, - {&__pyx_kp_s_9, __pyx_k_9, sizeof(__pyx_k_9), 0, 0, 1, 0}, {&__pyx_n_s__ASObject, __pyx_k__ASObject, sizeof(__pyx_k__ASObject), 0, 0, 1, 1}, {&__pyx_n_s__ByteArray, __pyx_k__ByteArray, sizeof(__pyx_k__ByteArray), 0, 0, 1, 1}, - {&__pyx_n_s__Context, __pyx_k__Context, sizeof(__pyx_k__Context), 0, 0, 1, 1}, {&__pyx_n_s__DataInput, __pyx_k__DataInput, sizeof(__pyx_k__DataInput), 0, 0, 1, 1}, {&__pyx_n_s__DataOutput, __pyx_k__DataOutput, sizeof(__pyx_k__DataOutput), 0, 0, 1, 1}, {&__pyx_n_s__DecodeError, __pyx_k__DecodeError, sizeof(__pyx_k__DecodeError), 0, 0, 1, 1}, - {&__pyx_n_s__Decoder, __pyx_k__Decoder, sizeof(__pyx_k__Decoder), 0, 0, 1, 1}, {&__pyx_n_s__EncodeError, __pyx_k__EncodeError, sizeof(__pyx_k__EncodeError), 0, 0, 1, 1}, - {&__pyx_n_s__Encoder, __pyx_k__Encoder, sizeof(__pyx_k__Encoder), 0, 0, 1, 1}, {&__pyx_n_s__ImportError, __pyx_k__ImportError, sizeof(__pyx_k__ImportError), 0, 0, 1, 1}, {&__pyx_n_s__KeyError, __pyx_k__KeyError, sizeof(__pyx_k__KeyError), 0, 0, 1, 1}, {&__pyx_n_s__MixedArray, __pyx_k__MixedArray, sizeof(__pyx_k__MixedArray), 0, 0, 1, 1}, @@ -12668,13 +12637,210 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { static int __Pyx_InitCachedBuiltins(void) { __pyx_builtin_ImportError = __Pyx_GetName(__pyx_b, __pyx_n_s__ImportError); if (!__pyx_builtin_ImportError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 24; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_builtin_TypeError = __Pyx_GetName(__pyx_b, __pyx_n_s__TypeError); if (!__pyx_builtin_TypeError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 639; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_builtin_ValueError = __Pyx_GetName(__pyx_b, __pyx_n_s__ValueError); if (!__pyx_builtin_ValueError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 819; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_builtin_KeyError = __Pyx_GetName(__pyx_b, __pyx_n_s__KeyError); if (!__pyx_builtin_KeyError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 920; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_builtin_ValueError = __Pyx_GetName(__pyx_b, __pyx_n_s__ValueError); if (!__pyx_builtin_ValueError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 822; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_builtin_KeyError = __Pyx_GetName(__pyx_b, __pyx_n_s__KeyError); if (!__pyx_builtin_KeyError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 923; __pyx_clineno = __LINE__; goto __pyx_L1_error;} return 0; __pyx_L1_error:; return -1; } +static int __Pyx_InitCachedConstants(void) { + __Pyx_RefNannySetupContext("__Pyx_InitCachedConstants"); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":256 + * + * def __init__(self, *args, **kwargs): + * context = kwargs.pop('context', None) # <<<<<<<<<<<<<< + * + * if context is None: + */ + __pyx_k_tuple_2 = PyTuple_New(2); if (unlikely(!__pyx_k_tuple_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 256; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_2)); + __Pyx_INCREF(((PyObject *)__pyx_n_s__context)); + PyTuple_SET_ITEM(__pyx_k_tuple_2, 0, ((PyObject *)__pyx_n_s__context)); + __Pyx_GIVEREF(((PyObject *)__pyx_n_s__context)); + __Pyx_INCREF(Py_None); + PyTuple_SET_ITEM(__pyx_k_tuple_2, 1, Py_None); + __Pyx_GIVEREF(Py_None); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_2)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":459 + * + * if obj is None: + * raise pyamf.ReferenceError('Unknown reference') # <<<<<<<<<<<<<< + * + * if self.use_proxies == 1: + */ + __pyx_k_tuple_5 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 459; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_5)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_4)); + PyTuple_SET_ITEM(__pyx_k_tuple_5, 0, ((PyObject *)__pyx_kp_s_4)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_4)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_5)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":487 + * return obj + * else: + * raise pyamf.DecodeError("Unknown object encoding") # <<<<<<<<<<<<<< + * + * alias.applyAttributes(obj, obj_attrs, codec=self) + */ + __pyx_k_tuple_7 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 487; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_7)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_6)); + PyTuple_SET_ITEM(__pyx_k_tuple_7, 0, ((PyObject *)__pyx_kp_s_6)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_6)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_7)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":592 + * return self.readXML() + * + * raise pyamf.DecodeError("Unsupported ActionScript type") # <<<<<<<<<<<<<< + * + * + */ + __pyx_k_tuple_9 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 592; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_9)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_8)); + PyTuple_SET_ITEM(__pyx_k_tuple_9, 0, ((PyObject *)__pyx_kp_s_8)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_8)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_9)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":602 + * def __init__(self, *args, **kwargs): + * self.use_proxies = kwargs.pop('use_proxies', amf3.use_proxies_default) + * context = kwargs.pop('context', None) # <<<<<<<<<<<<<< + * + * if context is None: + */ + __pyx_k_tuple_10 = PyTuple_New(2); if (unlikely(!__pyx_k_tuple_10)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 602; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_10)); + __Pyx_INCREF(((PyObject *)__pyx_n_s__context)); + PyTuple_SET_ITEM(__pyx_k_tuple_10, 0, ((PyObject *)__pyx_n_s__context)); + __Pyx_GIVEREF(((PyObject *)__pyx_n_s__context)); + __Pyx_INCREF(Py_None); + PyTuple_SET_ITEM(__pyx_k_tuple_10, 1, Py_None); + __Pyx_GIVEREF(Py_None); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_10)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":639 + * l = PyString_GET_SIZE(u) + * else: + * raise TypeError('Expected str or unicode') # <<<<<<<<<<<<<< + * + * if l == 0: + */ + __pyx_k_tuple_12 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 639; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_12)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_11)); + PyTuple_SET_ITEM(__pyx_k_tuple_12, 0, ((PyObject *)__pyx_kp_s_11)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_11)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_12)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":797 + * # for more info + * if '' in n: + * raise pyamf.EncodeError("dicts cannot contain empty string keys") # <<<<<<<<<<<<<< + * + * if self.use_proxies: + */ + __pyx_k_tuple_15 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_15)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 797; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_15)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_14)); + PyTuple_SET_ITEM(__pyx_k_tuple_15, 0, ((PyObject *)__pyx_kp_s_14)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_14)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_15)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":822 + * str_keys.append(x) + * else: + * raise ValueError("Non int/str key value found in dict") # <<<<<<<<<<<<<< + * + * # Make sure the integer keys are within range + */ + __pyx_k_tuple_17 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_17)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 822; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_17)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_16)); + PyTuple_SET_ITEM(__pyx_k_tuple_17, 0, ((PyObject *)__pyx_kp_s_16)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_16)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_17)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":912 + * + * if PyDict_CheckExact(attrs) != 1: + * raise TypeError('Expected dict for encodable attributes') # <<<<<<<<<<<<<< + * + * if definition.attr_len > 0: + */ + __pyx_k_tuple_20 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_20)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 912; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_20)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_19)); + PyTuple_SET_ITEM(__pyx_k_tuple_20, 0, ((PyObject *)__pyx_kp_s_19)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_19)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_20)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":987 + * self.context.addObject(obj) + * + * s = xml.tostring(obj).encode('utf-8') # <<<<<<<<<<<<<< + * + * if not PyString_CheckExact(s): + */ + __pyx_k_tuple_22 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_22)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 987; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_22)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_21)); + PyTuple_SET_ITEM(__pyx_k_tuple_22, 0, ((PyObject *)__pyx_kp_s_21)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_21)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_22)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":990 + * + * if not PyString_CheckExact(s): + * raise TypeError('Expected string from xml serialization') # <<<<<<<<<<<<<< + * + * i = PyString_GET_SIZE(s) + */ + __pyx_k_tuple_24 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_24)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 990; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_24)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_23)); + PyTuple_SET_ITEM(__pyx_k_tuple_24, 0, ((PyObject *)__pyx_kp_s_23)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_23)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_24)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":59 + * cdef object DataInput = amf3.DataInput + * cdef object DataOutput = amf3.DataOutput + * cdef str empty_string = str('') # <<<<<<<<<<<<<< + * cdef unicode empty_unicode = empty_string.decode('utf-8') + * cdef object undefined = pyamf.Undefined + */ + __pyx_k_tuple_26 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_26)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_26)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_13)); + PyTuple_SET_ITEM(__pyx_k_tuple_26, 0, ((PyObject *)__pyx_kp_s_13)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_13)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_26)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":60 + * cdef object DataOutput = amf3.DataOutput + * cdef str empty_string = str('') + * cdef unicode empty_unicode = empty_string.decode('utf-8') # <<<<<<<<<<<<<< + * cdef object undefined = pyamf.Undefined + * + */ + __pyx_k_tuple_27 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_27)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_27)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_21)); + PyTuple_SET_ITEM(__pyx_k_tuple_27, 0, ((PyObject *)__pyx_kp_s_21)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_21)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_27)); + __Pyx_RefNannyFinishContext(); + return 0; + __pyx_L1_error:; + __Pyx_RefNannyFinishContext(); + return -1; +} + static int __Pyx_InitGlobals(void) { if (__Pyx_InitStrings(__pyx_string_tab) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; __pyx_int_0 = PyInt_FromLong(0); if (unlikely(!__pyx_int_0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; @@ -12722,7 +12888,7 @@ PyMODINIT_FUNC PyInit_amf3(void) #endif /*--- Module creation code ---*/ #if PY_MAJOR_VERSION < 3 - __pyx_m = Py_InitModule4(__Pyx_NAMESTR("amf3"), __pyx_methods, __Pyx_DOCSTR(__pyx_k_14), 0, PYTHON_API_VERSION); + __pyx_m = Py_InitModule4(__Pyx_NAMESTR("amf3"), __pyx_methods, __Pyx_DOCSTR(__pyx_k_25), 0, PYTHON_API_VERSION); #else __pyx_m = PyModule_Create(&__pyx_moduledef); #endif @@ -12740,6 +12906,8 @@ PyMODINIT_FUNC PyInit_amf3(void) } /*--- Builtin init code ---*/ if (unlikely(__Pyx_InitCachedBuiltins() < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + /*--- Constants init code ---*/ + if (unlikely(__Pyx_InitCachedConstants() < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /*--- Global init code ---*/ __pyx_v_6cpyamf_4amf3_ByteArrayType = Py_None; Py_INCREF(Py_None); __pyx_v_6cpyamf_4amf3_DataInput = Py_None; Py_INCREF(Py_None); @@ -13223,20 +13391,14 @@ PyMODINIT_FUNC PyInit_amf3(void) * cdef unicode empty_unicode = empty_string.decode('utf-8') * cdef object undefined = pyamf.Undefined */ - __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_Call(((PyObject *)((PyObject*)&PyString_Type)), ((PyObject *)__pyx_k_tuple_26), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_7)); - PyTuple_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_kp_s_7)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_7)); - __pyx_t_4 = PyObject_Call(((PyObject *)((PyObject*)&PyString_Type)), __pyx_t_1, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - if (!(likely(PyString_CheckExact(__pyx_t_4))||((__pyx_t_4) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected str, got %.200s", Py_TYPE(__pyx_t_4)->tp_name), 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(PyString_CheckExact(__pyx_t_1))||((__pyx_t_1) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected str, got %.200s", Py_TYPE(__pyx_t_1)->tp_name), 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_v_6cpyamf_4amf3_empty_string)); __Pyx_DECREF(((PyObject *)__pyx_v_6cpyamf_4amf3_empty_string)); - __Pyx_GIVEREF(__pyx_t_4); - __pyx_v_6cpyamf_4amf3_empty_string = ((PyObject *)__pyx_t_4); - __pyx_t_4 = 0; + __Pyx_GIVEREF(__pyx_t_1); + __pyx_v_6cpyamf_4amf3_empty_string = ((PyObject *)__pyx_t_1); + __pyx_t_1 = 0; /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":60 * cdef object DataOutput = amf3.DataOutput @@ -13245,23 +13407,17 @@ PyMODINIT_FUNC PyInit_amf3(void) * cdef object undefined = pyamf.Undefined * */ - __pyx_t_4 = PyObject_GetAttr(((PyObject *)__pyx_v_6cpyamf_4amf3_empty_string), __pyx_n_s__decode); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); - __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_GetAttr(((PyObject *)__pyx_v_6cpyamf_4amf3_empty_string), __pyx_n_s__decode); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_12)); - PyTuple_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_kp_s_12)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_12)); - __pyx_t_2 = PyObject_Call(__pyx_t_4, __pyx_t_1, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __pyx_t_4 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_k_tuple_27), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - if (!(likely(PyUnicode_CheckExact(__pyx_t_2))||((__pyx_t_2) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected unicode, got %.200s", Py_TYPE(__pyx_t_2)->tp_name), 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(PyUnicode_CheckExact(__pyx_t_4))||((__pyx_t_4) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected unicode, got %.200s", Py_TYPE(__pyx_t_4)->tp_name), 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_v_6cpyamf_4amf3_empty_unicode)); __Pyx_DECREF(((PyObject *)__pyx_v_6cpyamf_4amf3_empty_unicode)); - __Pyx_GIVEREF(__pyx_t_2); - __pyx_v_6cpyamf_4amf3_empty_unicode = ((PyObject *)__pyx_t_2); - __pyx_t_2 = 0; + __Pyx_GIVEREF(__pyx_t_4); + __pyx_v_6cpyamf_4amf3_empty_unicode = ((PyObject *)__pyx_t_4); + __pyx_t_4 = 0; /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/amf3.pyx":61 * cdef str empty_string = str('') @@ -13270,11 +13426,11 @@ PyMODINIT_FUNC PyInit_amf3(void) * * */ - __pyx_t_2 = __Pyx_GetName(__pyx_m, __pyx_n_s__pyamf); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_1 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__Undefined); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_GetName(__pyx_m, __pyx_n_s__pyamf); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_4); + __pyx_t_1 = PyObject_GetAttr(__pyx_t_4, __pyx_n_s__Undefined); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_GOTREF(__pyx_v_6cpyamf_4amf3_undefined); __Pyx_DECREF(__pyx_v_6cpyamf_4amf3_undefined); __Pyx_GIVEREF(__pyx_t_1); @@ -13288,80 +13444,10 @@ PyMODINIT_FUNC PyInit_amf3(void) */ __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_1)); - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__Context); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_4 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__clear); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_4, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_15), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__Context); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_4 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__addString); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_4, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_16), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__Context); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_4 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__getProxyForObject); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_4, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_17), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__Context); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_4 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__getObjectForProxy); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_4, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_18), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__Context); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_4 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__addProxyObject); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_4, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_19), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__Decoder); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_4 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__readString); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_4, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_20), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__Encoder); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_4 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__serialiseString); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_4, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_21), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_s____test__, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0; - /* "/Users/nick/dev/rtmpy/lib/python2.6/site-packages/Cython/Includes/cpython/type.pxd":2 + /* "/Library/Python/2.6/site-packages/Cython/Includes/cpython/type.pxd":2 * * cdef extern from "Python.h": # <<<<<<<<<<<<<< * # The C structure of the objects used to describe built-in types. diff --git a/cpyamf/amf3.pyx b/cpyamf/amf3.pyx index 77924c4a..c7d79b25 100644 --- a/cpyamf/amf3.pyx +++ b/cpyamf/amf3.pyx @@ -781,6 +781,9 @@ cdef class Encoder(codec.Encoder): self.stream.write(&REF_CHAR, 1) for key, value in obj.iteritems(): + if PyInt_Check(key) or PyLong_Check(key): + key = str(key) + self.serialiseString(key) self.writeElement(value) diff --git a/cpyamf/codec.c b/cpyamf/codec.c index 606d32c2..eb305de3 100644 --- a/cpyamf/codec.c +++ b/cpyamf/codec.c @@ -1,4 +1,4 @@ -/* Generated by Cython 0.13 on Tue Oct 19 17:29:38 2010 */ +/* Generated by Cython 0.13 on Thu Nov 25 19:27:12 2010 */ #define PY_SSIZE_T_CLEAN #include "Python.h" @@ -163,6 +163,25 @@ #define __Pyx_PyNumber_InPlaceDivide(x,y) PyNumber_InPlaceDivide(x,y) #endif +#if (PY_MAJOR_VERSION < 3) || (PY_VERSION_HEX >= 0x03010300) + #define __Pyx_PySequence_GetSlice(obj, a, b) PySequence_GetSlice(obj, a, b) + #define __Pyx_PySequence_SetSlice(obj, a, b, value) PySequence_SetSlice(obj, a, b, value) + #define __Pyx_PySequence_DelSlice(obj, a, b) PySequence_DelSlice(obj, a, b) +#else + #define __Pyx_PySequence_GetSlice(obj, a, b) (unlikely(!(obj)) ? \ + (PyErr_SetString(PyExc_SystemError, "null argument to internal routine"), (PyObject*)0) : \ + (likely((obj)->ob_type->tp_as_mapping) ? (PySequence_GetSlice(obj, a, b)) : \ + (PyErr_Format(PyExc_TypeError, "'%.200s' object is unsliceable", (obj)->ob_type->tp_name), (PyObject*)0))) + #define __Pyx_PySequence_SetSlice(obj, a, b, value) (unlikely(!(obj)) ? \ + (PyErr_SetString(PyExc_SystemError, "null argument to internal routine"), -1) : \ + (likely((obj)->ob_type->tp_as_mapping) ? (PySequence_SetSlice(obj, a, b, value)) : \ + (PyErr_Format(PyExc_TypeError, "'%.200s' object doesn't support slice assignment", (obj)->ob_type->tp_name), -1))) + #define __Pyx_PySequence_DelSlice(obj, a, b) (unlikely(!(obj)) ? \ + (PyErr_SetString(PyExc_SystemError, "null argument to internal routine"), -1) : \ + (likely((obj)->ob_type->tp_as_mapping) ? (PySequence_DelSlice(obj, a, b)) : \ + (PyErr_Format(PyExc_TypeError, "'%.200s' object doesn't support slice deletion", (obj)->ob_type->tp_name), -1))) +#endif + #if PY_MAJOR_VERSION >= 3 #define PyMethod_New(func, self, klass) ((self) ? PyMethod_New(func, self) : PyInstanceMethod_New(func)) #endif @@ -720,7 +739,6 @@ static CYTHON_INLINE int __Pyx_CheckKeywordStrings(PyObject *kwdict, static CYTHON_INLINE void __Pyx_RaiseNoneIndexingError(void); - #if PY_MAJOR_VERSION >= 3 static PyObject *__Pyx_PyDict_GetItem(PyObject *d, PyObject* key) { PyObject *value; @@ -763,6 +781,8 @@ static CYTHON_INLINE void __Pyx_ErrFetch(PyObject **type, PyObject **value, PyOb static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb); /*proto*/ +static CYTHON_INLINE PyObject *__Pyx_GetAttr3(PyObject *, PyObject *, PyObject *); /*proto*/ + static CYTHON_INLINE unsigned char __Pyx_PyInt_AsUnsignedChar(PyObject *); static CYTHON_INLINE unsigned short __Pyx_PyInt_AsUnsignedShort(PyObject *); @@ -902,40 +922,29 @@ static PyObject *__pyx_f_6cpyamf_5codec_get_custom_type_func(PyObject *, PyObjec int __pyx_module_is_main_cpyamf__codec = 0; /* Implementation of cpyamf.codec */ -static PyObject *__pyx_builtin_iter; static PyObject *__pyx_builtin_NotImplementedError; static PyObject *__pyx_builtin_KeyError; static PyObject *__pyx_builtin_basestring; static PyObject *__pyx_builtin_IOError; static PyObject *__pyx_builtin_StopIteration; -static PyObject *__pyx_builtin_getattr; static PyObject *__pyx_builtin_AttributeError; static PyObject *__pyx_builtin_IndexError; static PyObject *__pyx_builtin_TypeError; static PyObject *__pyx_builtin_callable; static char __pyx_k_2[] = "_actually_increase_size"; static char __pyx_k_3[] = "utf-8"; -static char __pyx_k_5[] = "Cannot encode modules"; -static char __pyx_k_6[] = "Cannot encode methods"; -static char __pyx_k_7[] = "Cannot encode functions"; -static char __pyx_k_8[] = "Cannot encode class objects"; -static char __pyx_k_9[] = "A datetime.time instance was found but AMF has no way to encode time objects. Please use datetime.datetime instead"; -static char __pyx_k_10[] = "\nC-extension for L{pyamf.amf3} Python module in L{PyAMF}.\n\n@since: 0.4\n"; -static char __pyx_k_11[] = "Context.getClassAlias (line 233)"; -static char __pyx_k_12[] = "Context.getStringForBytes (line 260)"; -static char __pyx_k_13[] = "Context.getBytesForString (line 279)"; -static char __pyx_k_14[] = "Decoder.readElement (line 359)"; -static char __pyx_k_15[] = "Decoder.send (line 384)"; -static char __pyx_k_16[] = "Decoder.__next__ (line 390)"; -static char __pyx_k_17[] = "Encoder.send (line 585)"; -static char __pyx_k_18[] = "Encoder.__next__ (line 591)"; +static char __pyx_k_8[] = "Cannot encode modules"; +static char __pyx_k_10[] = "Cannot encode methods"; +static char __pyx_k_12[] = "Cannot encode functions"; +static char __pyx_k_14[] = "Cannot encode class objects"; +static char __pyx_k_16[] = "A datetime.time instance was found but AMF has no way to encode time objects. Please use datetime.datetime instead"; +static char __pyx_k_19[] = "\nC-extension for L{pyamf.amf3} Python module in L{PyAMF}.\n\n@since: 0.4\n"; static char __pyx_k__o[] = "o"; static char __pyx_k__pop[] = "pop"; static char __pyx_k__xml[] = "xml"; static char __pyx_k___ref[] = "_ref"; static char __pyx_k__data[] = "data"; static char __pyx_k__func[] = "func"; -static char __pyx_k__iter[] = "iter"; static char __pyx_k__next[] = "next"; static char __pyx_k__read[] = "read"; static char __pyx_k__refs[] = "refs"; @@ -961,20 +970,15 @@ static char __pyx_k__is_xml[] = "is_xml"; static char __pyx_k__length[] = "length"; static char __pyx_k__stream[] = "stream"; static char __pyx_k__strict[] = "strict"; -static char __pyx_k__Context[] = "Context"; -static char __pyx_k__Decoder[] = "Decoder"; -static char __pyx_k__Encoder[] = "Encoder"; static char __pyx_k__IOError[] = "IOError"; static char __pyx_k__combine[] = "combine"; static char __pyx_k__context[] = "context"; static char __pyx_k__encoder[] = "encoder"; -static char __pyx_k__getattr[] = "getattr"; static char __pyx_k__objects[] = "objects"; static char __pyx_k__EOStream[] = "EOStream"; static char __pyx_k__KeyError[] = "KeyError"; static char __pyx_k__TYPE_MAP[] = "TYPE_MAP"; static char __pyx_k____main__[] = "__main__"; -static char __pyx_k____next__[] = "__next__"; static char __pyx_k____test__[] = "__test__"; static char __pyx_k___strings[] = "_strings"; static char __pyx_k__callable[] = "callable"; @@ -1039,29 +1043,18 @@ static char __pyx_k__getObjectReference[] = "getObjectReference"; static char __pyx_k__BuiltinFunctionType[] = "BuiltinFunctionType"; static char __pyx_k__NotImplementedError[] = "NotImplementedError"; static char __pyx_k__readConcreteElement[] = "readConcreteElement"; -static PyObject *__pyx_kp_u_11; -static PyObject *__pyx_kp_u_12; -static PyObject *__pyx_kp_u_13; -static PyObject *__pyx_kp_u_14; -static PyObject *__pyx_kp_u_15; -static PyObject *__pyx_kp_u_16; -static PyObject *__pyx_kp_u_17; -static PyObject *__pyx_kp_u_18; +static PyObject *__pyx_kp_s_10; +static PyObject *__pyx_kp_s_12; +static PyObject *__pyx_kp_s_14; +static PyObject *__pyx_kp_s_16; static PyObject *__pyx_n_s_2; static PyObject *__pyx_kp_s_3; -static PyObject *__pyx_kp_s_5; -static PyObject *__pyx_kp_s_6; -static PyObject *__pyx_kp_s_7; static PyObject *__pyx_kp_s_8; -static PyObject *__pyx_kp_s_9; static PyObject *__pyx_n_s__AttributeError; static PyObject *__pyx_n_s__BuiltinFunctionType; static PyObject *__pyx_n_s__ClassAlias; -static PyObject *__pyx_n_s__Context; -static PyObject *__pyx_n_s__Decoder; static PyObject *__pyx_n_s__EOStream; static PyObject *__pyx_n_s__EncodeError; -static PyObject *__pyx_n_s__Encoder; static PyObject *__pyx_n_s__GeneratorType; static PyObject *__pyx_n_s__IOError; static PyObject *__pyx_n_s__IndexError; @@ -1075,7 +1068,6 @@ static PyObject *__pyx_n_s__Undefined; static PyObject *__pyx_n_s__UnknownClassAlias; static PyObject *__pyx_n_s____class__; static PyObject *__pyx_n_s____main__; -static PyObject *__pyx_n_s____next__; static PyObject *__pyx_n_s____test__; static PyObject *__pyx_n_s___clear; static PyObject *__pyx_n_s___increase_size; @@ -1111,11 +1103,9 @@ static PyObject *__pyx_n_s__getReferenceTo; static PyObject *__pyx_n_s__getStringForBytes; static PyObject *__pyx_n_s__get_class_alias; static PyObject *__pyx_n_s__get_class_meta; -static PyObject *__pyx_n_s__getattr; static PyObject *__pyx_n_s__handleBasicTypes; static PyObject *__pyx_n_s__is_proxy; static PyObject *__pyx_n_s__is_xml; -static PyObject *__pyx_n_s__iter; static PyObject *__pyx_n_s__iteritems; static PyObject *__pyx_n_s__length; static PyObject *__pyx_n_s__next; @@ -1166,7 +1156,16 @@ static PyObject *__pyx_n_s__writeXML; static PyObject *__pyx_n_s__xml; static PyObject *__pyx_int_0; static PyObject *__pyx_k_1; -static PyObject *__pyx_k_4; +static PyObject *__pyx_k_6; +static PyObject *__pyx_k_tuple_4; +static PyObject *__pyx_k_tuple_5; +static PyObject *__pyx_k_tuple_7; +static PyObject *__pyx_k_tuple_9; +static PyObject *__pyx_k_tuple_11; +static PyObject *__pyx_k_tuple_13; +static PyObject *__pyx_k_tuple_15; +static PyObject *__pyx_k_tuple_17; +static PyObject *__pyx_k_tuple_18; /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/codec.pyx":45 * """ @@ -1514,7 +1513,7 @@ static int __pyx_f_6cpyamf_5codec_17IndexedCollection__actually_increase_size(s * * if current_size != self.size: */ - __pyx_v_current_size *= 2; + __pyx_v_current_size = (__pyx_v_current_size * 2); } /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/codec.pyx":79 @@ -1860,13 +1859,13 @@ static PyObject *__pyx_f_6cpyamf_5codec_17IndexedCollection_getByReference(stru __pyx_t_2 = PyInt_FromSsize_t(__pyx_v_ref); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 114; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 114; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2); __Pyx_GIVEREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_Call(__pyx_t_1, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 114; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 114; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; __pyx_r = __pyx_t_2; __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; @@ -2068,13 +2067,13 @@ static Py_ssize_t __pyx_f_6cpyamf_5codec_17IndexedCollection_getReferenceTo(str __Pyx_GOTREF(__pyx_t_1); if (!PyCFunction_Check(__pyx_t_1) || (PyCFunction_GET_FUNCTION(__pyx_t_1) != (void *)&__pyx_pf_6cpyamf_5codec_17IndexedCollection_getReferenceTo)) { __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_v_obj); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_obj); __Pyx_GIVEREF(__pyx_v_obj); - __pyx_t_3 = PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __pyx_t_4 = __Pyx_PyIndex_AsSsize_t(__pyx_t_3); if (unlikely((__pyx_t_4 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_r = __pyx_t_4; @@ -2209,13 +2208,13 @@ static Py_ssize_t __pyx_f_6cpyamf_5codec_17IndexedCollection_append(struct __py __Pyx_GOTREF(__pyx_t_1); if (!PyCFunction_Check(__pyx_t_1) || (PyCFunction_GET_FUNCTION(__pyx_t_1) != (void *)&__pyx_pf_6cpyamf_5codec_17IndexedCollection_append)) { __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_v_obj); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_obj); __Pyx_GIVEREF(__pyx_v_obj); - __pyx_t_3 = PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __pyx_t_4 = __Pyx_PyIndex_AsSsize_t(__pyx_t_3); if (unlikely((__pyx_t_4 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_r = __pyx_t_4; @@ -2283,7 +2282,7 @@ static Py_ssize_t __pyx_f_6cpyamf_5codec_17IndexedCollection_append(struct __py * * return self.length - 1 */ - __pyx_v_self->length += 1; + __pyx_v_self->length = (__pyx_v_self->length + 1); /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/codec.pyx":145 * self.length += 1 @@ -2395,7 +2394,7 @@ static PyObject *__pyx_pf_6cpyamf_5codec_17IndexedCollection___iter__(PyObject * PyErr_SetString(PyExc_AttributeError, "'NoneType' object has no attribute 'append'"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 152; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } __pyx_t_3 = (((struct __pyx_obj_6cpyamf_5codec_IndexedCollection *)__pyx_v_self)->data[__pyx_v_idx]); - __pyx_t_4 = PyList_Append(((PyObject *)__pyx_v_x), ((PyObject *)__pyx_t_3)); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 152; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyList_Append(__pyx_v_x, ((PyObject *)__pyx_t_3)); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 152; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/codec.pyx":154 @@ -2615,14 +2614,22 @@ static PyObject *__pyx_pf_6cpyamf_5codec_17IndexedCollection___richcmp__(PyObjec } __pyx_L5:; - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/codec.pyx":180 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/codec.pyx":182 + * if op == 2: # == + * return equal + * elif op == 3: # != # <<<<<<<<<<<<<< + * return not equal + * else: + */ + switch (__pyx_v_op) { + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/codec.pyx":180 * break * * if op == 2: # == # <<<<<<<<<<<<<< * return equal * elif op == 3: # != */ - switch (__pyx_v_op) { case 2: /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/codec.pyx":181 @@ -2758,13 +2765,13 @@ static PyObject *__pyx_pf_6cpyamf_5codec_17IndexedCollection___copy__(PyObject * __pyx_t_1 = __Pyx_PyBool_FromLong(((struct __pyx_obj_6cpyamf_5codec_IndexedCollection *)__pyx_v_self)->use_hash); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1); __Pyx_GIVEREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_6cpyamf_5codec_IndexedCollection)), __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_6cpyamf_5codec_IndexedCollection)), ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __pyx_v_n = ((struct __pyx_obj_6cpyamf_5codec_IndexedCollection *)__pyx_t_1); __pyx_t_1 = 0; @@ -3117,13 +3124,13 @@ static CYTHON_INLINE PyObject *__pyx_f_6cpyamf_5codec_7Context_getObject(struct __pyx_t_2 = PyInt_FromSsize_t(__pyx_v_ref); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 224; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 224; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2); __Pyx_GIVEREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_Call(__pyx_t_1, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 224; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 224; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; __pyx_r = __pyx_t_2; __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; @@ -3226,13 +3233,13 @@ static CYTHON_INLINE Py_ssize_t __pyx_f_6cpyamf_5codec_7Context_getObjectReferen __Pyx_GOTREF(__pyx_t_1); if (!PyCFunction_Check(__pyx_t_1) || (PyCFunction_GET_FUNCTION(__pyx_t_1) != (void *)&__pyx_pf_6cpyamf_5codec_7Context_getObjectReference)) { __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 227; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_v_obj); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_obj); __Pyx_GIVEREF(__pyx_v_obj); - __pyx_t_3 = PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 227; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 227; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __pyx_t_4 = __Pyx_PyIndex_AsSsize_t(__pyx_t_3); if (unlikely((__pyx_t_4 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 227; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_r = __pyx_t_4; @@ -3324,13 +3331,13 @@ static CYTHON_INLINE Py_ssize_t __pyx_f_6cpyamf_5codec_7Context_addObject(struct __Pyx_GOTREF(__pyx_t_1); if (!PyCFunction_Check(__pyx_t_1) || (PyCFunction_GET_FUNCTION(__pyx_t_1) != (void *)&__pyx_pf_6cpyamf_5codec_7Context_addObject)) { __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 230; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_v_obj); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_obj); __Pyx_GIVEREF(__pyx_v_obj); - __pyx_t_3 = PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 230; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 230; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __pyx_t_4 = __Pyx_PyIndex_AsSsize_t(__pyx_t_3); if (unlikely((__pyx_t_4 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 230; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_r = __pyx_t_4; @@ -3431,13 +3438,13 @@ static PyObject *__pyx_f_6cpyamf_5codec_7Context_getClassAlias(struct __pyx_obj if (!PyCFunction_Check(__pyx_t_1) || (PyCFunction_GET_FUNCTION(__pyx_t_1) != (void *)&__pyx_pf_6cpyamf_5codec_7Context_getClassAlias)) { __Pyx_XDECREF(__pyx_r); __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 233; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_v_klass); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_klass); __Pyx_GIVEREF(__pyx_v_klass); - __pyx_t_3 = PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 233; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 233; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __pyx_r = __pyx_t_3; __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; @@ -3543,14 +3550,14 @@ static PyObject *__pyx_f_6cpyamf_5codec_7Context_getClassAlias(struct __pyx_obj __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 246; __pyx_clineno = __LINE__; goto __pyx_L11_error;} - __Pyx_GOTREF(__pyx_t_1); + __Pyx_GOTREF(((PyObject *)__pyx_t_1)); __Pyx_INCREF(__pyx_v_klass); PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_klass); __Pyx_GIVEREF(__pyx_v_klass); - __pyx_t_2 = PyObject_Call(__pyx_t_3, __pyx_t_1, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 246; __pyx_clineno = __LINE__; goto __pyx_L11_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 246; __pyx_clineno = __LINE__; goto __pyx_L11_error;} __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_v_alias); __pyx_v_alias = __pyx_t_2; __pyx_t_2 = 0; @@ -3625,14 +3632,14 @@ static PyObject *__pyx_f_6cpyamf_5codec_7Context_getClassAlias(struct __pyx_obj __Pyx_GOTREF(__pyx_t_7); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 252; __pyx_clineno = __LINE__; goto __pyx_L13_except_error;} - __Pyx_GOTREF(__pyx_t_6); + __Pyx_GOTREF(((PyObject *)__pyx_t_6)); __Pyx_INCREF(__pyx_v_klass); PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_v_klass); __Pyx_GIVEREF(__pyx_v_klass); - __pyx_t_8 = PyObject_Call(__pyx_t_7, __pyx_t_6, NULL); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 252; __pyx_clineno = __LINE__; goto __pyx_L13_except_error;} + __pyx_t_8 = PyObject_Call(__pyx_t_7, ((PyObject *)__pyx_t_6), NULL); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 252; __pyx_clineno = __LINE__; goto __pyx_L13_except_error;} __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_6)); __pyx_t_6 = 0; __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_8); if (unlikely(__pyx_t_5 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 252; __pyx_clineno = __LINE__; goto __pyx_L13_except_error;} if (!__pyx_t_5) { __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; @@ -3664,14 +3671,14 @@ static PyObject *__pyx_f_6cpyamf_5codec_7Context_getClassAlias(struct __pyx_obj __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 253; __pyx_clineno = __LINE__; goto __pyx_L13_except_error;} - __Pyx_GOTREF(__pyx_t_6); + __Pyx_GOTREF(((PyObject *)__pyx_t_6)); __Pyx_INCREF(__pyx_v_klass); PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_v_klass); __Pyx_GIVEREF(__pyx_v_klass); - __pyx_t_7 = PyObject_Call(__pyx_t_8, __pyx_t_6, NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 253; __pyx_clineno = __LINE__; goto __pyx_L13_except_error;} + __pyx_t_7 = PyObject_Call(__pyx_t_8, ((PyObject *)__pyx_t_6), NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 253; __pyx_clineno = __LINE__; goto __pyx_L13_except_error;} __Pyx_GOTREF(__pyx_t_7); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_6)); __pyx_t_6 = 0; __Pyx_DECREF(__pyx_v_meta); __pyx_v_meta = __pyx_t_7; __pyx_t_7 = 0; @@ -3684,7 +3691,7 @@ static PyObject *__pyx_f_6cpyamf_5codec_7Context_getClassAlias(struct __pyx_obj * self.class_aliases[klass] = alias */ __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 254; __pyx_clineno = __LINE__; goto __pyx_L13_except_error;} - __Pyx_GOTREF(__pyx_t_7); + __Pyx_GOTREF(((PyObject *)__pyx_t_7)); __Pyx_INCREF(__pyx_v_klass); PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_v_klass); __Pyx_GIVEREF(__pyx_v_klass); @@ -3695,9 +3702,9 @@ static PyObject *__pyx_f_6cpyamf_5codec_7Context_getClassAlias(struct __pyx_obj if (PyDict_SetItem(__pyx_t_6, ((PyObject *)__pyx_n_s__defer), __pyx_t_8) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 254; __pyx_clineno = __LINE__; goto __pyx_L13_except_error;} __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; if (PyDict_Update(((PyObject *)__pyx_t_6), __pyx_v_meta) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 254; __pyx_clineno = __LINE__; goto __pyx_L13_except_error;} - __pyx_t_8 = PyEval_CallObjectWithKeywords(__pyx_v_alias, __pyx_t_7, ((PyObject *)__pyx_t_6)); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 254; __pyx_clineno = __LINE__; goto __pyx_L13_except_error;} + __pyx_t_8 = PyEval_CallObjectWithKeywords(__pyx_v_alias, ((PyObject *)__pyx_t_7), ((PyObject *)__pyx_t_6)); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 254; __pyx_clineno = __LINE__; goto __pyx_L13_except_error;} __Pyx_GOTREF(__pyx_t_8); - __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_7)); __pyx_t_7 = 0; __Pyx_DECREF(((PyObject *)__pyx_t_6)); __pyx_t_6 = 0; __Pyx_DECREF(__pyx_v_alias); __pyx_v_alias = __pyx_t_8; @@ -3821,13 +3828,13 @@ static PyObject *__pyx_f_6cpyamf_5codec_7Context_getStringForBytes(struct __pyx if (!PyCFunction_Check(__pyx_t_1) || (PyCFunction_GET_FUNCTION(__pyx_t_1) != (void *)&__pyx_pf_6cpyamf_5codec_7Context_getStringForBytes)) { __Pyx_XDECREF(((PyObject *)__pyx_r)); __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 260; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_v_s); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_s); __Pyx_GIVEREF(__pyx_v_s); - __pyx_t_3 = PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 260; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 260; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; if (!(likely(PyUnicode_CheckExact(__pyx_t_3))||((__pyx_t_3) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected unicode, got %.200s", Py_TYPE(__pyx_t_3)->tp_name), 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 260; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = ((PyObject *)__pyx_t_3); __pyx_t_3 = 0; @@ -3887,18 +3894,12 @@ static PyObject *__pyx_f_6cpyamf_5codec_7Context_getStringForBytes(struct __pyx */ __pyx_t_1 = PyObject_GetAttr(__pyx_v_s, __pyx_n_s__decode); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 272; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 272; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_k_tuple_4), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 272; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_3)); - PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_kp_s_3)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_3)); - __pyx_t_2 = PyObject_Call(__pyx_t_1, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 272; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - if (!(likely(PyUnicode_CheckExact(__pyx_t_2))||((__pyx_t_2) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected unicode, got %.200s", Py_TYPE(__pyx_t_2)->tp_name), 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 272; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_v_u = ((PyObject *)__pyx_t_2); - __pyx_t_2 = 0; + if (!(likely(PyUnicode_CheckExact(__pyx_t_3))||((__pyx_t_3) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected unicode, got %.200s", Py_TYPE(__pyx_t_3)->tp_name), 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 272; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_v_u = ((PyObject *)__pyx_t_3); + __pyx_t_3 = 0; /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/codec.pyx":274 * cdef unicode u = s.decode('utf-8') @@ -4006,13 +4007,13 @@ static PyObject *__pyx_f_6cpyamf_5codec_7Context_getBytesForString(struct __pyx if (!PyCFunction_Check(__pyx_t_1) || (PyCFunction_GET_FUNCTION(__pyx_t_1) != (void *)&__pyx_pf_6cpyamf_5codec_7Context_getBytesForString)) { __Pyx_XDECREF(((PyObject *)__pyx_r)); __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 279; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_v_u); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_u); __Pyx_GIVEREF(__pyx_v_u); - __pyx_t_3 = PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 279; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 279; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; if (!(likely(PyString_CheckExact(__pyx_t_3))||((__pyx_t_3) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected str, got %.200s", Py_TYPE(__pyx_t_3)->tp_name), 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 279; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = ((PyObject *)__pyx_t_3); __pyx_t_3 = 0; @@ -4072,18 +4073,12 @@ static PyObject *__pyx_f_6cpyamf_5codec_7Context_getBytesForString(struct __pyx */ __pyx_t_1 = PyObject_GetAttr(__pyx_v_u, __pyx_n_s__encode); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 291; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 291; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_k_tuple_5), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 291; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_3)); - PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_kp_s_3)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_3)); - __pyx_t_2 = PyObject_Call(__pyx_t_1, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 291; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - if (!(likely(PyString_CheckExact(__pyx_t_2))||((__pyx_t_2) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected str, got %.200s", Py_TYPE(__pyx_t_2)->tp_name), 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 291; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_v_s = ((PyObject *)__pyx_t_2); - __pyx_t_2 = 0; + if (!(likely(PyString_CheckExact(__pyx_t_3))||((__pyx_t_3) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected str, got %.200s", Py_TYPE(__pyx_t_3)->tp_name), 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 291; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_v_s = ((PyObject *)__pyx_t_3); + __pyx_t_3 = 0; /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/codec.pyx":293 * cdef str s = u.encode('utf-8') @@ -4293,13 +4288,13 @@ static int __pyx_pf_6cpyamf_5codec_5Codec_6stream___set__(PyObject *__pyx_v_self * self.stream = value */ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 311; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); __Pyx_INCREF(__pyx_v_value); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_value); __Pyx_GIVEREF(__pyx_v_value); - __pyx_t_4 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_6cpyamf_4util_BufferedByteStream)), __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 311; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_6cpyamf_4util_BufferedByteStream)), ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 311; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_v_value); __pyx_v_value = __pyx_t_4; __pyx_t_4 = 0; @@ -4413,7 +4408,7 @@ static int __pyx_pf_6cpyamf_5codec_5Codec___init__(PyObject *__pyx_v_self, PyObj Py_ssize_t kw_args = PyDict_Size(__pyx_kwds); PyObject* values[3] = {0,0,0}; values[0] = ((PyObject *)Py_None); - values[1] = __pyx_k_4; + values[1] = __pyx_k_6; values[2] = ((PyObject *)Py_None); switch (PyTuple_GET_SIZE(__pyx_args)) { case 3: values[2] = PyTuple_GET_ITEM(__pyx_args, 2); @@ -4447,7 +4442,7 @@ static int __pyx_pf_6cpyamf_5codec_5Codec___init__(PyObject *__pyx_v_self, PyObj __pyx_v_timezone_offset = values[2]; } else { __pyx_v_stream = ((PyObject *)Py_None); - __pyx_v_strict = __pyx_k_4; + __pyx_v_strict = __pyx_k_6; __pyx_v_timezone_offset = ((PyObject *)Py_None); switch (PyTuple_GET_SIZE(__pyx_args)) { case 3: __pyx_v_timezone_offset = PyTuple_GET_ITEM(__pyx_args, 2); @@ -4486,13 +4481,13 @@ static int __pyx_pf_6cpyamf_5codec_5Codec___init__(PyObject *__pyx_v_self, PyObj * self.stream = stream */ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 322; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); __Pyx_INCREF(__pyx_v_stream); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_stream); __Pyx_GIVEREF(__pyx_v_stream); - __pyx_t_4 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_6cpyamf_4util_BufferedByteStream)), __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 322; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_6cpyamf_4util_BufferedByteStream)), ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 322; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_v_stream); __pyx_v_stream = __pyx_t_4; __pyx_t_4 = 0; @@ -5258,13 +5253,13 @@ static int __pyx_f_6cpyamf_5codec_7Decoder_send(struct __pyx_obj_6cpyamf_5codec __Pyx_GOTREF(__pyx_t_1); if (!PyCFunction_Check(__pyx_t_1) || (PyCFunction_GET_FUNCTION(__pyx_t_1) != (void *)&__pyx_pf_6cpyamf_5codec_7Decoder_send)) { __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 384; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_v_data); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_data); __Pyx_GIVEREF(__pyx_v_data); - __pyx_t_3 = PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 384; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 384; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __pyx_t_4 = __Pyx_PyInt_AsInt(__pyx_t_3); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 384; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_r = __pyx_t_4; @@ -5586,13 +5581,13 @@ static int __pyx_f_6cpyamf_5codec_7Encoder_serialiseString(struct __pyx_obj_6cp __Pyx_GOTREF(__pyx_t_1); if (!PyCFunction_Check(__pyx_t_1) || (PyCFunction_GET_FUNCTION(__pyx_t_1) != (void *)&__pyx_pf_6cpyamf_5codec_7Encoder_serialiseString)) { __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 414; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_v_u); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_u); __Pyx_GIVEREF(__pyx_v_u); - __pyx_t_3 = PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 414; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 414; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __pyx_t_4 = __Pyx_PyInt_AsInt(__pyx_t_3); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 414; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_r = __pyx_t_4; @@ -5994,8 +5989,7 @@ static int __pyx_f_6cpyamf_5codec_7Encoder_writeDate(struct __pyx_obj_6cpyamf_5 PyObject *__pyx_t_1 = NULL; PyObject *__pyx_t_2 = NULL; PyObject *__pyx_t_3 = NULL; - PyObject *__pyx_t_4 = NULL; - int __pyx_t_5; + int __pyx_t_4; __Pyx_RefNannySetupContext("writeDate"); __Pyx_INCREF(__pyx_v_o); @@ -6019,39 +6013,24 @@ static int __pyx_f_6cpyamf_5codec_7Encoder_writeDate(struct __pyx_obj_6cpyamf_5 __pyx_t_3 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__time); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 448; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyTuple_New(4); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 448; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_k_tuple_7), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 448; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_INCREF(__pyx_int_0); - PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_int_0); - __Pyx_GIVEREF(__pyx_int_0); - __Pyx_INCREF(__pyx_int_0); - PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_int_0); - __Pyx_GIVEREF(__pyx_int_0); - __Pyx_INCREF(__pyx_int_0); - PyTuple_SET_ITEM(__pyx_t_2, 2, __pyx_int_0); - __Pyx_GIVEREF(__pyx_int_0); - __Pyx_INCREF(__pyx_int_0); - PyTuple_SET_ITEM(__pyx_t_2, 3, __pyx_int_0); - __Pyx_GIVEREF(__pyx_int_0); - __pyx_t_4 = PyObject_Call(__pyx_t_3, __pyx_t_2, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 448; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 448; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 448; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); __Pyx_INCREF(__pyx_v_o); - PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_o); + PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_o); __Pyx_GIVEREF(__pyx_v_o); - PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_4); - __Pyx_GIVEREF(__pyx_t_4); - __pyx_t_4 = 0; - __pyx_t_4 = PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 448; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); + PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_2); + __Pyx_GIVEREF(__pyx_t_2); + __pyx_t_2 = 0; + __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 448; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_v_o); - __pyx_v_o = __pyx_t_4; - __pyx_t_4 = 0; + __pyx_v_o = __pyx_t_2; + __pyx_t_2 = 0; /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/codec.pyx":450 * o = datetime.datetime.combine(o, datetime.time(0, 0, 0, 0)) @@ -6060,7 +6039,7 @@ static int __pyx_f_6cpyamf_5codec_7Encoder_writeDate(struct __pyx_obj_6cpyamf_5 * * cdef int writeXML(self, object o) except -1: */ - __pyx_t_5 = ((struct __pyx_vtabstruct_6cpyamf_5codec_Encoder *)__pyx_v_self->__pyx_vtab)->writeDateTime(__pyx_v_self, __pyx_v_o); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 450; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_5codec_Encoder *)__pyx_v_self->__pyx_vtab)->writeDateTime(__pyx_v_self, __pyx_v_o); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 450; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = 0; goto __pyx_L0; @@ -6068,7 +6047,6 @@ static int __pyx_f_6cpyamf_5codec_7Encoder_writeDate(struct __pyx_obj_6cpyamf_5 __Pyx_XDECREF(__pyx_t_1); __Pyx_XDECREF(__pyx_t_2); __Pyx_XDECREF(__pyx_t_3); - __Pyx_XDECREF(__pyx_t_4); __Pyx_AddTraceback("cpyamf.codec.Encoder.writeDate"); __pyx_r = -1; __pyx_L0:; @@ -6141,16 +6119,16 @@ static int __pyx_f_6cpyamf_5codec_7Encoder_writeList(struct __pyx_obj_6cpyamf_5 __pyx_t_2 = __Pyx_PyBool_FromLong(__pyx_v_is_proxy); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 455; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 455; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); __Pyx_INCREF(__pyx_v_o); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_o); __Pyx_GIVEREF(__pyx_v_o); PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_2); __Pyx_GIVEREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_Call(__pyx_t_1, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 455; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 455; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; __pyx_t_4 = __Pyx_PyInt_AsInt(__pyx_t_2); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 455; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_r = __pyx_t_4; @@ -6522,14 +6500,14 @@ static int __pyx_f_6cpyamf_5codec_7Encoder_writeSequence(struct __pyx_obj_6cpya __pyx_t_1 = PyObject_GetAttr(__pyx_v_iterable, __pyx_n_s____class__); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 478; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __Pyx_GOTREF(__pyx_t_1); __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 478; __pyx_clineno = __LINE__; goto __pyx_L3_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1); __Pyx_GIVEREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = PyObject_Call(__pyx_t_2, __pyx_t_3, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 478; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_t_1 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 478; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_v_alias); __pyx_v_alias = __pyx_t_1; __pyx_t_1 = 0; @@ -6625,7 +6603,7 @@ static int __pyx_f_6cpyamf_5codec_7Encoder_writeSequence(struct __pyx_obj_6cpya if (unlikely(__pyx_v_self->use_write_object == Py_None)) { PyErr_SetString(PyExc_AttributeError, "'NoneType' object has no attribute 'append'"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 485; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } - __pyx_t_4 = PyList_Append(((PyObject *)__pyx_v_self->use_write_object), ((PyObject *)Py_TYPE(__pyx_v_iterable))); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 485; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyList_Append(__pyx_v_self->use_write_object, ((PyObject *)Py_TYPE(__pyx_v_iterable))); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 485; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/codec.pyx":487 * self.use_write_object.append(type(iterable)) @@ -6698,16 +6676,16 @@ static int __pyx_f_6cpyamf_5codec_7Encoder_writeObject(struct __pyx_obj_6cpyamf __pyx_t_2 = __Pyx_PyBool_FromLong(__pyx_v_is_proxy); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 491; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 491; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); __Pyx_INCREF(__pyx_v_o); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_o); __Pyx_GIVEREF(__pyx_v_o); PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_2); __Pyx_GIVEREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_Call(__pyx_t_1, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 491; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 491; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; __pyx_t_4 = __Pyx_PyInt_AsInt(__pyx_t_2); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 491; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_r = __pyx_t_4; @@ -7284,14 +7262,14 @@ static CYTHON_INLINE int __pyx_f_6cpyamf_5codec_7Encoder_handleBasicTypes(struct __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 537; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); __Pyx_INCREF(__pyx_v_element); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_element); __Pyx_GIVEREF(__pyx_v_element); - __pyx_t_7 = PyObject_Call(__pyx_t_6, __pyx_t_3, NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 537; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyObject_Call(__pyx_t_6, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 537; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_7); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_7); if (unlikely(__pyx_t_5 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 537; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; if (__pyx_t_5) { @@ -7345,10 +7323,9 @@ static int __pyx_f_6cpyamf_5codec_7Encoder_checkBadTypes(struct __pyx_obj_6cpya int __pyx_t_1; PyObject *__pyx_t_2 = NULL; PyObject *__pyx_t_3 = NULL; - PyObject *__pyx_t_4 = NULL; + int __pyx_t_4; int __pyx_t_5; int __pyx_t_6; - int __pyx_t_7; __Pyx_RefNannySetupContext("checkBadTypes"); /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/codec.pyx":543 @@ -7373,17 +7350,11 @@ static int __pyx_f_6cpyamf_5codec_7Encoder_checkBadTypes(struct __pyx_obj_6cpya __pyx_t_3 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__EncodeError); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 544; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 544; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_k_tuple_9), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 544; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_5)); - PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_kp_s_5)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_5)); - __pyx_t_4 = PyObject_Call(__pyx_t_3, __pyx_t_2, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 544; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_Raise(__pyx_t_2, 0, 0); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __Pyx_Raise(__pyx_t_4, 0, 0); - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; {__pyx_filename = __pyx_f[0]; __pyx_lineno = 544; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L3; } @@ -7405,22 +7376,16 @@ static int __pyx_f_6cpyamf_5codec_7Encoder_checkBadTypes(struct __pyx_obj_6cpya * elif PyFunction_Check(element) or py_type is BuiltinFunctionType: * raise pyamf.EncodeError("Cannot encode functions") */ - __pyx_t_4 = __Pyx_GetName(__pyx_m, __pyx_n_s__pyamf); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 546; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); - __pyx_t_2 = PyObject_GetAttr(__pyx_t_4, __pyx_n_s__EncodeError); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 546; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetName(__pyx_m, __pyx_n_s__pyamf); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 546; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 546; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_6)); - PyTuple_SET_ITEM(__pyx_t_4, 0, ((PyObject *)__pyx_kp_s_6)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_6)); - __pyx_t_3 = PyObject_Call(__pyx_t_2, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 546; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__EncodeError); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 546; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __Pyx_Raise(__pyx_t_3, 0, 0); + __pyx_t_2 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_k_tuple_11), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 546; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_Raise(__pyx_t_2, 0, 0); + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; {__pyx_filename = __pyx_f[0]; __pyx_lineno = 546; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L3; } @@ -7434,12 +7399,12 @@ static int __pyx_f_6cpyamf_5codec_7Encoder_checkBadTypes(struct __pyx_obj_6cpya */ __pyx_t_1 = PyFunction_Check(__pyx_v_element); if (!__pyx_t_1) { - __pyx_t_5 = (__pyx_v_py_type == __pyx_v_6cpyamf_5codec_BuiltinFunctionType); - __pyx_t_6 = __pyx_t_5; + __pyx_t_4 = (__pyx_v_py_type == __pyx_v_6cpyamf_5codec_BuiltinFunctionType); + __pyx_t_5 = __pyx_t_4; } else { - __pyx_t_6 = __pyx_t_1; + __pyx_t_5 = __pyx_t_1; } - if (__pyx_t_6) { + if (__pyx_t_5) { /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/codec.pyx":548 * raise pyamf.EncodeError("Cannot encode methods") @@ -7448,19 +7413,13 @@ static int __pyx_f_6cpyamf_5codec_7Encoder_checkBadTypes(struct __pyx_obj_6cpya * elif PyClass_Check(element) or PyType_CheckExact(element): * raise pyamf.EncodeError("Cannot encode class objects") */ - __pyx_t_3 = __Pyx_GetName(__pyx_m, __pyx_n_s__pyamf); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 548; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); - __pyx_t_4 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s__EncodeError); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 548; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 548; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetName(__pyx_m, __pyx_n_s__pyamf); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 548; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_2); + __pyx_t_3 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__EncodeError); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 548; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_7)); - PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_kp_s_7)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_7)); - __pyx_t_2 = PyObject_Call(__pyx_t_4, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 548; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __pyx_t_2 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_k_tuple_13), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 548; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_Raise(__pyx_t_2, 0, 0); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; @@ -7475,14 +7434,14 @@ static int __pyx_f_6cpyamf_5codec_7Encoder_checkBadTypes(struct __pyx_obj_6cpya * raise pyamf.EncodeError("Cannot encode class objects") * elif PyTime_CheckExact(element): */ - __pyx_t_6 = PyClass_Check(__pyx_v_element); - if (!__pyx_t_6) { + __pyx_t_5 = PyClass_Check(__pyx_v_element); + if (!__pyx_t_5) { __pyx_t_1 = PyType_CheckExact(__pyx_v_element); - __pyx_t_5 = __pyx_t_1; + __pyx_t_4 = __pyx_t_1; } else { - __pyx_t_5 = __pyx_t_6; + __pyx_t_4 = __pyx_t_5; } - if (__pyx_t_5) { + if (__pyx_t_4) { /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/codec.pyx":550 * raise pyamf.EncodeError("Cannot encode functions") @@ -7496,17 +7455,11 @@ static int __pyx_f_6cpyamf_5codec_7Encoder_checkBadTypes(struct __pyx_obj_6cpya __pyx_t_3 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__EncodeError); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 550; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 550; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_k_tuple_15), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 550; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_8)); - PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_kp_s_8)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_8)); - __pyx_t_4 = PyObject_Call(__pyx_t_3, __pyx_t_2, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 550; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_Raise(__pyx_t_2, 0, 0); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __Pyx_Raise(__pyx_t_4, 0, 0); - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; {__pyx_filename = __pyx_f[0]; __pyx_lineno = 550; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L3; } @@ -7518,8 +7471,8 @@ static int __pyx_f_6cpyamf_5codec_7Encoder_checkBadTypes(struct __pyx_obj_6cpya * raise pyamf.EncodeError('A datetime.time instance was found but ' * 'AMF has no way to encode time objects. Please use ' */ - __pyx_t_7 = PyTime_CheckExact(__pyx_v_element); - if (__pyx_t_7) { + __pyx_t_6 = PyTime_CheckExact(__pyx_v_element); + if (__pyx_t_6) { /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/codec.pyx":552 * raise pyamf.EncodeError("Cannot encode class objects") @@ -7528,22 +7481,16 @@ static int __pyx_f_6cpyamf_5codec_7Encoder_checkBadTypes(struct __pyx_obj_6cpya * 'AMF has no way to encode time objects. Please use ' * 'datetime.datetime instead') */ - __pyx_t_4 = __Pyx_GetName(__pyx_m, __pyx_n_s__pyamf); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 552; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); - __pyx_t_2 = PyObject_GetAttr(__pyx_t_4, __pyx_n_s__EncodeError); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 552; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetName(__pyx_m, __pyx_n_s__pyamf); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 552; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 552; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_9)); - PyTuple_SET_ITEM(__pyx_t_4, 0, ((PyObject *)__pyx_kp_s_9)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_9)); - __pyx_t_3 = PyObject_Call(__pyx_t_2, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 552; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__EncodeError); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 552; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __Pyx_Raise(__pyx_t_3, 0, 0); + __pyx_t_2 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_k_tuple_17), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 552; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_Raise(__pyx_t_2, 0, 0); + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; {__pyx_filename = __pyx_f[0]; __pyx_lineno = 552; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L3; } @@ -7564,7 +7511,6 @@ static int __pyx_f_6cpyamf_5codec_7Encoder_checkBadTypes(struct __pyx_obj_6cpya __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_2); __Pyx_XDECREF(__pyx_t_3); - __Pyx_XDECREF(__pyx_t_4); __Pyx_AddTraceback("cpyamf.codec.Encoder.checkBadTypes"); __pyx_r = -1; __pyx_L0:; @@ -7600,13 +7546,13 @@ static int __pyx_f_6cpyamf_5codec_7Encoder_writeElement(struct __pyx_obj_6cpyam __Pyx_GOTREF(__pyx_t_1); if (!PyCFunction_Check(__pyx_t_1) || (PyCFunction_GET_FUNCTION(__pyx_t_1) != (void *)&__pyx_pf_6cpyamf_5codec_7Encoder_writeElement)) { __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 558; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_v_element); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_element); __Pyx_GIVEREF(__pyx_v_element); - __pyx_t_3 = PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 558; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 558; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __pyx_t_4 = __Pyx_PyInt_AsInt(__pyx_t_3); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 558; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_r = __pyx_t_4; @@ -7733,7 +7679,7 @@ static int __pyx_f_6cpyamf_5codec_7Encoder_writeElement(struct __pyx_obj_6cpyam if (unlikely(__pyx_v_self->use_write_object == Py_None)) { PyErr_SetString(PyExc_AttributeError, "'NoneType' object has no attribute 'append'"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 575; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } - __pyx_t_4 = PyList_Append(((PyObject *)__pyx_v_self->use_write_object), __pyx_v_py_type); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 575; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyList_Append(__pyx_v_self->use_write_object, __pyx_v_py_type); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 575; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/codec.pyx":577 * self.use_write_object.append(py_type) @@ -7769,13 +7715,13 @@ static int __pyx_f_6cpyamf_5codec_7Encoder_writeElement(struct __pyx_obj_6cpyam * return ret */ __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 581; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); + __Pyx_GOTREF(((PyObject *)__pyx_t_1)); __Pyx_INCREF(__pyx_v_element); PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_element); __Pyx_GIVEREF(__pyx_v_element); - __pyx_t_3 = PyObject_Call(__pyx_v_func, __pyx_t_1, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 581; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_v_func, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 581; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; goto __pyx_L3; } @@ -7864,13 +7810,13 @@ static int __pyx_f_6cpyamf_5codec_7Encoder_send(struct __pyx_obj_6cpyamf_5codec __Pyx_GOTREF(__pyx_t_1); if (!PyCFunction_Check(__pyx_t_1) || (PyCFunction_GET_FUNCTION(__pyx_t_1) != (void *)&__pyx_pf_6cpyamf_5codec_7Encoder_send)) { __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 585; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_v_data); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_data); __Pyx_GIVEREF(__pyx_v_data); - __pyx_t_3 = PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 585; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 585; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __pyx_t_4 = __Pyx_PyInt_AsInt(__pyx_t_3); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 585; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_r = __pyx_t_4; @@ -7890,7 +7836,7 @@ static int __pyx_f_6cpyamf_5codec_7Encoder_send(struct __pyx_obj_6cpyamf_5codec if (unlikely(__pyx_v_self->bucket == Py_None)) { PyErr_SetString(PyExc_AttributeError, "'NoneType' object has no attribute 'append'"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 589; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } - __pyx_t_4 = PyList_Append(((PyObject *)__pyx_v_self->bucket), __pyx_v_data); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 589; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyList_Append(__pyx_v_self->bucket, __pyx_v_data); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 589; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = 0; goto __pyx_L0; @@ -7959,8 +7905,8 @@ static PyObject *__pyx_pf_6cpyamf_5codec_7Encoder___next__(PyObject *__pyx_v_sel PyObject *__pyx_r = NULL; PyObject *__pyx_t_1 = NULL; PyObject *__pyx_t_2 = NULL; - PyObject *__pyx_t_3 = NULL; - int __pyx_t_4; + int __pyx_t_3; + PyObject *__pyx_t_4 = NULL; Py_ssize_t __pyx_t_5; __Pyx_RefNannySetupContext("__next__"); __pyx_v_element = Py_None; __Pyx_INCREF(Py_None); @@ -7989,18 +7935,12 @@ static PyObject *__pyx_pf_6cpyamf_5codec_7Encoder___next__(PyObject *__pyx_v_sel */ __pyx_t_1 = PyObject_GetAttr(((PyObject *)((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self)->bucket), __pyx_n_s__pop); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 599; __pyx_clineno = __LINE__; goto __pyx_L5_error;} __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 599; __pyx_clineno = __LINE__; goto __pyx_L5_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_k_tuple_18), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 599; __pyx_clineno = __LINE__; goto __pyx_L5_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_INCREF(__pyx_int_0); - PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_int_0); - __Pyx_GIVEREF(__pyx_int_0); - __pyx_t_3 = PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 599; __pyx_clineno = __LINE__; goto __pyx_L5_error;} - __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_v_element); - __pyx_v_element = __pyx_t_3; - __pyx_t_3 = 0; + __pyx_v_element = __pyx_t_2; + __pyx_t_2 = 0; } __Pyx_XDECREF(__pyx_save_exc_type); __pyx_save_exc_type = 0; __Pyx_XDECREF(__pyx_save_exc_value); __pyx_save_exc_value = 0; @@ -8009,7 +7949,6 @@ static PyObject *__pyx_pf_6cpyamf_5codec_7Encoder___next__(PyObject *__pyx_v_sel __pyx_L5_error:; __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/codec.pyx":600 * try: @@ -8018,13 +7957,13 @@ static PyObject *__pyx_pf_6cpyamf_5codec_7Encoder___next__(PyObject *__pyx_v_sel * raise StopIteration * */ - __pyx_t_4 = PyErr_ExceptionMatches(__pyx_builtin_IndexError); - if (__pyx_t_4) { + __pyx_t_3 = PyErr_ExceptionMatches(__pyx_builtin_IndexError); + if (__pyx_t_3) { __Pyx_AddTraceback("cpyamf.codec.Encoder.__next__"); - if (__Pyx_GetException(&__pyx_t_3, &__pyx_t_2, &__pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 600; __pyx_clineno = __LINE__; goto __pyx_L7_except_error;} - __Pyx_GOTREF(__pyx_t_3); + if (__Pyx_GetException(&__pyx_t_2, &__pyx_t_1, &__pyx_t_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 600; __pyx_clineno = __LINE__; goto __pyx_L7_except_error;} __Pyx_GOTREF(__pyx_t_2); __Pyx_GOTREF(__pyx_t_1); + __Pyx_GOTREF(__pyx_t_4); /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/codec.pyx":601 * element = self.bucket.pop(0) @@ -8035,9 +7974,9 @@ static PyObject *__pyx_pf_6cpyamf_5codec_7Encoder___next__(PyObject *__pyx_v_sel */ __Pyx_Raise(__pyx_builtin_StopIteration, 0, 0); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 601; __pyx_clineno = __LINE__; goto __pyx_L7_except_error;} - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; goto __pyx_L6_exception_handled; } __pyx_L7_except_error:; @@ -8071,7 +8010,7 @@ static PyObject *__pyx_pf_6cpyamf_5codec_7Encoder___next__(PyObject *__pyx_v_sel * * end_pos = self.stream.tell() */ - __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_5codec_Encoder *)((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self)->__pyx_vtab)->writeElement(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_element, 0); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 605; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = ((struct __pyx_vtabstruct_6cpyamf_5codec_Encoder *)((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self)->__pyx_vtab)->writeElement(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self), __pyx_v_element, 0); if (unlikely(__pyx_t_3 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 605; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/codec.pyx":607 * self.writeElement(element) @@ -8090,7 +8029,7 @@ static PyObject *__pyx_pf_6cpyamf_5codec_7Encoder___next__(PyObject *__pyx_v_sel * * self.stream.read(&buf, end_pos - start_pos) */ - __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self)->__pyx_base.stream->__pyx_vtab)->seek(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self)->__pyx_base.stream, __pyx_v_start_pos, 0, NULL); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 609; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self)->__pyx_base.stream->__pyx_vtab)->seek(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self)->__pyx_base.stream, __pyx_v_start_pos, 0, NULL); if (unlikely(__pyx_t_3 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 609; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/codec.pyx":611 * self.stream.seek(start_pos) @@ -8099,7 +8038,7 @@ static PyObject *__pyx_pf_6cpyamf_5codec_7Encoder___next__(PyObject *__pyx_v_sel * * return PyString_FromStringAndSize(buf, end_pos - start_pos) */ - __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self)->__pyx_base.stream->__pyx_vtab)->read(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self)->__pyx_base.stream, (&__pyx_v_buf), (__pyx_v_end_pos - __pyx_v_start_pos)); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 611; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self)->__pyx_base.stream->__pyx_vtab)->read(((struct __pyx_obj_6cpyamf_5codec_Encoder *)__pyx_v_self)->__pyx_base.stream, (&__pyx_v_buf), (__pyx_v_end_pos - __pyx_v_start_pos)); if (unlikely(__pyx_t_3 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 611; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/codec.pyx":613 * self.stream.read(&buf, end_pos - start_pos) @@ -8109,10 +8048,10 @@ static PyObject *__pyx_pf_6cpyamf_5codec_7Encoder___next__(PyObject *__pyx_v_sel * def __iter__(self): */ __Pyx_XDECREF(__pyx_r); - __pyx_t_1 = PyString_FromStringAndSize(__pyx_v_buf, (__pyx_v_end_pos - __pyx_v_start_pos)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 613; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __pyx_r = __pyx_t_1; - __pyx_t_1 = 0; + __pyx_t_4 = PyString_FromStringAndSize(__pyx_v_buf, (__pyx_v_end_pos - __pyx_v_start_pos)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 613; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_4); + __pyx_r = __pyx_t_4; + __pyx_t_4 = 0; goto __pyx_L0; __pyx_r = Py_None; __Pyx_INCREF(Py_None); @@ -8120,7 +8059,7 @@ static PyObject *__pyx_pf_6cpyamf_5codec_7Encoder___next__(PyObject *__pyx_v_sel __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_1); __Pyx_XDECREF(__pyx_t_2); - __Pyx_XDECREF(__pyx_t_3); + __Pyx_XDECREF(__pyx_t_4); __Pyx_AddTraceback("cpyamf.codec.Encoder.__next__"); __pyx_r = NULL; __pyx_L0:; @@ -8320,16 +8259,16 @@ static PyObject *__pyx_pf_6cpyamf_5codec_15_CustomTypeFunc___call__(PyObject *__ * if ret is not None: */ __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 632; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); + __Pyx_GOTREF(((PyObject *)__pyx_t_1)); __Pyx_INCREF(__pyx_v_data); PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_data); __Pyx_GIVEREF(__pyx_v_data); __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 632; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_n_s__encoder), ((PyObject *)((struct __pyx_obj_6cpyamf_5codec__CustomTypeFunc *)__pyx_v_self)->encoder)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 632; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_t_3 = PyEval_CallObjectWithKeywords(((struct __pyx_obj_6cpyamf_5codec__CustomTypeFunc *)__pyx_v_self)->func, __pyx_t_1, ((PyObject *)__pyx_t_2)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 632; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyEval_CallObjectWithKeywords(((struct __pyx_obj_6cpyamf_5codec__CustomTypeFunc *)__pyx_v_self)->func, ((PyObject *)__pyx_t_1), ((PyObject *)__pyx_t_2)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 632; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0; __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_v_ret); __pyx_v_ret = __pyx_t_3; @@ -8503,16 +8442,16 @@ static PyObject *__pyx_f_6cpyamf_5codec_get_custom_type_func(PyObject *__pyx_v_ */ __Pyx_XDECREF(__pyx_r); __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 644; __pyx_clineno = __LINE__; goto __pyx_L5_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); __Pyx_INCREF(__pyx_v_encoder); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_encoder); __Pyx_GIVEREF(__pyx_v_encoder); __Pyx_INCREF(__pyx_v_func); PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_v_func); __Pyx_GIVEREF(__pyx_v_func); - __pyx_t_5 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_6cpyamf_5codec__CustomTypeFunc)), __pyx_t_3, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 644; __pyx_clineno = __LINE__; goto __pyx_L5_error;} + __pyx_t_5 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_6cpyamf_5codec__CustomTypeFunc)), ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 644; __pyx_clineno = __LINE__; goto __pyx_L5_error;} __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; __pyx_r = __pyx_t_5; __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; @@ -8560,24 +8499,24 @@ static PyObject *__pyx_f_6cpyamf_5codec_get_custom_type_func(PyObject *__pyx_v_ * */ __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 646; __pyx_clineno = __LINE__; goto __pyx_L7_except_error;} - __Pyx_GOTREF(__pyx_t_6); + __Pyx_GOTREF(((PyObject *)__pyx_t_6)); __Pyx_INCREF(__pyx_v_type_); PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_v_type_); __Pyx_GIVEREF(__pyx_v_type_); - __pyx_t_9 = PyObject_Call(__pyx_builtin_callable, __pyx_t_6, NULL); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 646; __pyx_clineno = __LINE__; goto __pyx_L7_except_error;} + __pyx_t_9 = PyObject_Call(__pyx_builtin_callable, ((PyObject *)__pyx_t_6), NULL); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 646; __pyx_clineno = __LINE__; goto __pyx_L7_except_error;} __Pyx_GOTREF(__pyx_t_9); - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_6)); __pyx_t_6 = 0; __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_t_9); if (unlikely(__pyx_t_7 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 646; __pyx_clineno = __LINE__; goto __pyx_L7_except_error;} __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; if (__pyx_t_7) { __pyx_t_9 = PyTuple_New(1); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 646; __pyx_clineno = __LINE__; goto __pyx_L7_except_error;} - __Pyx_GOTREF(__pyx_t_9); + __Pyx_GOTREF(((PyObject *)__pyx_t_9)); __Pyx_INCREF(__pyx_v_data); PyTuple_SET_ITEM(__pyx_t_9, 0, __pyx_v_data); __Pyx_GIVEREF(__pyx_v_data); - __pyx_t_6 = PyObject_Call(__pyx_v_type_, __pyx_t_9, NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 646; __pyx_clineno = __LINE__; goto __pyx_L7_except_error;} + __pyx_t_6 = PyObject_Call(__pyx_v_type_, ((PyObject *)__pyx_t_9), NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 646; __pyx_clineno = __LINE__; goto __pyx_L7_except_error;} __Pyx_GOTREF(__pyx_t_6); - __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_9)); __pyx_t_9 = 0; __pyx_t_10 = __Pyx_PyObject_IsTrue(__pyx_t_6); if (unlikely(__pyx_t_10 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 646; __pyx_clineno = __LINE__; goto __pyx_L7_except_error;} __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; __pyx_t_11 = __pyx_t_10; @@ -8595,16 +8534,16 @@ static PyObject *__pyx_f_6cpyamf_5codec_get_custom_type_func(PyObject *__pyx_v_ */ __Pyx_XDECREF(__pyx_r); __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 647; __pyx_clineno = __LINE__; goto __pyx_L7_except_error;} - __Pyx_GOTREF(__pyx_t_6); + __Pyx_GOTREF(((PyObject *)__pyx_t_6)); __Pyx_INCREF(__pyx_v_encoder); PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_v_encoder); __Pyx_GIVEREF(__pyx_v_encoder); __Pyx_INCREF(__pyx_v_func); PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_v_func); __Pyx_GIVEREF(__pyx_v_func); - __pyx_t_9 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_6cpyamf_5codec__CustomTypeFunc)), __pyx_t_6, NULL); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 647; __pyx_clineno = __LINE__; goto __pyx_L7_except_error;} + __pyx_t_9 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_6cpyamf_5codec__CustomTypeFunc)), ((PyObject *)__pyx_t_6), NULL); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 647; __pyx_clineno = __LINE__; goto __pyx_L7_except_error;} __Pyx_GOTREF(__pyx_t_9); - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_6)); __pyx_t_6 = 0; __pyx_r = __pyx_t_9; __pyx_t_9 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; @@ -8875,7 +8814,7 @@ PyTypeObject __pyx_type_6cpyamf_5codec_IndexedCollection = { 0, /*tp_getattro*/ 0, /*tp_setattro*/ &__pyx_tp_as_buffer_IndexedCollection, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/ + Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC, /*tp_flags*/ __Pyx_DOCSTR("\n Provides reference functionality for amf contexts.\n\n @see: L{pyamf.codec.IndexedCollection} for complete documentation\n "), /*tp_doc*/ __pyx_tp_traverse_6cpyamf_5codec_IndexedCollection, /*tp_traverse*/ __pyx_tp_clear_6cpyamf_5codec_IndexedCollection, /*tp_clear*/ @@ -9128,7 +9067,7 @@ PyTypeObject __pyx_type_6cpyamf_5codec_Context = { 0, /*tp_getattro*/ 0, /*tp_setattro*/ &__pyx_tp_as_buffer_Context, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/ + Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC, /*tp_flags*/ __Pyx_DOCSTR("\n I hold the AMF context for en/decoding streams.\n\n @ivar objects: An indexed collection of referencable objects encountered\n during en/decoding.\n @type objects: L{util.IndexedCollection}\n @ivar class_aliases: A L{dict} of C{class} to L{ClassAlias}\n "), /*tp_doc*/ __pyx_tp_traverse_6cpyamf_5codec_Context, /*tp_traverse*/ __pyx_tp_clear_6cpyamf_5codec_Context, /*tp_clear*/ @@ -9378,7 +9317,7 @@ PyTypeObject __pyx_type_6cpyamf_5codec_Codec = { 0, /*tp_getattro*/ 0, /*tp_setattro*/ &__pyx_tp_as_buffer_Codec, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/ + Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC, /*tp_flags*/ __Pyx_DOCSTR("\n Base class for Encoder/Decoder classes. Provides base functionality for\n managing codecs.\n "), /*tp_doc*/ __pyx_tp_traverse_6cpyamf_5codec_Codec, /*tp_traverse*/ __pyx_tp_clear_6cpyamf_5codec_Codec, /*tp_clear*/ @@ -9550,7 +9489,7 @@ PyTypeObject __pyx_type_6cpyamf_5codec_Decoder = { 0, /*tp_getattro*/ 0, /*tp_setattro*/ &__pyx_tp_as_buffer_Decoder, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/ + Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC, /*tp_flags*/ __Pyx_DOCSTR("\n Base AMF decoder.\n "), /*tp_doc*/ __pyx_tp_traverse_6cpyamf_5codec_Codec, /*tp_traverse*/ __pyx_tp_clear_6cpyamf_5codec_Codec, /*tp_clear*/ @@ -9770,7 +9709,7 @@ PyTypeObject __pyx_type_6cpyamf_5codec_Encoder = { 0, /*tp_getattro*/ 0, /*tp_setattro*/ &__pyx_tp_as_buffer_Encoder, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/ + Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC, /*tp_flags*/ __Pyx_DOCSTR("\n Base AMF encoder.\n "), /*tp_doc*/ __pyx_tp_traverse_6cpyamf_5codec_Encoder, /*tp_traverse*/ __pyx_tp_clear_6cpyamf_5codec_Encoder, /*tp_clear*/ @@ -9972,7 +9911,7 @@ PyTypeObject __pyx_type_6cpyamf_5codec__CustomTypeFunc = { 0, /*tp_getattro*/ 0, /*tp_setattro*/ &__pyx_tp_as_buffer__CustomTypeFunc, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/ + Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC, /*tp_flags*/ __Pyx_DOCSTR("\n Support for custom type mappings when encoding.\n "), /*tp_doc*/ __pyx_tp_traverse_6cpyamf_5codec__CustomTypeFunc, /*tp_traverse*/ __pyx_tp_clear_6cpyamf_5codec__CustomTypeFunc, /*tp_clear*/ @@ -10012,7 +9951,7 @@ static PyMethodDef __pyx_methods[] = { static struct PyModuleDef __pyx_moduledef = { PyModuleDef_HEAD_INIT, __Pyx_NAMESTR("codec"), - __Pyx_DOCSTR(__pyx_k_10), /* m_doc */ + __Pyx_DOCSTR(__pyx_k_19), /* m_doc */ -1, /* m_size */ __pyx_methods /* m_methods */, NULL, /* m_reload */ @@ -10023,29 +9962,18 @@ static struct PyModuleDef __pyx_moduledef = { #endif static __Pyx_StringTabEntry __pyx_string_tab[] = { - {&__pyx_kp_u_11, __pyx_k_11, sizeof(__pyx_k_11), 0, 1, 0, 0}, - {&__pyx_kp_u_12, __pyx_k_12, sizeof(__pyx_k_12), 0, 1, 0, 0}, - {&__pyx_kp_u_13, __pyx_k_13, sizeof(__pyx_k_13), 0, 1, 0, 0}, - {&__pyx_kp_u_14, __pyx_k_14, sizeof(__pyx_k_14), 0, 1, 0, 0}, - {&__pyx_kp_u_15, __pyx_k_15, sizeof(__pyx_k_15), 0, 1, 0, 0}, - {&__pyx_kp_u_16, __pyx_k_16, sizeof(__pyx_k_16), 0, 1, 0, 0}, - {&__pyx_kp_u_17, __pyx_k_17, sizeof(__pyx_k_17), 0, 1, 0, 0}, - {&__pyx_kp_u_18, __pyx_k_18, sizeof(__pyx_k_18), 0, 1, 0, 0}, + {&__pyx_kp_s_10, __pyx_k_10, sizeof(__pyx_k_10), 0, 0, 1, 0}, + {&__pyx_kp_s_12, __pyx_k_12, sizeof(__pyx_k_12), 0, 0, 1, 0}, + {&__pyx_kp_s_14, __pyx_k_14, sizeof(__pyx_k_14), 0, 0, 1, 0}, + {&__pyx_kp_s_16, __pyx_k_16, sizeof(__pyx_k_16), 0, 0, 1, 0}, {&__pyx_n_s_2, __pyx_k_2, sizeof(__pyx_k_2), 0, 0, 1, 1}, {&__pyx_kp_s_3, __pyx_k_3, sizeof(__pyx_k_3), 0, 0, 1, 0}, - {&__pyx_kp_s_5, __pyx_k_5, sizeof(__pyx_k_5), 0, 0, 1, 0}, - {&__pyx_kp_s_6, __pyx_k_6, sizeof(__pyx_k_6), 0, 0, 1, 0}, - {&__pyx_kp_s_7, __pyx_k_7, sizeof(__pyx_k_7), 0, 0, 1, 0}, {&__pyx_kp_s_8, __pyx_k_8, sizeof(__pyx_k_8), 0, 0, 1, 0}, - {&__pyx_kp_s_9, __pyx_k_9, sizeof(__pyx_k_9), 0, 0, 1, 0}, {&__pyx_n_s__AttributeError, __pyx_k__AttributeError, sizeof(__pyx_k__AttributeError), 0, 0, 1, 1}, {&__pyx_n_s__BuiltinFunctionType, __pyx_k__BuiltinFunctionType, sizeof(__pyx_k__BuiltinFunctionType), 0, 0, 1, 1}, {&__pyx_n_s__ClassAlias, __pyx_k__ClassAlias, sizeof(__pyx_k__ClassAlias), 0, 0, 1, 1}, - {&__pyx_n_s__Context, __pyx_k__Context, sizeof(__pyx_k__Context), 0, 0, 1, 1}, - {&__pyx_n_s__Decoder, __pyx_k__Decoder, sizeof(__pyx_k__Decoder), 0, 0, 1, 1}, {&__pyx_n_s__EOStream, __pyx_k__EOStream, sizeof(__pyx_k__EOStream), 0, 0, 1, 1}, {&__pyx_n_s__EncodeError, __pyx_k__EncodeError, sizeof(__pyx_k__EncodeError), 0, 0, 1, 1}, - {&__pyx_n_s__Encoder, __pyx_k__Encoder, sizeof(__pyx_k__Encoder), 0, 0, 1, 1}, {&__pyx_n_s__GeneratorType, __pyx_k__GeneratorType, sizeof(__pyx_k__GeneratorType), 0, 0, 1, 1}, {&__pyx_n_s__IOError, __pyx_k__IOError, sizeof(__pyx_k__IOError), 0, 0, 1, 1}, {&__pyx_n_s__IndexError, __pyx_k__IndexError, sizeof(__pyx_k__IndexError), 0, 0, 1, 1}, @@ -10059,7 +9987,6 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_n_s__UnknownClassAlias, __pyx_k__UnknownClassAlias, sizeof(__pyx_k__UnknownClassAlias), 0, 0, 1, 1}, {&__pyx_n_s____class__, __pyx_k____class__, sizeof(__pyx_k____class__), 0, 0, 1, 1}, {&__pyx_n_s____main__, __pyx_k____main__, sizeof(__pyx_k____main__), 0, 0, 1, 1}, - {&__pyx_n_s____next__, __pyx_k____next__, sizeof(__pyx_k____next__), 0, 0, 1, 1}, {&__pyx_n_s____test__, __pyx_k____test__, sizeof(__pyx_k____test__), 0, 0, 1, 1}, {&__pyx_n_s___clear, __pyx_k___clear, sizeof(__pyx_k___clear), 0, 0, 1, 1}, {&__pyx_n_s___increase_size, __pyx_k___increase_size, sizeof(__pyx_k___increase_size), 0, 0, 1, 1}, @@ -10095,11 +10022,9 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_n_s__getStringForBytes, __pyx_k__getStringForBytes, sizeof(__pyx_k__getStringForBytes), 0, 0, 1, 1}, {&__pyx_n_s__get_class_alias, __pyx_k__get_class_alias, sizeof(__pyx_k__get_class_alias), 0, 0, 1, 1}, {&__pyx_n_s__get_class_meta, __pyx_k__get_class_meta, sizeof(__pyx_k__get_class_meta), 0, 0, 1, 1}, - {&__pyx_n_s__getattr, __pyx_k__getattr, sizeof(__pyx_k__getattr), 0, 0, 1, 1}, {&__pyx_n_s__handleBasicTypes, __pyx_k__handleBasicTypes, sizeof(__pyx_k__handleBasicTypes), 0, 0, 1, 1}, {&__pyx_n_s__is_proxy, __pyx_k__is_proxy, sizeof(__pyx_k__is_proxy), 0, 0, 1, 1}, {&__pyx_n_s__is_xml, __pyx_k__is_xml, sizeof(__pyx_k__is_xml), 0, 0, 1, 1}, - {&__pyx_n_s__iter, __pyx_k__iter, sizeof(__pyx_k__iter), 0, 0, 1, 1}, {&__pyx_n_s__iteritems, __pyx_k__iteritems, sizeof(__pyx_k__iteritems), 0, 0, 1, 1}, {&__pyx_n_s__length, __pyx_k__length, sizeof(__pyx_k__length), 0, 0, 1, 1}, {&__pyx_n_s__next, __pyx_k__next, sizeof(__pyx_k__next), 0, 0, 1, 1}, @@ -10151,13 +10076,11 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {0, 0, 0, 0, 0, 0, 0} }; static int __Pyx_InitCachedBuiltins(void) { - __pyx_builtin_iter = __Pyx_GetName(__pyx_b, __pyx_n_s__iter); if (!__pyx_builtin_iter) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_builtin_NotImplementedError = __Pyx_GetName(__pyx_b, __pyx_n_s__NotImplementedError); if (!__pyx_builtin_NotImplementedError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 185; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_builtin_KeyError = __Pyx_GetName(__pyx_b, __pyx_n_s__KeyError); if (!__pyx_builtin_KeyError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 242; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_builtin_basestring = __Pyx_GetName(__pyx_b, __pyx_n_s__basestring); if (!__pyx_builtin_basestring) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 248; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_builtin_IOError = __Pyx_GetName(__pyx_b, __pyx_n_s__IOError); if (!__pyx_builtin_IOError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 373; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_builtin_StopIteration = __Pyx_GetName(__pyx_b, __pyx_n_s__StopIteration); if (!__pyx_builtin_StopIteration) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 398; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_builtin_getattr = __Pyx_GetName(__pyx_b, __pyx_n_s__getattr); if (!__pyx_builtin_getattr) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 465; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_builtin_AttributeError = __Pyx_GetName(__pyx_b, __pyx_n_s__AttributeError); if (!__pyx_builtin_AttributeError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 479; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_builtin_IndexError = __Pyx_GetName(__pyx_b, __pyx_n_s__IndexError); if (!__pyx_builtin_IndexError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 600; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_builtin_TypeError = __Pyx_GetName(__pyx_b, __pyx_n_s__TypeError); if (!__pyx_builtin_TypeError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 645; __pyx_clineno = __LINE__; goto __pyx_L1_error;} @@ -10167,6 +10090,150 @@ static int __Pyx_InitCachedBuiltins(void) { return -1; } +static int __Pyx_InitCachedConstants(void) { + __Pyx_RefNannySetupContext("__Pyx_InitCachedConstants"); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/codec.pyx":272 + * return ret + * + * cdef unicode u = s.decode('utf-8') # <<<<<<<<<<<<<< + * + * self.unicodes[s] = u + */ + __pyx_k_tuple_4 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 272; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_4)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_3)); + PyTuple_SET_ITEM(__pyx_k_tuple_4, 0, ((PyObject *)__pyx_kp_s_3)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_3)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_4)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/codec.pyx":291 + * return ret + * + * cdef str s = u.encode('utf-8') # <<<<<<<<<<<<<< + * + * self.unicodes[s] = u + */ + __pyx_k_tuple_5 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 291; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_5)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_3)); + PyTuple_SET_ITEM(__pyx_k_tuple_5, 0, ((PyObject *)__pyx_kp_s_3)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_3)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_5)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/codec.pyx":448 + * + * cdef int writeDate(self, object o) except -1: + * o = datetime.datetime.combine(o, datetime.time(0, 0, 0, 0)) # <<<<<<<<<<<<<< + * + * self.writeDateTime(o) + */ + __pyx_k_tuple_7 = PyTuple_New(4); if (unlikely(!__pyx_k_tuple_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 448; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_7)); + __Pyx_INCREF(__pyx_int_0); + PyTuple_SET_ITEM(__pyx_k_tuple_7, 0, __pyx_int_0); + __Pyx_GIVEREF(__pyx_int_0); + __Pyx_INCREF(__pyx_int_0); + PyTuple_SET_ITEM(__pyx_k_tuple_7, 1, __pyx_int_0); + __Pyx_GIVEREF(__pyx_int_0); + __Pyx_INCREF(__pyx_int_0); + PyTuple_SET_ITEM(__pyx_k_tuple_7, 2, __pyx_int_0); + __Pyx_GIVEREF(__pyx_int_0); + __Pyx_INCREF(__pyx_int_0); + PyTuple_SET_ITEM(__pyx_k_tuple_7, 3, __pyx_int_0); + __Pyx_GIVEREF(__pyx_int_0); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_7)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/codec.pyx":544 + * cdef int checkBadTypes(self, object element, object py_type) except -1: + * if PyModule_CheckExact(element): + * raise pyamf.EncodeError("Cannot encode modules") # <<<<<<<<<<<<<< + * elif PyMethod_Check(element): + * raise pyamf.EncodeError("Cannot encode methods") + */ + __pyx_k_tuple_9 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 544; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_9)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_8)); + PyTuple_SET_ITEM(__pyx_k_tuple_9, 0, ((PyObject *)__pyx_kp_s_8)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_8)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_9)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/codec.pyx":546 + * raise pyamf.EncodeError("Cannot encode modules") + * elif PyMethod_Check(element): + * raise pyamf.EncodeError("Cannot encode methods") # <<<<<<<<<<<<<< + * elif PyFunction_Check(element) or py_type is BuiltinFunctionType: + * raise pyamf.EncodeError("Cannot encode functions") + */ + __pyx_k_tuple_11 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_11)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 546; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_11)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_10)); + PyTuple_SET_ITEM(__pyx_k_tuple_11, 0, ((PyObject *)__pyx_kp_s_10)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_10)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_11)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/codec.pyx":548 + * raise pyamf.EncodeError("Cannot encode methods") + * elif PyFunction_Check(element) or py_type is BuiltinFunctionType: + * raise pyamf.EncodeError("Cannot encode functions") # <<<<<<<<<<<<<< + * elif PyClass_Check(element) or PyType_CheckExact(element): + * raise pyamf.EncodeError("Cannot encode class objects") + */ + __pyx_k_tuple_13 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_13)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 548; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_13)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_12)); + PyTuple_SET_ITEM(__pyx_k_tuple_13, 0, ((PyObject *)__pyx_kp_s_12)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_12)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_13)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/codec.pyx":550 + * raise pyamf.EncodeError("Cannot encode functions") + * elif PyClass_Check(element) or PyType_CheckExact(element): + * raise pyamf.EncodeError("Cannot encode class objects") # <<<<<<<<<<<<<< + * elif PyTime_CheckExact(element): + * raise pyamf.EncodeError('A datetime.time instance was found but ' + */ + __pyx_k_tuple_15 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_15)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 550; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_15)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_14)); + PyTuple_SET_ITEM(__pyx_k_tuple_15, 0, ((PyObject *)__pyx_kp_s_14)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_14)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_15)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/codec.pyx":552 + * raise pyamf.EncodeError("Cannot encode class objects") + * elif PyTime_CheckExact(element): + * raise pyamf.EncodeError('A datetime.time instance was found but ' # <<<<<<<<<<<<<< + * 'AMF has no way to encode time objects. Please use ' + * 'datetime.datetime instead') + */ + __pyx_k_tuple_17 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_17)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 552; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_17)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_16)); + PyTuple_SET_ITEM(__pyx_k_tuple_17, 0, ((PyObject *)__pyx_kp_s_16)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_16)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_17)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/codec.pyx":599 + * + * try: + * element = self.bucket.pop(0) # <<<<<<<<<<<<<< + * except IndexError: + * raise StopIteration + */ + __pyx_k_tuple_18 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_18)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 599; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_18)); + __Pyx_INCREF(__pyx_int_0); + PyTuple_SET_ITEM(__pyx_k_tuple_18, 0, __pyx_int_0); + __Pyx_GIVEREF(__pyx_int_0); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_18)); + __Pyx_RefNannyFinishContext(); + return 0; + __pyx_L1_error:; + __Pyx_RefNannyFinishContext(); + return -1; +} + static int __Pyx_InitGlobals(void) { if (__Pyx_InitStrings(__pyx_string_tab) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; __pyx_int_0 = PyInt_FromLong(0); if (unlikely(!__pyx_int_0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; @@ -10185,7 +10252,6 @@ PyMODINIT_FUNC PyInit_codec(void) { PyObject *__pyx_t_1 = NULL; PyObject *__pyx_t_2 = NULL; - PyObject *__pyx_t_3 = NULL; #if CYTHON_REFNANNY void* __pyx_refnanny = NULL; __Pyx_RefNanny = __Pyx_RefNannyImportAPI("refnanny"); @@ -10211,7 +10277,7 @@ PyMODINIT_FUNC PyInit_codec(void) #endif /*--- Module creation code ---*/ #if PY_MAJOR_VERSION < 3 - __pyx_m = Py_InitModule4(__Pyx_NAMESTR("codec"), __pyx_methods, __Pyx_DOCSTR(__pyx_k_10), 0, PYTHON_API_VERSION); + __pyx_m = Py_InitModule4(__Pyx_NAMESTR("codec"), __pyx_methods, __Pyx_DOCSTR(__pyx_k_19), 0, PYTHON_API_VERSION); #else __pyx_m = PyModule_Create(&__pyx_moduledef); #endif @@ -10229,6 +10295,8 @@ PyMODINIT_FUNC PyInit_codec(void) } /*--- Builtin init code ---*/ if (unlikely(__Pyx_InitCachedBuiltins() < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + /*--- Constants init code ---*/ + if (unlikely(__Pyx_InitCachedConstants() < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /*--- Global init code ---*/ __pyx_v_6cpyamf_5codec_MixedArray = Py_None; Py_INCREF(Py_None); __pyx_v_6cpyamf_5codec_Undefined = Py_None; Py_INCREF(Py_None); @@ -10506,7 +10574,7 @@ PyMODINIT_FUNC PyInit_codec(void) */ __pyx_t_2 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 320; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __pyx_k_4 = __pyx_t_2; + __pyx_k_6 = __pyx_t_2; __Pyx_GIVEREF(__pyx_t_2); __pyx_t_2 = 0; @@ -10517,90 +10585,10 @@ PyMODINIT_FUNC PyInit_codec(void) */ __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); - __pyx_t_1 = PyObject_GetAttr(__pyx_m, __pyx_n_s__Context); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__getClassAlias); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_GetAttrString(__pyx_t_3, "__doc__"); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_kp_u_11), __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = PyObject_GetAttr(__pyx_m, __pyx_n_s__Context); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__getStringForBytes); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_GetAttrString(__pyx_t_3, "__doc__"); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_kp_u_12), __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = PyObject_GetAttr(__pyx_m, __pyx_n_s__Context); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__getBytesForString); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_GetAttrString(__pyx_t_3, "__doc__"); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_kp_u_13), __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = PyObject_GetAttr(__pyx_m, __pyx_n_s__Decoder); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__readElement); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_GetAttrString(__pyx_t_3, "__doc__"); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_kp_u_14), __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = PyObject_GetAttr(__pyx_m, __pyx_n_s__Decoder); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__send); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_GetAttrString(__pyx_t_3, "__doc__"); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_kp_u_15), __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = PyObject_GetAttr(__pyx_m, __pyx_n_s__Decoder); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s____next__); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_GetAttrString(__pyx_t_3, "__doc__"); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_kp_u_16), __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = PyObject_GetAttr(__pyx_m, __pyx_n_s__Encoder); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__send); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_GetAttrString(__pyx_t_3, "__doc__"); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_kp_u_17), __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = PyObject_GetAttr(__pyx_m, __pyx_n_s__Encoder); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s____next__); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_GetAttrString(__pyx_t_3, "__doc__"); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_kp_u_18), __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_s____test__, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; - /* "/Users/nick/dev/rtmpy/lib/python2.6/site-packages/Cython/Includes/cpython/type.pxd":2 + /* "/Library/Python/2.6/site-packages/Cython/Includes/cpython/type.pxd":2 * * cdef extern from "Python.h": # <<<<<<<<<<<<<< * # The C structure of the objects used to describe built-in types. @@ -10610,7 +10598,6 @@ PyMODINIT_FUNC PyInit_codec(void) __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_1); __Pyx_XDECREF(__pyx_t_2); - __Pyx_XDECREF(__pyx_t_3); if (__pyx_m) { __Pyx_AddTraceback("init cpyamf.codec"); Py_DECREF(__pyx_m); __pyx_m = 0; @@ -11110,6 +11097,20 @@ static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb) { } #endif +static CYTHON_INLINE PyObject *__Pyx_GetAttr3(PyObject *o, PyObject *n, PyObject *d) { + PyObject *r = PyObject_GetAttr(o, n); + if (!r) { + if (!PyErr_ExceptionMatches(PyExc_AttributeError)) + goto bad; + PyErr_Clear(); + r = d; + Py_INCREF(d); + } + return r; +bad: + return NULL; +} + static CYTHON_INLINE unsigned char __Pyx_PyInt_AsUnsignedChar(PyObject* x) { const unsigned char neg_one = (unsigned char)-1, const_zero = 0; const int is_unsigned = neg_one > const_zero; diff --git a/cpyamf/util.c b/cpyamf/util.c index 476237f2..848e16fb 100644 --- a/cpyamf/util.c +++ b/cpyamf/util.c @@ -1,4 +1,4 @@ -/* Generated by Cython 0.13 on Tue Oct 19 17:29:39 2010 */ +/* Generated by Cython 0.13 on Thu Nov 25 19:27:13 2010 */ #define PY_SSIZE_T_CLEAN #include "Python.h" @@ -163,6 +163,25 @@ #define __Pyx_PyNumber_InPlaceDivide(x,y) PyNumber_InPlaceDivide(x,y) #endif +#if (PY_MAJOR_VERSION < 3) || (PY_VERSION_HEX >= 0x03010300) + #define __Pyx_PySequence_GetSlice(obj, a, b) PySequence_GetSlice(obj, a, b) + #define __Pyx_PySequence_SetSlice(obj, a, b, value) PySequence_SetSlice(obj, a, b, value) + #define __Pyx_PySequence_DelSlice(obj, a, b) PySequence_DelSlice(obj, a, b) +#else + #define __Pyx_PySequence_GetSlice(obj, a, b) (unlikely(!(obj)) ? \ + (PyErr_SetString(PyExc_SystemError, "null argument to internal routine"), (PyObject*)0) : \ + (likely((obj)->ob_type->tp_as_mapping) ? (PySequence_GetSlice(obj, a, b)) : \ + (PyErr_Format(PyExc_TypeError, "'%.200s' object is unsliceable", (obj)->ob_type->tp_name), (PyObject*)0))) + #define __Pyx_PySequence_SetSlice(obj, a, b, value) (unlikely(!(obj)) ? \ + (PyErr_SetString(PyExc_SystemError, "null argument to internal routine"), -1) : \ + (likely((obj)->ob_type->tp_as_mapping) ? (PySequence_SetSlice(obj, a, b, value)) : \ + (PyErr_Format(PyExc_TypeError, "'%.200s' object doesn't support slice assignment", (obj)->ob_type->tp_name), -1))) + #define __Pyx_PySequence_DelSlice(obj, a, b) (unlikely(!(obj)) ? \ + (PyErr_SetString(PyExc_SystemError, "null argument to internal routine"), -1) : \ + (likely((obj)->ob_type->tp_as_mapping) ? (PySequence_DelSlice(obj, a, b)) : \ + (PyErr_Format(PyExc_TypeError, "'%.200s' object doesn't support slice deletion", (obj)->ob_type->tp_name), -1))) +#endif + #if PY_MAJOR_VERSION >= 3 #define PyMethod_New(func, self, klass) ((self) ? PyMethod_New(func, self) : PyInstanceMethod_New(func)) #endif @@ -635,61 +654,24 @@ static PyObject *__pyx_builtin_TypeError; static char __pyx_k_1[] = "_actually_increase_buffer"; static char __pyx_k_2[] = "buf cannot be NULL"; static char __pyx_k_3[] = "Bad value for mode"; -static char __pyx_k_4[] = "Max 4 bytes to unpack"; -static char __pyx_k_5[] = "integer out of range"; -static char __pyx_k_6[] = "value must be Unicode or str"; -static char __pyx_k_7[] = "Unable to coerce buf->StringIO"; -static char __pyx_k_8[] = "String value expected"; -static char __pyx_k_9[] = "!"; -static char __pyx_k_10[] = "@"; -static char __pyx_k_11[] = "<"; -static char __pyx_k_12[] = ">"; -static char __pyx_k_13[] = "Not a valid endian type"; -static char __pyx_k_14[] = "expected int for x"; -static char __pyx_k_15[] = "Expecting float for val"; -static char __pyx_k_16[] = "\nC-extension for L{pyamf.util} Python module in L{PyAMF}.\n\n@since: 0.4\n"; -static char __pyx_k_17[] = "\377\370\000\000\000\000\000\000"; -static char __pyx_k_18[] = "\377\360\000\000\000\000\000\000"; -static char __pyx_k_19[] = "\360\000\000\000\000\000\000"; -static char __pyx_k_20[] = ""; -static char __pyx_k_21[] = "Unable to initialise cpyamf.util"; -static char __pyx_k_22[] = "cBufferedByteStream.tell (line 227)"; -static char __pyx_k_23[] = "cBufferedByteStream.at_eof (line 323)"; -static char __pyx_k_24[] = "cBufferedByteStream.remaining (line 331)"; -static char __pyx_k_25[] = "cBufferedByteStream.seek (line 337)"; -static char __pyx_k_26[] = "cBufferedByteStream.getvalue (line 364)"; -static char __pyx_k_27[] = "cBufferedByteStream.truncate (line 382)"; -static char __pyx_k_28[] = "cBufferedByteStream.consume (line 419)"; -static char __pyx_k_29[] = "cBufferedByteStream.read_uchar (line 556)"; -static char __pyx_k_30[] = "cBufferedByteStream.read_char (line 566)"; -static char __pyx_k_31[] = "cBufferedByteStream.read_ushort (line 576)"; -static char __pyx_k_32[] = "cBufferedByteStream.read_short (line 586)"; -static char __pyx_k_33[] = "cBufferedByteStream.read_24bit_uint (line 596)"; -static char __pyx_k_34[] = "cBufferedByteStream.read_24bit_int (line 606)"; -static char __pyx_k_35[] = "cBufferedByteStream.read_ulong (line 619)"; -static char __pyx_k_36[] = "cBufferedByteStream.read_long (line 629)"; -static char __pyx_k_37[] = "cBufferedByteStream.write_uchar (line 642)"; -static char __pyx_k_38[] = "cBufferedByteStream.write_char (line 651)"; -static char __pyx_k_39[] = "cBufferedByteStream.write_ushort (line 660)"; -static char __pyx_k_40[] = "cBufferedByteStream.write_short (line 669)"; -static char __pyx_k_41[] = "cBufferedByteStream.write_ulong (line 678)"; -static char __pyx_k_42[] = "cBufferedByteStream.write_long (line 687)"; -static char __pyx_k_43[] = "cBufferedByteStream.write_24bit_uint (line 696)"; -static char __pyx_k_44[] = "cBufferedByteStream.write_24bit_int (line 705)"; -static char __pyx_k_45[] = "cBufferedByteStream.read_utf8_string (line 714)"; -static char __pyx_k_46[] = "cBufferedByteStream.write_utf8_string (line 731)"; -static char __pyx_k_47[] = "cBufferedByteStream.write_double (line 802)"; -static char __pyx_k_48[] = "cBufferedByteStream.write_float (line 865)"; -static char __pyx_k_49[] = "BufferedByteStream.read (line 951)"; -static char __pyx_k_50[] = "BufferedByteStream.write (line 972)"; -static char __pyx_k_51[] = "BufferedByteStream.peek (line 991)"; -static char __pyx_k_52[] = "BufferedByteStream.write_char (line 1011)"; -static char __pyx_k_53[] = "BufferedByteStream.write_ushort (line 1024)"; -static char __pyx_k_54[] = "BufferedByteStream.write_short (line 1037)"; -static char __pyx_k_55[] = "BufferedByteStream.write_ulong (line 1050)"; -static char __pyx_k_56[] = "BufferedByteStream.read_double (line 1066)"; -static char __pyx_k_57[] = "BufferedByteStream.write_double (line 1084)"; -static char __pyx_k_58[] = "BufferedByteStream.read_float (line 1121)"; +static char __pyx_k_5[] = "Max 4 bytes to unpack"; +static char __pyx_k_7[] = "integer out of range"; +static char __pyx_k_10[] = "value must be Unicode or str"; +static char __pyx_k_13[] = "Unable to coerce buf->StringIO"; +static char __pyx_k_15[] = "String value expected"; +static char __pyx_k_17[] = "!"; +static char __pyx_k_18[] = "@"; +static char __pyx_k_19[] = "<"; +static char __pyx_k_20[] = ">"; +static char __pyx_k_21[] = "Not a valid endian type"; +static char __pyx_k_23[] = "expected int for x"; +static char __pyx_k_28[] = "Expecting float for val"; +static char __pyx_k_31[] = "\nC-extension for L{pyamf.util} Python module in L{PyAMF}.\n\n@since: 0.4\n"; +static char __pyx_k_32[] = "\377\370\000\000\000\000\000\000"; +static char __pyx_k_33[] = "\377\360\000\000\000\000\000\000"; +static char __pyx_k_34[] = "\360\000\000\000\000\000\000"; +static char __pyx_k_35[] = ""; +static char __pyx_k_37[] = "Unable to initialise cpyamf.util"; static char __pyx_k__x[] = "x"; static char __pyx_k__NaN[] = "NaN"; static char __pyx_k__buf[] = "buf"; @@ -724,7 +706,6 @@ static char __pyx_k__read_char[] = "read_char"; static char __pyx_k__read_long[] = "read_long"; static char __pyx_k__remaining[] = "remaining"; static char __pyx_k__ValueError[] = "ValueError"; -static char __pyx_k__read_float[] = "read_float"; static char __pyx_k__read_short[] = "read_short"; static char __pyx_k__read_uchar[] = "read_uchar"; static char __pyx_k__read_ulong[] = "read_ulong"; @@ -732,7 +713,6 @@ static char __pyx_k__unpack_int[] = "unpack_int"; static char __pyx_k__write_char[] = "write_char"; static char __pyx_k__write_long[] = "write_long"; static char __pyx_k__SystemError[] = "SystemError"; -static char __pyx_k__read_double[] = "read_double"; static char __pyx_k__read_ushort[] = "read_ushort"; static char __pyx_k__write_float[] = "write_float"; static char __pyx_k__write_short[] = "write_short"; @@ -751,63 +731,23 @@ static char __pyx_k___increase_buffer[] = "_increase_buffer"; static char __pyx_k__read_utf8_string[] = "read_utf8_string"; static char __pyx_k__write_24bit_uint[] = "write_24bit_uint"; static char __pyx_k__write_utf8_string[] = "write_utf8_string"; -static char __pyx_k__BufferedByteStream[] = "BufferedByteStream"; -static char __pyx_k__cBufferedByteStream[] = "cBufferedByteStream"; static PyObject *__pyx_n_s_1; -static PyObject *__pyx_kp_b_10; -static PyObject *__pyx_kp_b_11; -static PyObject *__pyx_kp_b_12; +static PyObject *__pyx_kp_s_10; static PyObject *__pyx_kp_s_13; -static PyObject *__pyx_kp_s_14; static PyObject *__pyx_kp_s_15; +static PyObject *__pyx_kp_b_17; +static PyObject *__pyx_kp_b_18; +static PyObject *__pyx_kp_b_19; static PyObject *__pyx_kp_s_2; -static PyObject *__pyx_kp_s_20; +static PyObject *__pyx_kp_b_20; static PyObject *__pyx_kp_s_21; -static PyObject *__pyx_kp_u_22; -static PyObject *__pyx_kp_u_23; -static PyObject *__pyx_kp_u_24; -static PyObject *__pyx_kp_u_25; -static PyObject *__pyx_kp_u_26; -static PyObject *__pyx_kp_u_27; -static PyObject *__pyx_kp_u_28; -static PyObject *__pyx_kp_u_29; +static PyObject *__pyx_kp_s_23; +static PyObject *__pyx_kp_s_28; static PyObject *__pyx_kp_s_3; -static PyObject *__pyx_kp_u_30; -static PyObject *__pyx_kp_u_31; -static PyObject *__pyx_kp_u_32; -static PyObject *__pyx_kp_u_33; -static PyObject *__pyx_kp_u_34; -static PyObject *__pyx_kp_u_35; -static PyObject *__pyx_kp_u_36; -static PyObject *__pyx_kp_u_37; -static PyObject *__pyx_kp_u_38; -static PyObject *__pyx_kp_u_39; -static PyObject *__pyx_kp_s_4; -static PyObject *__pyx_kp_u_40; -static PyObject *__pyx_kp_u_41; -static PyObject *__pyx_kp_u_42; -static PyObject *__pyx_kp_u_43; -static PyObject *__pyx_kp_u_44; -static PyObject *__pyx_kp_u_45; -static PyObject *__pyx_kp_u_46; -static PyObject *__pyx_kp_u_47; -static PyObject *__pyx_kp_u_48; -static PyObject *__pyx_kp_u_49; +static PyObject *__pyx_kp_s_35; +static PyObject *__pyx_kp_s_37; static PyObject *__pyx_kp_s_5; -static PyObject *__pyx_kp_u_50; -static PyObject *__pyx_kp_u_51; -static PyObject *__pyx_kp_u_52; -static PyObject *__pyx_kp_u_53; -static PyObject *__pyx_kp_u_54; -static PyObject *__pyx_kp_u_55; -static PyObject *__pyx_kp_u_56; -static PyObject *__pyx_kp_u_57; -static PyObject *__pyx_kp_u_58; -static PyObject *__pyx_kp_s_6; static PyObject *__pyx_kp_s_7; -static PyObject *__pyx_kp_s_8; -static PyObject *__pyx_kp_b_9; -static PyObject *__pyx_n_s__BufferedByteStream; static PyObject *__pyx_n_s__IOError; static PyObject *__pyx_n_s__NaN; static PyObject *__pyx_n_s__NegInf; @@ -824,7 +764,6 @@ static PyObject *__pyx_n_s__append; static PyObject *__pyx_n_s__at_eof; static PyObject *__pyx_n_s__buf; static PyObject *__pyx_n_s__buffer; -static PyObject *__pyx_n_s__cBufferedByteStream; static PyObject *__pyx_n_s__consume; static PyObject *__pyx_n_s__endian; static PyObject *__pyx_n_s__getvalue; @@ -842,8 +781,6 @@ static PyObject *__pyx_n_s__read; static PyObject *__pyx_n_s__read_24bit_int; static PyObject *__pyx_n_s__read_24bit_uint; static PyObject *__pyx_n_s__read_char; -static PyObject *__pyx_n_s__read_double; -static PyObject *__pyx_n_s__read_float; static PyObject *__pyx_n_s__read_long; static PyObject *__pyx_n_s__read_short; static PyObject *__pyx_n_s__read_uchar; @@ -872,7 +809,25 @@ static PyObject *__pyx_n_s__x; static PyObject *__pyx_int_0; static PyObject *__pyx_int_neg_1; static PyObject *__pyx_int_512; +static PyObject *__pyx_int_2147483648; static PyObject *__pyx_int_4294967295L; +static PyObject *__pyx_k_tuple_4; +static PyObject *__pyx_k_tuple_6; +static PyObject *__pyx_k_tuple_8; +static PyObject *__pyx_k_tuple_9; +static PyObject *__pyx_k_tuple_11; +static PyObject *__pyx_k_tuple_12; +static PyObject *__pyx_k_tuple_14; +static PyObject *__pyx_k_tuple_16; +static PyObject *__pyx_k_tuple_22; +static PyObject *__pyx_k_tuple_24; +static PyObject *__pyx_k_tuple_25; +static PyObject *__pyx_k_tuple_26; +static PyObject *__pyx_k_tuple_27; +static PyObject *__pyx_k_tuple_29; +static PyObject *__pyx_k_tuple_30; +static PyObject *__pyx_k_tuple_36; +static PyObject *__pyx_k_tuple_38; /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":59 * @@ -2179,7 +2134,7 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream__actually_increase_buffe * * if requested_size > new_size + MAX_BUFFER_EXTENSION: */ - __pyx_v_requested_size *= 2; + __pyx_v_requested_size = (__pyx_v_requested_size * 2); } /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":243 @@ -2417,7 +2372,7 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_write(struct __pyx_obj_6 * * if self.pos > self.length: */ - __pyx_v_self->pos += __pyx_v_size; + __pyx_v_self->pos = (__pyx_v_self->pos + __pyx_v_size); /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":282 * self.pos += size @@ -2681,7 +2636,7 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_read(struct __pyx_obj_6c * * return 0 */ - __pyx_v_self->pos += __pyx_v_size; + __pyx_v_self->pos = (__pyx_v_self->pos + __pyx_v_size); /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":321 * self.pos += size @@ -2921,16 +2876,16 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_seek(struct __pyx_obj_6c __pyx_t_3 = PyInt_FromLong(__pyx_v_mode); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 337; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 337; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); + __Pyx_GOTREF(((PyObject *)__pyx_t_4)); PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_2); __Pyx_GIVEREF(__pyx_t_2); PyTuple_SET_ITEM(__pyx_t_4, 1, __pyx_t_3); __Pyx_GIVEREF(__pyx_t_3); __pyx_t_2 = 0; __pyx_t_3 = 0; - __pyx_t_3 = PyObject_Call(__pyx_t_1, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 337; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_4), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 337; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0; __pyx_t_5 = __Pyx_PyInt_AsInt(__pyx_t_3); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 337; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_r = __pyx_t_5; @@ -2940,14 +2895,22 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_seek(struct __pyx_obj_6c __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; } - /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":344 + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":354 + * + * self.pos += pos + * elif mode == 2: # <<<<<<<<<<<<<< + * if pos + self.length < 0 or pos + self.length > self.length: + * raise IOError + */ + switch (__pyx_v_mode) { + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":344 * @param mode: mode 0: absolute; 1: relative; 2: relative to EOF * """ * if mode == 0: # <<<<<<<<<<<<<< * if pos < 0 or pos > self.length: * raise IOError */ - switch (__pyx_v_mode) { case 0: /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":345 @@ -3034,7 +2997,7 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_seek(struct __pyx_obj_6c * elif mode == 2: * if pos + self.length < 0 or pos + self.length > self.length: */ - __pyx_v_self->pos += __pyx_v_pos; + __pyx_v_self->pos = (__pyx_v_self->pos + __pyx_v_pos); break; /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":354 @@ -3093,16 +3056,10 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_seek(struct __pyx_obj_6c * * return 0 */ - __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 360; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_k_tuple_4), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 360; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_3)); - PyTuple_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_kp_s_3)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_3)); - __pyx_t_3 = PyObject_Call(__pyx_builtin_ValueError, __pyx_t_1, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 360; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_Raise(__pyx_t_1, 0, 0); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __Pyx_Raise(__pyx_t_3, 0, 0); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; {__pyx_filename = __pyx_f[0]; __pyx_lineno = 360; __pyx_clineno = __LINE__; goto __pyx_L1_error;} break; } @@ -3413,13 +3370,13 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_truncate(struct __pyx_ob __pyx_t_2 = PyInt_FromSsize_t(__pyx_v_size); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 382; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 382; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2); __Pyx_GIVEREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_Call(__pyx_t_1, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 382; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 382; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; __pyx_t_4 = __Pyx_PyInt_AsInt(__pyx_t_2); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 382; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_r = __pyx_t_4; @@ -4012,9 +3969,8 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_unpack_int(struct __pyx_ int __pyx_r; int __pyx_t_1; PyObject *__pyx_t_2 = NULL; - PyObject *__pyx_t_3 = NULL; - int __pyx_t_4; - unsigned int __pyx_t_5; + int __pyx_t_3; + unsigned int __pyx_t_4; __Pyx_RefNannySetupContext("unpack_int"); /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":455 @@ -4034,16 +3990,10 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_unpack_int(struct __pyx_ * * if not self.has_available(num_bytes): */ - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 456; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_k_tuple_6), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 456; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_4)); - PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_kp_s_4)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_4)); - __pyx_t_3 = PyObject_Call(__pyx_builtin_ValueError, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 456; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_Raise(__pyx_t_2, 0, 0); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __Pyx_Raise(__pyx_t_3, 0, 0); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; {__pyx_filename = __pyx_f[0]; __pyx_lineno = 456; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L3; } @@ -4057,8 +4007,8 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_unpack_int(struct __pyx_ * */ __pyx_t_1 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self->__pyx_vtab)->has_available(__pyx_v_self, __pyx_v_num_bytes); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 458; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_t_4 = (!__pyx_t_1); - if (__pyx_t_4) { + __pyx_t_3 = (!__pyx_t_1); + if (__pyx_t_3) { /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":459 * @@ -4098,8 +4048,8 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_unpack_int(struct __pyx_ * for 0 <= nb < num_bytes: * x = (x << 8) | bytes[nb] */ - __pyx_t_4 = __pyx_f_6cpyamf_4util_is_big_endian(__pyx_v_self->endian); - if (__pyx_t_4) { + __pyx_t_3 = __pyx_f_6cpyamf_4util_is_big_endian(__pyx_v_self->endian); + if (__pyx_t_3) { /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":465 * @@ -4108,8 +4058,8 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_unpack_int(struct __pyx_ * x = (x << 8) | bytes[nb] * else: */ - __pyx_t_5 = __pyx_v_num_bytes; - for (__pyx_v_nb = 0; __pyx_v_nb < __pyx_t_5; __pyx_v_nb++) { + __pyx_t_4 = __pyx_v_num_bytes; + for (__pyx_v_nb = 0; __pyx_v_nb < __pyx_t_4; __pyx_v_nb++) { /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":466 * if is_big_endian(self.endian): @@ -4131,8 +4081,8 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_unpack_int(struct __pyx_ * x = (x << 8) | bytes[num_bytes - nb - 1] * */ - __pyx_t_5 = __pyx_v_num_bytes; - for (__pyx_v_nb = 0; __pyx_v_nb < __pyx_t_5; __pyx_v_nb++) { + __pyx_t_4 = __pyx_v_num_bytes; + for (__pyx_v_nb = 0; __pyx_v_nb < __pyx_t_4; __pyx_v_nb++) { /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":469 * else: @@ -4153,7 +4103,7 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_unpack_int(struct __pyx_ * memcpy(ret, &x, num_bytes) * */ - __pyx_v_self->pos += __pyx_v_num_bytes; + __pyx_v_self->pos = (__pyx_v_self->pos + __pyx_v_num_bytes); /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":472 * @@ -4178,7 +4128,6 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_unpack_int(struct __pyx_ goto __pyx_L0; __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_2); - __Pyx_XDECREF(__pyx_t_3); __Pyx_AddTraceback("cpyamf.util.cBufferedByteStream.unpack_int"); __pyx_r = -1; __pyx_L0:; @@ -4204,9 +4153,8 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_pack_int(struct __pyx_ob int __pyx_t_2; int __pyx_t_3; PyObject *__pyx_t_4 = NULL; - PyObject *__pyx_t_5 = NULL; - PyObject *__pyx_t_6; - int __pyx_t_7; + PyObject *__pyx_t_5; + int __pyx_t_6; __Pyx_RefNannySetupContext("pack_int"); /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":482 @@ -4278,16 +4226,10 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_pack_int(struct __pyx_ob * * cdef char *buf = malloc(num_bytes) */ - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 490; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyObject_Call(__pyx_builtin_OverflowError, ((PyObject *)__pyx_k_tuple_8), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 490; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_5)); - PyTuple_SET_ITEM(__pyx_t_4, 0, ((PyObject *)__pyx_kp_s_5)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_5)); - __pyx_t_5 = PyObject_Call(__pyx_builtin_OverflowError, __pyx_t_4, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 490; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); + __Pyx_Raise(__pyx_t_4, 0, 0); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __Pyx_Raise(__pyx_t_5, 0, 0); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; {__pyx_filename = __pyx_f[0]; __pyx_lineno = 490; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L4; } @@ -4322,7 +4264,7 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_pack_int(struct __pyx_ob * * cdef long i = num_bytes */ - __pyx_t_6 = PyErr_NoMemory(); if (unlikely(__pyx_t_6 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 495; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyErr_NoMemory(); if (unlikely(__pyx_t_5 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 495; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L5; } __pyx_L5:; @@ -4364,7 +4306,7 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_pack_int(struct __pyx_ob * buf[i] = x * x >>= 8 */ - __pyx_v_i -= 1; + __pyx_v_i = (__pyx_v_i - 1); /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":502 * while i > 0: @@ -4382,7 +4324,7 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_pack_int(struct __pyx_ob * else: * while i > 0: */ - __pyx_v_x >>= 8; + __pyx_v_x = (__pyx_v_x >> 8); } goto __pyx_L6; } @@ -4415,7 +4357,7 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_pack_int(struct __pyx_ob * x >>= 8 * */ - __pyx_v_i -= 1; + __pyx_v_i = (__pyx_v_i - 1); /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":508 * buf[num_bytes - i] = x @@ -4424,7 +4366,7 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_pack_int(struct __pyx_ob * * try: */ - __pyx_v_x >>= 8; + __pyx_v_x = (__pyx_v_x >> 8); } } __pyx_L6:; @@ -4445,7 +4387,7 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_pack_int(struct __pyx_ob * finally: * free(buf) */ - __pyx_t_7 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self->__pyx_vtab)->write(__pyx_v_self, __pyx_v_buf, __pyx_v_num_bytes); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 511; __pyx_clineno = __LINE__; goto __pyx_L12;} + __pyx_t_6 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self->__pyx_vtab)->write(__pyx_v_self, __pyx_v_buf, __pyx_v_num_bytes); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 511; __pyx_clineno = __LINE__; goto __pyx_L12;} } /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":513 @@ -4464,7 +4406,6 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_pack_int(struct __pyx_ob __pyx_L12: { __pyx_why = 4; __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; - __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_ErrFetch(&__pyx_exc_type, &__pyx_exc_value, &__pyx_exc_tb); __pyx_exc_lineno = __pyx_lineno; goto __pyx_L13; @@ -4497,7 +4438,6 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_pack_int(struct __pyx_ob goto __pyx_L0; __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_4); - __Pyx_XDECREF(__pyx_t_5); __Pyx_AddTraceback("cpyamf.util.cBufferedByteStream.pack_int"); __pyx_r = -1; __pyx_L0:; @@ -4520,9 +4460,8 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_pack_uint(struct __pyx_o int __pyx_r; int __pyx_t_1; PyObject *__pyx_t_2 = NULL; - PyObject *__pyx_t_3 = NULL; - PyObject *__pyx_t_4; - int __pyx_t_5; + PyObject *__pyx_t_3; + int __pyx_t_4; __Pyx_RefNannySetupContext("pack_uint"); /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":523 @@ -4551,7 +4490,7 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_pack_uint(struct __pyx_o * * if x >= maxint: */ - __pyx_v_maxint <<= ((unsigned long)(__pyx_v_num_bytes * 8)); + __pyx_v_maxint = (__pyx_v_maxint << ((unsigned long)(__pyx_v_num_bytes * 8))); /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":528 * maxint <<= (num_bytes * 8) @@ -4570,16 +4509,10 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_pack_uint(struct __pyx_o * * cdef char *buf = malloc(num_bytes) */ - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_builtin_OverflowError, ((PyObject *)__pyx_k_tuple_9), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_5)); - PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_kp_s_5)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_5)); - __pyx_t_3 = PyObject_Call(__pyx_builtin_OverflowError, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_Raise(__pyx_t_2, 0, 0); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __Pyx_Raise(__pyx_t_3, 0, 0); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L4; } @@ -4614,7 +4547,7 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_pack_uint(struct __pyx_o * * cdef long i = num_bytes */ - __pyx_t_4 = PyErr_NoMemory(); if (unlikely(__pyx_t_4 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 534; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyErr_NoMemory(); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 534; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L5; } __pyx_L5:; @@ -4656,7 +4589,7 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_pack_uint(struct __pyx_o * buf[i] = x * x >>= 8 */ - __pyx_v_i -= 1; + __pyx_v_i = (__pyx_v_i - 1); /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":541 * while i > 0: @@ -4674,7 +4607,7 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_pack_uint(struct __pyx_o * else: * while i > 0: */ - __pyx_v_x >>= 8; + __pyx_v_x = (__pyx_v_x >> 8); } goto __pyx_L6; } @@ -4707,7 +4640,7 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_pack_uint(struct __pyx_o * x >>= 8 * */ - __pyx_v_i -= 1; + __pyx_v_i = (__pyx_v_i - 1); /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":547 * buf[num_bytes - i] = x @@ -4716,7 +4649,7 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_pack_uint(struct __pyx_o * * try: */ - __pyx_v_x >>= 8; + __pyx_v_x = (__pyx_v_x >> 8); } } __pyx_L6:; @@ -4737,7 +4670,7 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_pack_uint(struct __pyx_o * finally: * free(buf) */ - __pyx_t_5 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self->__pyx_vtab)->write(__pyx_v_self, __pyx_v_buf, __pyx_v_num_bytes); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 550; __pyx_clineno = __LINE__; goto __pyx_L12;} + __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self->__pyx_vtab)->write(__pyx_v_self, __pyx_v_buf, __pyx_v_num_bytes); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 550; __pyx_clineno = __LINE__; goto __pyx_L12;} } /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":552 @@ -4756,7 +4689,6 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_pack_uint(struct __pyx_o __pyx_L12: { __pyx_why = 4; __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_ErrFetch(&__pyx_exc_type, &__pyx_exc_value, &__pyx_exc_tb); __pyx_exc_lineno = __pyx_lineno; goto __pyx_L13; @@ -4789,7 +4721,6 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_pack_uint(struct __pyx_o goto __pyx_L0; __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_2); - __Pyx_XDECREF(__pyx_t_3); __Pyx_AddTraceback("cpyamf.util.cBufferedByteStream.pack_uint"); __pyx_r = -1; __pyx_L0:; @@ -5417,7 +5348,7 @@ static long __pyx_f_6cpyamf_4util_19cBufferedByteStream_read_24bit_int(struct _ * * return x */ - __pyx_v_x |= (~0xffffff); + __pyx_v_x = (__pyx_v_x | (~0xffffff)); goto __pyx_L3; } __pyx_L3:; @@ -5605,6 +5536,7 @@ static long __pyx_f_6cpyamf_4util_19cBufferedByteStream_read_long(struct __pyx_ PyObject *__pyx_t_2 = NULL; long __pyx_t_3; int __pyx_t_4; + int __pyx_t_5; __Pyx_RefNannySetupContext("read_long"); /* Check if called by wrapper */ if (unlikely(__pyx_skip_dispatch)) ; @@ -5649,8 +5581,14 @@ static long __pyx_f_6cpyamf_4util_19cBufferedByteStream_read_long(struct __pyx_ * x |= ~0x7fffffff * */ - __pyx_t_3 = (__pyx_v_x & 0x80000000); - if (__pyx_t_3) { + __pyx_t_1 = PyInt_FromLong(__pyx_v_x); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 637; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_1); + __pyx_t_2 = PyNumber_And(__pyx_t_1, __pyx_int_2147483648); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 637; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_2); + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 637; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + if (__pyx_t_5) { /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":638 * @@ -5659,7 +5597,7 @@ static long __pyx_f_6cpyamf_4util_19cBufferedByteStream_read_long(struct __pyx_ * * return x */ - __pyx_v_x |= (~0x7fffffff); + __pyx_v_x = (__pyx_v_x | (~0x7fffffff)); goto __pyx_L3; } __pyx_L3:; @@ -5747,13 +5685,13 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_write_uchar(struct __pyx __pyx_t_2 = PyInt_FromLong(__pyx_v_ret); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 642; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 642; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2); __Pyx_GIVEREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_Call(__pyx_t_1, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 642; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 642; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; __pyx_t_4 = __Pyx_PyInt_AsInt(__pyx_t_2); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 642; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_r = __pyx_t_4; @@ -5858,13 +5796,13 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_write_char(struct __pyx_ __pyx_t_2 = PyInt_FromLong(__pyx_v_ret); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 651; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 651; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2); __Pyx_GIVEREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_Call(__pyx_t_1, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 651; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 651; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; __pyx_t_4 = __Pyx_PyInt_AsInt(__pyx_t_2); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 651; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_r = __pyx_t_4; @@ -5969,13 +5907,13 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_write_ushort(struct __py __pyx_t_2 = PyInt_FromLong(__pyx_v_ret); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 660; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 660; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2); __Pyx_GIVEREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_Call(__pyx_t_1, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 660; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 660; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; __pyx_t_4 = __Pyx_PyInt_AsInt(__pyx_t_2); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 660; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_r = __pyx_t_4; @@ -6080,13 +6018,13 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_write_short(struct __pyx __pyx_t_2 = PyInt_FromLong(__pyx_v_ret); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 669; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 669; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2); __Pyx_GIVEREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_Call(__pyx_t_1, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 669; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 669; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; __pyx_t_4 = __Pyx_PyInt_AsInt(__pyx_t_2); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 669; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_r = __pyx_t_4; @@ -6191,13 +6129,13 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_write_ulong(struct __pyx __pyx_t_2 = PyLong_FromUnsignedLong(__pyx_v_ret); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 678; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 678; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2); __Pyx_GIVEREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_Call(__pyx_t_1, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 678; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 678; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; __pyx_t_4 = __Pyx_PyInt_AsInt(__pyx_t_2); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 678; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_r = __pyx_t_4; @@ -6302,13 +6240,13 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_write_long(struct __pyx_ __pyx_t_2 = PyInt_FromLong(__pyx_v_ret); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 687; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 687; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2); __Pyx_GIVEREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_Call(__pyx_t_1, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 687; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 687; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; __pyx_t_4 = __Pyx_PyInt_AsInt(__pyx_t_2); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 687; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_r = __pyx_t_4; @@ -6413,13 +6351,13 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_write_24bit_uint(struct __pyx_t_2 = PyLong_FromUnsignedLong(__pyx_v_ret); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 696; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 696; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2); __Pyx_GIVEREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_Call(__pyx_t_1, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 696; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 696; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; __pyx_t_4 = __Pyx_PyInt_AsInt(__pyx_t_2); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 696; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_r = __pyx_t_4; @@ -6524,13 +6462,13 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_write_24bit_int(struct _ __pyx_t_2 = PyInt_FromLong(__pyx_v_ret); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 705; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 705; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2); __Pyx_GIVEREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_Call(__pyx_t_1, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 705; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 705; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; __pyx_t_4 = __Pyx_PyInt_AsInt(__pyx_t_2); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 705; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_r = __pyx_t_4; @@ -6640,13 +6578,13 @@ static PyObject *__pyx_f_6cpyamf_4util_19cBufferedByteStream_read_utf8_string(s __pyx_t_2 = PyInt_FromSsize_t(__pyx_v_l); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 714; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 714; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2); __Pyx_GIVEREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_Call(__pyx_t_1, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 714; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 714; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; __pyx_r = __pyx_t_2; __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; @@ -6810,13 +6748,13 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_write_utf8_string(struct __Pyx_GOTREF(__pyx_t_1); if (!PyCFunction_Check(__pyx_t_1) || (PyCFunction_GET_FUNCTION(__pyx_t_1) != (void *)&__pyx_pf_6cpyamf_4util_19cBufferedByteStream_write_utf8_string)) { __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_v_obj); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_obj); __Pyx_GIVEREF(__pyx_v_obj); - __pyx_t_3 = PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __pyx_t_4 = __Pyx_PyInt_AsInt(__pyx_t_3); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_r = __pyx_t_4; @@ -6900,16 +6838,10 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_write_utf8_string(struct * * PyString_AsStringAndSize(encoded_string, &buf, &l) */ - __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 747; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_Call(__pyx_builtin_TypeError, ((PyObject *)__pyx_k_tuple_11), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 747; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_6)); - PyTuple_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_kp_s_6)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_6)); - __pyx_t_3 = PyObject_Call(__pyx_builtin_TypeError, __pyx_t_1, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 747; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_Raise(__pyx_t_1, 0, 0); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __Pyx_Raise(__pyx_t_3, 0, 0); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; {__pyx_filename = __pyx_f[0]; __pyx_lineno = 747; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } __pyx_L3:; @@ -7393,13 +7325,13 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_write_double(struct __py __pyx_t_2 = PyFloat_FromDouble(__pyx_v_val); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 802; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 802; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2); __Pyx_GIVEREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_Call(__pyx_t_1, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 802; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 802; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; __pyx_t_4 = __Pyx_PyInt_AsInt(__pyx_t_2); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 802; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_r = __pyx_t_4; @@ -7899,13 +7831,13 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_write_float(struct __pyx __pyx_t_2 = PyFloat_FromDouble(__pyx_v_c); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 865; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 865; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2); __Pyx_GIVEREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_Call(__pyx_t_1, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 865; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 865; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; __pyx_t_4 = __Pyx_PyInt_AsInt(__pyx_t_2); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 865; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_r = __pyx_t_4; @@ -8113,13 +8045,13 @@ static int __pyx_f_6cpyamf_4util_19cBufferedByteStream_append(struct __pyx_obj_ __Pyx_GOTREF(__pyx_t_1); if (!PyCFunction_Check(__pyx_t_1) || (PyCFunction_GET_FUNCTION(__pyx_t_1) != (void *)&__pyx_pf_6cpyamf_4util_19cBufferedByteStream_append)) { __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 889; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_v_obj); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_obj); __Pyx_GIVEREF(__pyx_v_obj); - __pyx_t_3 = PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 889; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 889; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __pyx_t_4 = __Pyx_PyInt_AsInt(__pyx_t_3); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 889; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_r = __pyx_t_4; @@ -8411,14 +8343,14 @@ static int __pyx_pf_6cpyamf_4util_18BufferedByteStream___init__(PyObject *__pyx_ __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4util_cBufferedByteStream *)__pyx_v_x->__pyx_vtab)->getvalue(__pyx_v_x, 0); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 923; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 923; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); + __Pyx_GOTREF(((PyObject *)__pyx_t_5)); PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_4); __Pyx_GIVEREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = PyObject_Call(__pyx_t_3, __pyx_t_5, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 923; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 923; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; goto __pyx_L6; } @@ -8452,14 +8384,14 @@ static int __pyx_pf_6cpyamf_4util_18BufferedByteStream___init__(PyObject *__pyx_ __pyx_t_4 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s__write); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); + __Pyx_GOTREF(((PyObject *)__pyx_t_5)); __Pyx_INCREF(__pyx_v_buf); PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_v_buf); __Pyx_GIVEREF(__pyx_v_buf); - __pyx_t_3 = PyObject_Call(__pyx_t_4, __pyx_t_5, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_t_4, ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; goto __pyx_L6; } @@ -8489,14 +8421,14 @@ static int __pyx_pf_6cpyamf_4util_18BufferedByteStream___init__(PyObject *__pyx_ __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 927; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); + __Pyx_GOTREF(((PyObject *)__pyx_t_5)); PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_4); __Pyx_GIVEREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = PyObject_Call(__pyx_t_3, __pyx_t_5, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 927; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 927; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; goto __pyx_L6; } @@ -8548,16 +8480,10 @@ static int __pyx_pf_6cpyamf_4util_18BufferedByteStream___init__(PyObject *__pyx_ */ __pyx_t_5 = PyObject_GetAttr(__pyx_v_buf, __pyx_n_s__seek); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyObject_Call(__pyx_t_5, ((PyObject *)__pyx_k_tuple_12), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); - __Pyx_INCREF(__pyx_int_0); - PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_int_0); - __Pyx_GIVEREF(__pyx_int_0); - __pyx_t_3 = PyObject_Call(__pyx_t_5, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":931 * old_pos = buf.tell() @@ -8566,23 +8492,23 @@ static int __pyx_pf_6cpyamf_4util_18BufferedByteStream___init__(PyObject *__pyx_ * buf.seek(old_pos) * else: */ - __pyx_t_3 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s__write); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 931; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); - __pyx_t_4 = PyObject_GetAttr(__pyx_v_buf, __pyx_n_s__read); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 931; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s__write); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 931; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); - __pyx_t_5 = PyObject_Call(__pyx_t_4, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 931; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyObject_GetAttr(__pyx_v_buf, __pyx_n_s__read); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 931; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); + __pyx_t_3 = PyObject_Call(__pyx_t_5, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 931; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_3); + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 931; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_5)); + PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_3); + __Pyx_GIVEREF(__pyx_t_3); + __pyx_t_3 = 0; + __pyx_t_3 = PyObject_Call(__pyx_t_4, ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 931; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 931; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); - PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_5); - __Pyx_GIVEREF(__pyx_t_5); - __pyx_t_5 = 0; - __pyx_t_5 = PyObject_Call(__pyx_t_3, __pyx_t_4, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 931; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); + __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":932 * buf.seek(0) @@ -8591,18 +8517,18 @@ static int __pyx_pf_6cpyamf_4util_18BufferedByteStream___init__(PyObject *__pyx_ * else: * raise TypeError("Unable to coerce buf->StringIO") */ - __pyx_t_5 = PyObject_GetAttr(__pyx_v_buf, __pyx_n_s__seek); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 932; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 932; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); + __pyx_t_3 = PyObject_GetAttr(__pyx_v_buf, __pyx_n_s__seek); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 932; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_3); + __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 932; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_5)); __Pyx_INCREF(__pyx_v_old_pos); - PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_v_old_pos); + PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_v_old_pos); __Pyx_GIVEREF(__pyx_v_old_pos); - __pyx_t_3 = PyObject_Call(__pyx_t_5, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 932; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __pyx_t_4 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 932; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; goto __pyx_L6; } /*else*/ { @@ -8614,14 +8540,8 @@ static int __pyx_pf_6cpyamf_4util_18BufferedByteStream___init__(PyObject *__pyx_ * * self.seek(0) */ - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 934; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_7)); - PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_kp_s_7)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_7)); - __pyx_t_4 = PyObject_Call(__pyx_builtin_TypeError, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 934; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyObject_Call(__pyx_builtin_TypeError, ((PyObject *)__pyx_k_tuple_14), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 934; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_Raise(__pyx_t_4, 0, 0); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; {__pyx_filename = __pyx_f[0]; __pyx_lineno = 934; __pyx_clineno = __LINE__; goto __pyx_L1_error;} @@ -8688,16 +8608,10 @@ static int __pyx_pf_6cpyamf_4util_18BufferedByteStream_6endian___set__(PyObject * * if value not in [ENDIAN_NETWORK, ENDIAN_NATIVE, ENDIAN_LITTLE, ENDIAN_BIG]: */ - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 941; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_builtin_TypeError, ((PyObject *)__pyx_k_tuple_16), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 941; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_8)); - PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_kp_s_8)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_8)); - __pyx_t_3 = PyObject_Call(__pyx_builtin_TypeError, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 941; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_Raise(__pyx_t_2, 0, 0); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __Pyx_Raise(__pyx_t_3, 0, 0); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; {__pyx_filename = __pyx_f[0]; __pyx_lineno = 941; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L5; } @@ -8711,43 +8625,43 @@ static int __pyx_pf_6cpyamf_4util_18BufferedByteStream_6endian___set__(PyObject * */ __Pyx_INCREF(__pyx_v_value); - __pyx_t_3 = __pyx_v_value; - __pyx_t_2 = PyObject_RichCompare(__pyx_t_3, ((PyObject *)__pyx_kp_b_9), Py_NE); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 943; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 943; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __pyx_t_2 = __pyx_v_value; + __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, ((PyObject *)__pyx_kp_b_17), Py_NE); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 943; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_3); + __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 943; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_t_4 = __pyx_t_1; if (__pyx_t_4) { - __pyx_t_2 = PyObject_RichCompare(__pyx_t_3, ((PyObject *)__pyx_kp_b_10), Py_NE); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 943; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 943; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, ((PyObject *)__pyx_kp_b_18), Py_NE); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 943; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_3); + __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 943; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_t_5 = __pyx_t_1; __pyx_t_1 = __pyx_t_5; } else { __pyx_t_1 = __pyx_t_4; } if (__pyx_t_1) { - __pyx_t_2 = PyObject_RichCompare(__pyx_t_3, ((PyObject *)__pyx_kp_b_11), Py_NE); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 943; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 943; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, ((PyObject *)__pyx_kp_b_19), Py_NE); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 943; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_3); + __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 943; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_t_5 = __pyx_t_4; __pyx_t_4 = __pyx_t_5; } else { __pyx_t_4 = __pyx_t_1; } if (__pyx_t_4) { - __pyx_t_2 = PyObject_RichCompare(__pyx_t_3, ((PyObject *)__pyx_kp_b_12), Py_NE); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 943; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 943; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, ((PyObject *)__pyx_kp_b_20), Py_NE); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 943; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_3); + __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 943; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_t_5 = __pyx_t_1; __pyx_t_1 = __pyx_t_5; } else { __pyx_t_1 = __pyx_t_4; } - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_t_4 = __pyx_t_1; if (__pyx_t_4) { @@ -8758,14 +8672,8 @@ static int __pyx_pf_6cpyamf_4util_18BufferedByteStream_6endian___set__(PyObject * * self.endian = PyString_AsString(value)[0] */ - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 944; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_13)); - PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_kp_s_13)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_13)); - __pyx_t_2 = PyObject_Call(__pyx_builtin_ValueError, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 944; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_k_tuple_22), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 944; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_Raise(__pyx_t_2, 0, 0); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; {__pyx_filename = __pyx_f[0]; __pyx_lineno = 944; __pyx_clineno = __LINE__; goto __pyx_L1_error;} @@ -9303,9 +9211,8 @@ static PyObject *__pyx_pf_6cpyamf_4util_18BufferedByteStream_write_char(PyObject int __pyx_t_2; int __pyx_t_3; PyObject *__pyx_t_4 = NULL; - PyObject *__pyx_t_5 = NULL; - char __pyx_t_6; - int __pyx_t_7; + char __pyx_t_5; + int __pyx_t_6; __Pyx_RefNannySetupContext("write_char"); /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":1019 @@ -9331,16 +9238,10 @@ static PyObject *__pyx_pf_6cpyamf_4util_18BufferedByteStream_write_char(PyObject * * cBufferedByteStream.write_char(self, x) */ - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1020; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyObject_Call(__pyx_builtin_TypeError, ((PyObject *)__pyx_k_tuple_24), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1020; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_14)); - PyTuple_SET_ITEM(__pyx_t_4, 0, ((PyObject *)__pyx_kp_s_14)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_14)); - __pyx_t_5 = PyObject_Call(__pyx_builtin_TypeError, __pyx_t_4, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1020; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); + __Pyx_Raise(__pyx_t_4, 0, 0); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __Pyx_Raise(__pyx_t_5, 0, 0); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1020; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L5; } @@ -9353,14 +9254,13 @@ static PyObject *__pyx_pf_6cpyamf_4util_18BufferedByteStream_write_char(PyObject * * def write_ushort(self, x): */ - __pyx_t_6 = __Pyx_PyInt_AsChar(__pyx_v_x); if (unlikely((__pyx_t_6 == (char)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1022; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_t_7 = __pyx_vtabptr_6cpyamf_4util_cBufferedByteStream->write_char(((struct __pyx_obj_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self), __pyx_t_6, 1); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1022; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyInt_AsChar(__pyx_v_x); if (unlikely((__pyx_t_5 == (char)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1022; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __pyx_vtabptr_6cpyamf_4util_cBufferedByteStream->write_char(((struct __pyx_obj_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self), __pyx_t_5, 1); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1022; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_4); - __Pyx_XDECREF(__pyx_t_5); __Pyx_AddTraceback("cpyamf.util.BufferedByteStream.write_char"); __pyx_r = NULL; __pyx_L0:; @@ -9385,9 +9285,8 @@ static PyObject *__pyx_pf_6cpyamf_4util_18BufferedByteStream_write_ushort(PyObje int __pyx_t_2; int __pyx_t_3; PyObject *__pyx_t_4 = NULL; - PyObject *__pyx_t_5 = NULL; - unsigned short __pyx_t_6; - int __pyx_t_7; + unsigned short __pyx_t_5; + int __pyx_t_6; __Pyx_RefNannySetupContext("write_ushort"); /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":1032 @@ -9413,16 +9312,10 @@ static PyObject *__pyx_pf_6cpyamf_4util_18BufferedByteStream_write_ushort(PyObje * * cBufferedByteStream.write_ushort(self, x) */ - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1033; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyObject_Call(__pyx_builtin_TypeError, ((PyObject *)__pyx_k_tuple_25), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1033; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_14)); - PyTuple_SET_ITEM(__pyx_t_4, 0, ((PyObject *)__pyx_kp_s_14)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_14)); - __pyx_t_5 = PyObject_Call(__pyx_builtin_TypeError, __pyx_t_4, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1033; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); + __Pyx_Raise(__pyx_t_4, 0, 0); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __Pyx_Raise(__pyx_t_5, 0, 0); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1033; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L5; } @@ -9435,14 +9328,13 @@ static PyObject *__pyx_pf_6cpyamf_4util_18BufferedByteStream_write_ushort(PyObje * * def write_short(self, x): */ - __pyx_t_6 = __Pyx_PyInt_AsUnsignedShort(__pyx_v_x); if (unlikely((__pyx_t_6 == (unsigned short)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1035; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_t_7 = __pyx_vtabptr_6cpyamf_4util_cBufferedByteStream->write_ushort(((struct __pyx_obj_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self), __pyx_t_6, 1); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1035; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyInt_AsUnsignedShort(__pyx_v_x); if (unlikely((__pyx_t_5 == (unsigned short)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1035; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __pyx_vtabptr_6cpyamf_4util_cBufferedByteStream->write_ushort(((struct __pyx_obj_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self), __pyx_t_5, 1); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1035; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_4); - __Pyx_XDECREF(__pyx_t_5); __Pyx_AddTraceback("cpyamf.util.BufferedByteStream.write_ushort"); __pyx_r = NULL; __pyx_L0:; @@ -9467,9 +9359,8 @@ static PyObject *__pyx_pf_6cpyamf_4util_18BufferedByteStream_write_short(PyObjec int __pyx_t_2; int __pyx_t_3; PyObject *__pyx_t_4 = NULL; - PyObject *__pyx_t_5 = NULL; - short __pyx_t_6; - int __pyx_t_7; + short __pyx_t_5; + int __pyx_t_6; __Pyx_RefNannySetupContext("write_short"); /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":1045 @@ -9495,16 +9386,10 @@ static PyObject *__pyx_pf_6cpyamf_4util_18BufferedByteStream_write_short(PyObjec * * cBufferedByteStream.write_short(self, x) */ - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1046; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyObject_Call(__pyx_builtin_TypeError, ((PyObject *)__pyx_k_tuple_26), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1046; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_14)); - PyTuple_SET_ITEM(__pyx_t_4, 0, ((PyObject *)__pyx_kp_s_14)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_14)); - __pyx_t_5 = PyObject_Call(__pyx_builtin_TypeError, __pyx_t_4, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1046; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); + __Pyx_Raise(__pyx_t_4, 0, 0); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __Pyx_Raise(__pyx_t_5, 0, 0); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1046; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L5; } @@ -9517,14 +9402,13 @@ static PyObject *__pyx_pf_6cpyamf_4util_18BufferedByteStream_write_short(PyObjec * * def write_ulong(self, x): */ - __pyx_t_6 = __Pyx_PyInt_AsShort(__pyx_v_x); if (unlikely((__pyx_t_6 == (short)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1048; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_t_7 = __pyx_vtabptr_6cpyamf_4util_cBufferedByteStream->write_short(((struct __pyx_obj_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self), __pyx_t_6, 1); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1048; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyInt_AsShort(__pyx_v_x); if (unlikely((__pyx_t_5 == (short)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1048; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __pyx_vtabptr_6cpyamf_4util_cBufferedByteStream->write_short(((struct __pyx_obj_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self), __pyx_t_5, 1); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1048; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_4); - __Pyx_XDECREF(__pyx_t_5); __Pyx_AddTraceback("cpyamf.util.BufferedByteStream.write_short"); __pyx_r = NULL; __pyx_L0:; @@ -9549,9 +9433,8 @@ static PyObject *__pyx_pf_6cpyamf_4util_18BufferedByteStream_write_ulong(PyObjec int __pyx_t_2; int __pyx_t_3; PyObject *__pyx_t_4 = NULL; - PyObject *__pyx_t_5 = NULL; - unsigned long __pyx_t_6; - int __pyx_t_7; + unsigned long __pyx_t_5; + int __pyx_t_6; __Pyx_RefNannySetupContext("write_ulong"); /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":1058 @@ -9577,16 +9460,10 @@ static PyObject *__pyx_pf_6cpyamf_4util_18BufferedByteStream_write_ulong(PyObjec * * if x > 4294967295L or x < 0: */ - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1059; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyObject_Call(__pyx_builtin_TypeError, ((PyObject *)__pyx_k_tuple_27), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1059; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_14)); - PyTuple_SET_ITEM(__pyx_t_4, 0, ((PyObject *)__pyx_kp_s_14)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_14)); - __pyx_t_5 = PyObject_Call(__pyx_builtin_TypeError, __pyx_t_4, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1059; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); + __Pyx_Raise(__pyx_t_4, 0, 0); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __Pyx_Raise(__pyx_t_5, 0, 0); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1059; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L5; } @@ -9599,15 +9476,15 @@ static PyObject *__pyx_pf_6cpyamf_4util_18BufferedByteStream_write_ulong(PyObjec * raise OverflowError * */ - __pyx_t_5 = PyObject_RichCompare(__pyx_v_x, __pyx_int_4294967295L, Py_GT); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1061; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1061; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + __pyx_t_4 = PyObject_RichCompare(__pyx_v_x, __pyx_int_4294967295L, Py_GT); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1061; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_4); + __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1061; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; if (!__pyx_t_3) { - __pyx_t_5 = PyObject_RichCompare(__pyx_v_x, __pyx_int_0, Py_LT); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1061; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1061; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + __pyx_t_4 = PyObject_RichCompare(__pyx_v_x, __pyx_int_0, Py_LT); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1061; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_4); + __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1061; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __pyx_t_2 = __pyx_t_1; } else { __pyx_t_2 = __pyx_t_3; @@ -9634,14 +9511,13 @@ static PyObject *__pyx_pf_6cpyamf_4util_18BufferedByteStream_write_ulong(PyObjec * * def read_double(self): */ - __pyx_t_6 = __Pyx_PyInt_AsUnsignedLong(__pyx_v_x); if (unlikely((__pyx_t_6 == (unsigned long)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1064; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_t_7 = __pyx_vtabptr_6cpyamf_4util_cBufferedByteStream->write_ulong(((struct __pyx_obj_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self), __pyx_t_6, 1); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1064; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyInt_AsUnsignedLong(__pyx_v_x); if (unlikely((__pyx_t_5 == (unsigned long)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1064; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __pyx_vtabptr_6cpyamf_4util_cBufferedByteStream->write_ulong(((struct __pyx_obj_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self), __pyx_t_5, 1); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1064; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_4); - __Pyx_XDECREF(__pyx_t_5); __Pyx_AddTraceback("cpyamf.util.BufferedByteStream.write_ulong"); __pyx_r = NULL; __pyx_L0:; @@ -9805,10 +9681,9 @@ static PyObject *__pyx_pf_6cpyamf_4util_18BufferedByteStream_write_double(PyObje PyObject *__pyx_r = NULL; int __pyx_t_1; PyObject *__pyx_t_2 = NULL; - PyObject *__pyx_t_3 = NULL; - double __pyx_t_4; - PyObject *__pyx_t_5; - int __pyx_t_6; + double __pyx_t_3; + PyObject *__pyx_t_4; + int __pyx_t_5; __Pyx_RefNannySetupContext("write_double"); /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":1092 @@ -9828,16 +9703,10 @@ static PyObject *__pyx_pf_6cpyamf_4util_18BufferedByteStream_write_double(PyObje * * cdef double d = val */ - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1093; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_builtin_TypeError, ((PyObject *)__pyx_k_tuple_29), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1093; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_15)); - PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_kp_s_15)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_15)); - __pyx_t_3 = PyObject_Call(__pyx_builtin_TypeError, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1093; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __Pyx_Raise(__pyx_t_2, 0, 0); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __Pyx_Raise(__pyx_t_3, 0, 0); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1093; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L5; } @@ -9850,8 +9719,8 @@ static PyObject *__pyx_pf_6cpyamf_4util_18BufferedByteStream_write_double(PyObje * * if float_broken == 1: */ - __pyx_t_4 = __pyx_PyFloat_AsDouble(__pyx_v_val); if (unlikely((__pyx_t_4 == (double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_v_d = __pyx_t_4; + __pyx_t_3 = __pyx_PyFloat_AsDouble(__pyx_v_val); if (unlikely((__pyx_t_3 == (double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_v_d = __pyx_t_3; /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":1097 * cdef double d = val @@ -9974,7 +9843,7 @@ static PyObject *__pyx_pf_6cpyamf_4util_18BufferedByteStream_write_double(PyObje * else: * if is_big_endian(self.endian): */ - __pyx_t_5 = PyErr_NoMemory(); if (unlikely(__pyx_t_5 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1109; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyErr_NoMemory(); if (unlikely(__pyx_t_4 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1109; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L11; } __pyx_L11:; @@ -10012,7 +9881,7 @@ static PyObject *__pyx_pf_6cpyamf_4util_18BufferedByteStream_write_double(PyObje * * cBufferedByteStream.write(self, &d, 8) */ - __pyx_t_5 = PyErr_NoMemory(); if (unlikely(__pyx_t_5 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1113; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyErr_NoMemory(); if (unlikely(__pyx_t_4 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1113; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L13; } __pyx_L13:; @@ -10029,7 +9898,7 @@ static PyObject *__pyx_pf_6cpyamf_4util_18BufferedByteStream_write_double(PyObje * * return */ - __pyx_t_6 = __pyx_vtabptr_6cpyamf_4util_cBufferedByteStream->write(((struct __pyx_obj_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self), ((char *)(&__pyx_v_d)), 8); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1115; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __pyx_vtabptr_6cpyamf_4util_cBufferedByteStream->write(((struct __pyx_obj_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self), ((char *)(&__pyx_v_d)), 8); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1115; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":1117 * cBufferedByteStream.write(self, &d, 8) @@ -10055,13 +9924,12 @@ static PyObject *__pyx_pf_6cpyamf_4util_18BufferedByteStream_write_double(PyObje * * def read_float(self): */ - __pyx_t_6 = __pyx_vtabptr_6cpyamf_4util_cBufferedByteStream->write_double(((struct __pyx_obj_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self), __pyx_v_d, 1); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1119; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __pyx_vtabptr_6cpyamf_4util_cBufferedByteStream->write_double(((struct __pyx_obj_6cpyamf_4util_cBufferedByteStream *)__pyx_v_self), __pyx_v_d, 1); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1119; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_2); - __Pyx_XDECREF(__pyx_t_3); __Pyx_AddTraceback("cpyamf.util.BufferedByteStream.write_double"); __pyx_r = NULL; __pyx_L0:; @@ -10139,9 +10007,9 @@ static PyObject *__pyx_pf_6cpyamf_4util_18BufferedByteStream___add__(PyObject *_ PyObject *__pyx_t_1 = NULL; PyObject *__pyx_t_2 = NULL; Py_ssize_t __pyx_t_3; - PyObject *__pyx_t_4 = NULL; - int __pyx_t_5; - struct __pyx_opt_args_6cpyamf_4util_19cBufferedByteStream_seek __pyx_t_6; + int __pyx_t_4; + struct __pyx_opt_args_6cpyamf_4util_19cBufferedByteStream_seek __pyx_t_5; + PyObject *__pyx_t_6 = NULL; __Pyx_RefNannySetupContext("__add__"); __pyx_v_new = ((struct __pyx_obj_6cpyamf_4util_BufferedByteStream *)Py_None); __Pyx_INCREF(Py_None); @@ -10185,13 +10053,13 @@ static PyObject *__pyx_pf_6cpyamf_4util_18BufferedByteStream___add__(PyObject *_ * other.seek(0) */ __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1135; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); + __Pyx_GOTREF(((PyObject *)__pyx_t_1)); __Pyx_INCREF(__pyx_v_self); PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_self); __Pyx_GIVEREF(__pyx_v_self); - __pyx_t_2 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_6cpyamf_4util_BufferedByteStream)), __pyx_t_1, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1135; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_6cpyamf_4util_BufferedByteStream)), ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1135; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0; __Pyx_DECREF(((PyObject *)__pyx_v_new)); __pyx_v_new = ((struct __pyx_obj_6cpyamf_4util_BufferedByteStream *)__pyx_t_2); __pyx_t_2 = 0; @@ -10205,16 +10073,10 @@ static PyObject *__pyx_pf_6cpyamf_4util_18BufferedByteStream___add__(PyObject *_ */ __pyx_t_2 = PyObject_GetAttr(__pyx_v_other, __pyx_n_s__seek); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_k_tuple_30), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); - __Pyx_INCREF(__pyx_int_0); - PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_int_0); - __Pyx_GIVEREF(__pyx_int_0); - __pyx_t_4 = PyObject_Call(__pyx_t_2, __pyx_t_1, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":1138 * @@ -10223,9 +10085,9 @@ static PyObject *__pyx_pf_6cpyamf_4util_18BufferedByteStream___add__(PyObject *_ * new.write(other.read()) * */ - __pyx_t_6.__pyx_n = 1; - __pyx_t_6.mode = 2; - __pyx_t_5 = ((struct __pyx_vtabstruct_6cpyamf_4util_BufferedByteStream *)__pyx_v_new->__pyx_base.__pyx_vtab)->__pyx_base.seek(((struct __pyx_obj_6cpyamf_4util_cBufferedByteStream *)__pyx_v_new), 0, 0, &__pyx_t_6); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1138; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5.__pyx_n = 1; + __pyx_t_5.mode = 2; + __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4util_BufferedByteStream *)__pyx_v_new->__pyx_base.__pyx_vtab)->__pyx_base.seek(((struct __pyx_obj_6cpyamf_4util_cBufferedByteStream *)__pyx_v_new), 0, 0, &__pyx_t_5); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1138; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":1139 * other.seek(0) @@ -10234,23 +10096,23 @@ static PyObject *__pyx_pf_6cpyamf_4util_18BufferedByteStream___add__(PyObject *_ * * self.seek(old_pos) */ - __pyx_t_4 = PyObject_GetAttr(((PyObject *)__pyx_v_new), __pyx_n_s__write); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1139; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); - __pyx_t_1 = PyObject_GetAttr(__pyx_v_other, __pyx_n_s__read); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1139; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_GetAttr(((PyObject *)__pyx_v_new), __pyx_n_s__write); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1139; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1139; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_GetAttr(__pyx_v_other, __pyx_n_s__read); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1139; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1139; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_2); - __Pyx_GIVEREF(__pyx_t_2); - __pyx_t_2 = 0; - __pyx_t_2 = PyObject_Call(__pyx_t_4, __pyx_t_1, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1139; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_6 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1139; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1139; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); + PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_6); + __Pyx_GIVEREF(__pyx_t_6); + __pyx_t_6 = 0; + __pyx_t_6 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1139; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_6); + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; + __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":1141 * new.write(other.read()) @@ -10259,20 +10121,20 @@ static PyObject *__pyx_pf_6cpyamf_4util_18BufferedByteStream___add__(PyObject *_ * other.seek(old_other_pos) * new.seek(0) */ - __pyx_t_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s__seek); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1141; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s__seek); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1141; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_6); + __pyx_t_2 = PyInt_FromSsize_t(__pyx_v_old_pos); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1141; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __pyx_t_1 = PyInt_FromSsize_t(__pyx_v_old_pos); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1141; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1141; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); - PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_1); - __Pyx_GIVEREF(__pyx_t_1); - __pyx_t_1 = 0; - __pyx_t_1 = PyObject_Call(__pyx_t_2, __pyx_t_4, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1141; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); + __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1141; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_1)); + PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_2); + __Pyx_GIVEREF(__pyx_t_2); + __pyx_t_2 = 0; + __pyx_t_2 = PyObject_Call(__pyx_t_6, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1141; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_2); + __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":1142 * @@ -10281,20 +10143,20 @@ static PyObject *__pyx_pf_6cpyamf_4util_18BufferedByteStream___add__(PyObject *_ * new.seek(0) * */ - __pyx_t_1 = PyObject_GetAttr(__pyx_v_other, __pyx_n_s__seek); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1142; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __pyx_t_4 = PyInt_FromSsize_t(__pyx_v_old_other_pos); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1142; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1142; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_GetAttr(__pyx_v_other, __pyx_n_s__seek); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1142; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_4); - __Pyx_GIVEREF(__pyx_t_4); - __pyx_t_4 = 0; - __pyx_t_4 = PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1142; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_1 = PyInt_FromSsize_t(__pyx_v_old_other_pos); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1142; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_1); + __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1142; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_6)); + PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_1); + __Pyx_GIVEREF(__pyx_t_1); + __pyx_t_1 = 0; + __pyx_t_1 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_6), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1142; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __Pyx_DECREF(((PyObject *)__pyx_t_6)); __pyx_t_6 = 0; + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":1143 * self.seek(old_pos) @@ -10303,7 +10165,7 @@ static PyObject *__pyx_pf_6cpyamf_4util_18BufferedByteStream___add__(PyObject *_ * * return new */ - __pyx_t_5 = ((struct __pyx_vtabstruct_6cpyamf_4util_BufferedByteStream *)__pyx_v_new->__pyx_base.__pyx_vtab)->__pyx_base.seek(((struct __pyx_obj_6cpyamf_4util_cBufferedByteStream *)__pyx_v_new), 0, 0, NULL); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1143; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = ((struct __pyx_vtabstruct_6cpyamf_4util_BufferedByteStream *)__pyx_v_new->__pyx_base.__pyx_vtab)->__pyx_base.seek(((struct __pyx_obj_6cpyamf_4util_cBufferedByteStream *)__pyx_v_new), 0, 0, NULL); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1143; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":1145 * new.seek(0) @@ -10322,7 +10184,7 @@ static PyObject *__pyx_pf_6cpyamf_4util_18BufferedByteStream___add__(PyObject *_ __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_1); __Pyx_XDECREF(__pyx_t_2); - __Pyx_XDECREF(__pyx_t_4); + __Pyx_XDECREF(__pyx_t_6); __Pyx_AddTraceback("cpyamf.util.BufferedByteStream.__add__"); __pyx_r = NULL; __pyx_L0:; @@ -10552,7 +10414,7 @@ PyTypeObject __pyx_type_6cpyamf_4util_cBufferedByteStream = { 0, /*tp_getattro*/ 0, /*tp_setattro*/ &__pyx_tp_as_buffer_cBufferedByteStream, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_NEWBUFFER, /*tp_flags*/ + Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE, /*tp_flags*/ __Pyx_DOCSTR("\n A file like object that can be read/written to. Supports data type\n specific reads/writes (e.g. ints, longs, floats etc.)\n\n Endian aware.\n "), /*tp_doc*/ 0, /*tp_traverse*/ 0, /*tp_clear*/ @@ -10750,7 +10612,7 @@ PyTypeObject __pyx_type_6cpyamf_4util_BufferedByteStream = { 0, /*tp_getattro*/ 0, /*tp_setattro*/ &__pyx_tp_as_buffer_BufferedByteStream, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_NEWBUFFER, /*tp_flags*/ + Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE, /*tp_flags*/ __Pyx_DOCSTR("\n A Python exposed version of cBufferedByteStream. This exists because of\n various intricacies of Cythons cpdef (probably just user stupidity tho)\n "), /*tp_doc*/ 0, /*tp_traverse*/ 0, /*tp_clear*/ @@ -10790,7 +10652,7 @@ static PyMethodDef __pyx_methods[] = { static struct PyModuleDef __pyx_moduledef = { PyModuleDef_HEAD_INIT, __Pyx_NAMESTR("util"), - __Pyx_DOCSTR(__pyx_k_16), /* m_doc */ + __Pyx_DOCSTR(__pyx_k_31), /* m_doc */ -1, /* m_size */ __pyx_methods /* m_methods */, NULL, /* m_reload */ @@ -10802,60 +10664,22 @@ static struct PyModuleDef __pyx_moduledef = { static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_n_s_1, __pyx_k_1, sizeof(__pyx_k_1), 0, 0, 1, 1}, - {&__pyx_kp_b_10, __pyx_k_10, sizeof(__pyx_k_10), 0, 0, 0, 0}, - {&__pyx_kp_b_11, __pyx_k_11, sizeof(__pyx_k_11), 0, 0, 0, 0}, - {&__pyx_kp_b_12, __pyx_k_12, sizeof(__pyx_k_12), 0, 0, 0, 0}, + {&__pyx_kp_s_10, __pyx_k_10, sizeof(__pyx_k_10), 0, 0, 1, 0}, {&__pyx_kp_s_13, __pyx_k_13, sizeof(__pyx_k_13), 0, 0, 1, 0}, - {&__pyx_kp_s_14, __pyx_k_14, sizeof(__pyx_k_14), 0, 0, 1, 0}, {&__pyx_kp_s_15, __pyx_k_15, sizeof(__pyx_k_15), 0, 0, 1, 0}, + {&__pyx_kp_b_17, __pyx_k_17, sizeof(__pyx_k_17), 0, 0, 0, 0}, + {&__pyx_kp_b_18, __pyx_k_18, sizeof(__pyx_k_18), 0, 0, 0, 0}, + {&__pyx_kp_b_19, __pyx_k_19, sizeof(__pyx_k_19), 0, 0, 0, 0}, {&__pyx_kp_s_2, __pyx_k_2, sizeof(__pyx_k_2), 0, 0, 1, 0}, - {&__pyx_kp_s_20, __pyx_k_20, sizeof(__pyx_k_20), 0, 0, 1, 0}, + {&__pyx_kp_b_20, __pyx_k_20, sizeof(__pyx_k_20), 0, 0, 0, 0}, {&__pyx_kp_s_21, __pyx_k_21, sizeof(__pyx_k_21), 0, 0, 1, 0}, - {&__pyx_kp_u_22, __pyx_k_22, sizeof(__pyx_k_22), 0, 1, 0, 0}, - {&__pyx_kp_u_23, __pyx_k_23, sizeof(__pyx_k_23), 0, 1, 0, 0}, - {&__pyx_kp_u_24, __pyx_k_24, sizeof(__pyx_k_24), 0, 1, 0, 0}, - {&__pyx_kp_u_25, __pyx_k_25, sizeof(__pyx_k_25), 0, 1, 0, 0}, - {&__pyx_kp_u_26, __pyx_k_26, sizeof(__pyx_k_26), 0, 1, 0, 0}, - {&__pyx_kp_u_27, __pyx_k_27, sizeof(__pyx_k_27), 0, 1, 0, 0}, - {&__pyx_kp_u_28, __pyx_k_28, sizeof(__pyx_k_28), 0, 1, 0, 0}, - {&__pyx_kp_u_29, __pyx_k_29, sizeof(__pyx_k_29), 0, 1, 0, 0}, + {&__pyx_kp_s_23, __pyx_k_23, sizeof(__pyx_k_23), 0, 0, 1, 0}, + {&__pyx_kp_s_28, __pyx_k_28, sizeof(__pyx_k_28), 0, 0, 1, 0}, {&__pyx_kp_s_3, __pyx_k_3, sizeof(__pyx_k_3), 0, 0, 1, 0}, - {&__pyx_kp_u_30, __pyx_k_30, sizeof(__pyx_k_30), 0, 1, 0, 0}, - {&__pyx_kp_u_31, __pyx_k_31, sizeof(__pyx_k_31), 0, 1, 0, 0}, - {&__pyx_kp_u_32, __pyx_k_32, sizeof(__pyx_k_32), 0, 1, 0, 0}, - {&__pyx_kp_u_33, __pyx_k_33, sizeof(__pyx_k_33), 0, 1, 0, 0}, - {&__pyx_kp_u_34, __pyx_k_34, sizeof(__pyx_k_34), 0, 1, 0, 0}, - {&__pyx_kp_u_35, __pyx_k_35, sizeof(__pyx_k_35), 0, 1, 0, 0}, - {&__pyx_kp_u_36, __pyx_k_36, sizeof(__pyx_k_36), 0, 1, 0, 0}, - {&__pyx_kp_u_37, __pyx_k_37, sizeof(__pyx_k_37), 0, 1, 0, 0}, - {&__pyx_kp_u_38, __pyx_k_38, sizeof(__pyx_k_38), 0, 1, 0, 0}, - {&__pyx_kp_u_39, __pyx_k_39, sizeof(__pyx_k_39), 0, 1, 0, 0}, - {&__pyx_kp_s_4, __pyx_k_4, sizeof(__pyx_k_4), 0, 0, 1, 0}, - {&__pyx_kp_u_40, __pyx_k_40, sizeof(__pyx_k_40), 0, 1, 0, 0}, - {&__pyx_kp_u_41, __pyx_k_41, sizeof(__pyx_k_41), 0, 1, 0, 0}, - {&__pyx_kp_u_42, __pyx_k_42, sizeof(__pyx_k_42), 0, 1, 0, 0}, - {&__pyx_kp_u_43, __pyx_k_43, sizeof(__pyx_k_43), 0, 1, 0, 0}, - {&__pyx_kp_u_44, __pyx_k_44, sizeof(__pyx_k_44), 0, 1, 0, 0}, - {&__pyx_kp_u_45, __pyx_k_45, sizeof(__pyx_k_45), 0, 1, 0, 0}, - {&__pyx_kp_u_46, __pyx_k_46, sizeof(__pyx_k_46), 0, 1, 0, 0}, - {&__pyx_kp_u_47, __pyx_k_47, sizeof(__pyx_k_47), 0, 1, 0, 0}, - {&__pyx_kp_u_48, __pyx_k_48, sizeof(__pyx_k_48), 0, 1, 0, 0}, - {&__pyx_kp_u_49, __pyx_k_49, sizeof(__pyx_k_49), 0, 1, 0, 0}, + {&__pyx_kp_s_35, __pyx_k_35, sizeof(__pyx_k_35), 0, 0, 1, 0}, + {&__pyx_kp_s_37, __pyx_k_37, sizeof(__pyx_k_37), 0, 0, 1, 0}, {&__pyx_kp_s_5, __pyx_k_5, sizeof(__pyx_k_5), 0, 0, 1, 0}, - {&__pyx_kp_u_50, __pyx_k_50, sizeof(__pyx_k_50), 0, 1, 0, 0}, - {&__pyx_kp_u_51, __pyx_k_51, sizeof(__pyx_k_51), 0, 1, 0, 0}, - {&__pyx_kp_u_52, __pyx_k_52, sizeof(__pyx_k_52), 0, 1, 0, 0}, - {&__pyx_kp_u_53, __pyx_k_53, sizeof(__pyx_k_53), 0, 1, 0, 0}, - {&__pyx_kp_u_54, __pyx_k_54, sizeof(__pyx_k_54), 0, 1, 0, 0}, - {&__pyx_kp_u_55, __pyx_k_55, sizeof(__pyx_k_55), 0, 1, 0, 0}, - {&__pyx_kp_u_56, __pyx_k_56, sizeof(__pyx_k_56), 0, 1, 0, 0}, - {&__pyx_kp_u_57, __pyx_k_57, sizeof(__pyx_k_57), 0, 1, 0, 0}, - {&__pyx_kp_u_58, __pyx_k_58, sizeof(__pyx_k_58), 0, 1, 0, 0}, - {&__pyx_kp_s_6, __pyx_k_6, sizeof(__pyx_k_6), 0, 0, 1, 0}, {&__pyx_kp_s_7, __pyx_k_7, sizeof(__pyx_k_7), 0, 0, 1, 0}, - {&__pyx_kp_s_8, __pyx_k_8, sizeof(__pyx_k_8), 0, 0, 1, 0}, - {&__pyx_kp_b_9, __pyx_k_9, sizeof(__pyx_k_9), 0, 0, 0, 0}, - {&__pyx_n_s__BufferedByteStream, __pyx_k__BufferedByteStream, sizeof(__pyx_k__BufferedByteStream), 0, 0, 1, 1}, {&__pyx_n_s__IOError, __pyx_k__IOError, sizeof(__pyx_k__IOError), 0, 0, 1, 1}, {&__pyx_n_s__NaN, __pyx_k__NaN, sizeof(__pyx_k__NaN), 0, 0, 1, 1}, {&__pyx_n_s__NegInf, __pyx_k__NegInf, sizeof(__pyx_k__NegInf), 0, 0, 1, 1}, @@ -10872,7 +10696,6 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_n_s__at_eof, __pyx_k__at_eof, sizeof(__pyx_k__at_eof), 0, 0, 1, 1}, {&__pyx_n_s__buf, __pyx_k__buf, sizeof(__pyx_k__buf), 0, 0, 1, 1}, {&__pyx_n_s__buffer, __pyx_k__buffer, sizeof(__pyx_k__buffer), 0, 0, 1, 1}, - {&__pyx_n_s__cBufferedByteStream, __pyx_k__cBufferedByteStream, sizeof(__pyx_k__cBufferedByteStream), 0, 0, 1, 1}, {&__pyx_n_s__consume, __pyx_k__consume, sizeof(__pyx_k__consume), 0, 0, 1, 1}, {&__pyx_n_s__endian, __pyx_k__endian, sizeof(__pyx_k__endian), 0, 0, 1, 1}, {&__pyx_n_s__getvalue, __pyx_k__getvalue, sizeof(__pyx_k__getvalue), 0, 0, 1, 1}, @@ -10890,8 +10713,6 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_n_s__read_24bit_int, __pyx_k__read_24bit_int, sizeof(__pyx_k__read_24bit_int), 0, 0, 1, 1}, {&__pyx_n_s__read_24bit_uint, __pyx_k__read_24bit_uint, sizeof(__pyx_k__read_24bit_uint), 0, 0, 1, 1}, {&__pyx_n_s__read_char, __pyx_k__read_char, sizeof(__pyx_k__read_char), 0, 0, 1, 1}, - {&__pyx_n_s__read_double, __pyx_k__read_double, sizeof(__pyx_k__read_double), 0, 0, 1, 1}, - {&__pyx_n_s__read_float, __pyx_k__read_float, sizeof(__pyx_k__read_float), 0, 0, 1, 1}, {&__pyx_n_s__read_long, __pyx_k__read_long, sizeof(__pyx_k__read_long), 0, 0, 1, 1}, {&__pyx_n_s__read_short, __pyx_k__read_short, sizeof(__pyx_k__read_short), 0, 0, 1, 1}, {&__pyx_n_s__read_uchar, __pyx_k__read_uchar, sizeof(__pyx_k__read_uchar), 0, 0, 1, 1}, @@ -10930,37 +10751,282 @@ static int __Pyx_InitCachedBuiltins(void) { return -1; } -static int __Pyx_InitGlobals(void) { - if (__Pyx_InitStrings(__pyx_string_tab) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; - __pyx_int_0 = PyInt_FromLong(0); if (unlikely(!__pyx_int_0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; - __pyx_int_neg_1 = PyInt_FromLong(-1); if (unlikely(!__pyx_int_neg_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; - __pyx_int_512 = PyInt_FromLong(512); if (unlikely(!__pyx_int_512)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; - __pyx_int_4294967295L = PyLong_FromString((char *)"4294967295", 0, 0); if (unlikely(!__pyx_int_4294967295L)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; - return 0; - __pyx_L1_error:; - return -1; -} +static int __Pyx_InitCachedConstants(void) { + __Pyx_RefNannySetupContext("__Pyx_InitCachedConstants"); -#if PY_MAJOR_VERSION < 3 -PyMODINIT_FUNC initutil(void); /*proto*/ -PyMODINIT_FUNC initutil(void) -#else -PyMODINIT_FUNC PyInit_util(void); /*proto*/ -PyMODINIT_FUNC PyInit_util(void) -#endif -{ - PyObject *__pyx_t_1 = NULL; - PyObject *__pyx_t_2 = NULL; - int __pyx_t_3; - int __pyx_t_4; - PyObject *__pyx_t_5 = NULL; - #if CYTHON_REFNANNY - void* __pyx_refnanny = NULL; - __Pyx_RefNanny = __Pyx_RefNannyImportAPI("refnanny"); - if (!__Pyx_RefNanny) { - PyErr_Clear(); - __Pyx_RefNanny = __Pyx_RefNannyImportAPI("Cython.Runtime.refnanny"); - if (!__Pyx_RefNanny) + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":360 + * self.pos = self.length + pos + * else: + * raise ValueError('Bad value for mode') # <<<<<<<<<<<<<< + * + * return 0 + */ + __pyx_k_tuple_4 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 360; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_4)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_3)); + PyTuple_SET_ITEM(__pyx_k_tuple_4, 0, ((PyObject *)__pyx_kp_s_3)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_3)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_4)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":456 + * + * if num_bytes > 4: + * raise ValueError('Max 4 bytes to unpack') # <<<<<<<<<<<<<< + * + * if not self.has_available(num_bytes): + */ + __pyx_k_tuple_6 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 456; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_6)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_5)); + PyTuple_SET_ITEM(__pyx_k_tuple_6, 0, ((PyObject *)__pyx_kp_s_5)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_5)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_6)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":490 + * + * if x > maxint or x < minint: + * raise OverflowError('integer out of range') # <<<<<<<<<<<<<< + * + * cdef char *buf = malloc(num_bytes) + */ + __pyx_k_tuple_8 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 490; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_8)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_7)); + PyTuple_SET_ITEM(__pyx_k_tuple_8, 0, ((PyObject *)__pyx_kp_s_7)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_7)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_8)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":529 + * + * if x >= maxint: + * raise OverflowError('integer out of range') # <<<<<<<<<<<<<< + * + * cdef char *buf = malloc(num_bytes) + */ + __pyx_k_tuple_9 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_9)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_7)); + PyTuple_SET_ITEM(__pyx_k_tuple_9, 0, ((PyObject *)__pyx_kp_s_7)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_7)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_9)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":747 + * encoded_string = obj + * else: + * raise TypeError('value must be Unicode or str') # <<<<<<<<<<<<<< + * + * PyString_AsStringAndSize(encoded_string, &buf, &l) + */ + __pyx_k_tuple_11 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_11)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 747; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_11)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_10)); + PyTuple_SET_ITEM(__pyx_k_tuple_11, 0, ((PyObject *)__pyx_kp_s_10)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_10)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_11)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":930 + * elif hasattr(buf, 'read') and hasattr(buf, 'seek') and hasattr(buf, 'tell'): + * old_pos = buf.tell() + * buf.seek(0) # <<<<<<<<<<<<<< + * self.write(buf.read()) + * buf.seek(old_pos) + */ + __pyx_k_tuple_12 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_12)); + __Pyx_INCREF(__pyx_int_0); + PyTuple_SET_ITEM(__pyx_k_tuple_12, 0, __pyx_int_0); + __Pyx_GIVEREF(__pyx_int_0); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_12)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":934 + * buf.seek(old_pos) + * else: + * raise TypeError("Unable to coerce buf->StringIO") # <<<<<<<<<<<<<< + * + * self.seek(0) + */ + __pyx_k_tuple_14 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_14)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 934; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_14)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_13)); + PyTuple_SET_ITEM(__pyx_k_tuple_14, 0, ((PyObject *)__pyx_kp_s_13)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_13)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_14)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":941 + * def __set__(self, value): + * if PyString_Check(value) == 0: + * raise TypeError('String value expected') # <<<<<<<<<<<<<< + * + * if value not in [ENDIAN_NETWORK, ENDIAN_NATIVE, ENDIAN_LITTLE, ENDIAN_BIG]: + */ + __pyx_k_tuple_16 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_16)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 941; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_16)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_15)); + PyTuple_SET_ITEM(__pyx_k_tuple_16, 0, ((PyObject *)__pyx_kp_s_15)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_15)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_16)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":944 + * + * if value not in [ENDIAN_NETWORK, ENDIAN_NATIVE, ENDIAN_LITTLE, ENDIAN_BIG]: + * raise ValueError('Not a valid endian type') # <<<<<<<<<<<<<< + * + * self.endian = PyString_AsString(value)[0] + */ + __pyx_k_tuple_22 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_22)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 944; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_22)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_21)); + PyTuple_SET_ITEM(__pyx_k_tuple_22, 0, ((PyObject *)__pyx_kp_s_21)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_21)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_22)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":1020 + * """ + * if PyInt_Check(x) == 0 and PyLong_Check(x) == 0: + * raise TypeError('expected int for x') # <<<<<<<<<<<<<< + * + * cBufferedByteStream.write_char(self, x) + */ + __pyx_k_tuple_24 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_24)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1020; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_24)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_23)); + PyTuple_SET_ITEM(__pyx_k_tuple_24, 0, ((PyObject *)__pyx_kp_s_23)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_23)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_24)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":1033 + * """ + * if PyInt_Check(x) == 0 and PyLong_Check(x) == 0: + * raise TypeError('expected int for x') # <<<<<<<<<<<<<< + * + * cBufferedByteStream.write_ushort(self, x) + */ + __pyx_k_tuple_25 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_25)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1033; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_25)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_23)); + PyTuple_SET_ITEM(__pyx_k_tuple_25, 0, ((PyObject *)__pyx_kp_s_23)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_23)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_25)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":1046 + * """ + * if PyInt_Check(x) == 0 and PyLong_Check(x) == 0: + * raise TypeError('expected int for x') # <<<<<<<<<<<<<< + * + * cBufferedByteStream.write_short(self, x) + */ + __pyx_k_tuple_26 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_26)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1046; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_26)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_23)); + PyTuple_SET_ITEM(__pyx_k_tuple_26, 0, ((PyObject *)__pyx_kp_s_23)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_23)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_26)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":1059 + * """ + * if PyInt_Check(x) == 0 and PyLong_Check(x) == 0: + * raise TypeError('expected int for x') # <<<<<<<<<<<<<< + * + * if x > 4294967295L or x < 0: + */ + __pyx_k_tuple_27 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_27)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1059; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_27)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_23)); + PyTuple_SET_ITEM(__pyx_k_tuple_27, 0, ((PyObject *)__pyx_kp_s_23)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_23)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_27)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":1093 + * """ + * if PyFloat_Check(val) == 0: + * raise TypeError('Expecting float for val') # <<<<<<<<<<<<<< + * + * cdef double d = val + */ + __pyx_k_tuple_29 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_29)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1093; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_29)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_28)); + PyTuple_SET_ITEM(__pyx_k_tuple_29, 0, ((PyObject *)__pyx_kp_s_28)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_28)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_29)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":1137 + * new = BufferedByteStream(self) + * + * other.seek(0) # <<<<<<<<<<<<<< + * new.seek(0, 2) + * new.write(other.read()) + */ + __pyx_k_tuple_30 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_30)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_30)); + __Pyx_INCREF(__pyx_int_0); + PyTuple_SET_ITEM(__pyx_k_tuple_30, 0, __pyx_int_0); + __Pyx_GIVEREF(__pyx_int_0); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_30)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":55 + * cdef object pyamf_NegInf = python.NegInf + * cdef object pyamf_PosInf = python.PosInf + * cdef object empty_unicode = unicode('') # <<<<<<<<<<<<<< + * + * + */ + __pyx_k_tuple_36 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_36)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_36)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_35)); + PyTuple_SET_ITEM(__pyx_k_tuple_36, 0, ((PyObject *)__pyx_kp_s_35)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_35)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_36)); + + /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":1159 + * + * if build_platform_exceptional_floats() == -1: + * raise SystemError('Unable to initialise cpyamf.util') # <<<<<<<<<<<<<< + */ + __pyx_k_tuple_38 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_38)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1159; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_k_tuple_38)); + __Pyx_INCREF(((PyObject *)__pyx_kp_s_37)); + PyTuple_SET_ITEM(__pyx_k_tuple_38, 0, ((PyObject *)__pyx_kp_s_37)); + __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_37)); + __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_38)); + __Pyx_RefNannyFinishContext(); + return 0; + __pyx_L1_error:; + __Pyx_RefNannyFinishContext(); + return -1; +} + +static int __Pyx_InitGlobals(void) { + if (__Pyx_InitStrings(__pyx_string_tab) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_int_0 = PyInt_FromLong(0); if (unlikely(!__pyx_int_0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_int_neg_1 = PyInt_FromLong(-1); if (unlikely(!__pyx_int_neg_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_int_512 = PyInt_FromLong(512); if (unlikely(!__pyx_int_512)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_int_2147483648 = PyInt_FromString((char *)"2147483648", 0, 0); if (unlikely(!__pyx_int_2147483648)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_int_4294967295L = PyLong_FromString((char *)"4294967295", 0, 0); if (unlikely(!__pyx_int_4294967295L)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + return 0; + __pyx_L1_error:; + return -1; +} + +#if PY_MAJOR_VERSION < 3 +PyMODINIT_FUNC initutil(void); /*proto*/ +PyMODINIT_FUNC initutil(void) +#else +PyMODINIT_FUNC PyInit_util(void); /*proto*/ +PyMODINIT_FUNC PyInit_util(void) +#endif +{ + PyObject *__pyx_t_1 = NULL; + PyObject *__pyx_t_2 = NULL; + int __pyx_t_3; + int __pyx_t_4; + #if CYTHON_REFNANNY + void* __pyx_refnanny = NULL; + __Pyx_RefNanny = __Pyx_RefNannyImportAPI("refnanny"); + if (!__Pyx_RefNanny) { + PyErr_Clear(); + __Pyx_RefNanny = __Pyx_RefNannyImportAPI("Cython.Runtime.refnanny"); + if (!__Pyx_RefNanny) Py_FatalError("failed to import 'refnanny' module"); } __pyx_refnanny = __Pyx_RefNanny->SetupContext("PyMODINIT_FUNC PyInit_util(void)", __LINE__, __FILE__); @@ -10979,7 +11045,7 @@ PyMODINIT_FUNC PyInit_util(void) #endif /*--- Module creation code ---*/ #if PY_MAJOR_VERSION < 3 - __pyx_m = Py_InitModule4(__Pyx_NAMESTR("util"), __pyx_methods, __Pyx_DOCSTR(__pyx_k_16), 0, PYTHON_API_VERSION); + __pyx_m = Py_InitModule4(__Pyx_NAMESTR("util"), __pyx_methods, __Pyx_DOCSTR(__pyx_k_31), 0, PYTHON_API_VERSION); #else __pyx_m = PyModule_Create(&__pyx_moduledef); #endif @@ -10997,6 +11063,8 @@ PyMODINIT_FUNC PyInit_util(void) } /*--- Builtin init code ---*/ if (unlikely(__Pyx_InitCachedBuiltins() < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + /*--- Constants init code ---*/ + if (unlikely(__Pyx_InitCachedConstants() < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /*--- Global init code ---*/ __pyx_v_6cpyamf_4util_pyamf_NaN = Py_None; Py_INCREF(Py_None); __pyx_v_6cpyamf_4util_pyamf_NegInf = Py_None; Py_INCREF(Py_None); @@ -11098,7 +11166,7 @@ PyMODINIT_FUNC PyInit_util(void) * cdef unsigned char *NegInf = '\xff\xf0\x00\x00\x00\x00\x00\x00' * cdef unsigned char *PosInf = '\x7f\xf0\x00\x00\x00\x00\x00\x00' */ - __pyx_v_6cpyamf_4util_NaN = ((unsigned char *)__pyx_k_17); + __pyx_v_6cpyamf_4util_NaN = ((unsigned char *)__pyx_k_32); /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":41 * @@ -11107,7 +11175,7 @@ PyMODINIT_FUNC PyInit_util(void) * cdef unsigned char *PosInf = '\x7f\xf0\x00\x00\x00\x00\x00\x00' * */ - __pyx_v_6cpyamf_4util_NegInf = ((unsigned char *)__pyx_k_18); + __pyx_v_6cpyamf_4util_NegInf = ((unsigned char *)__pyx_k_33); /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":42 * cdef unsigned char *NaN = '\xff\xf8\x00\x00\x00\x00\x00\x00' @@ -11116,7 +11184,7 @@ PyMODINIT_FUNC PyInit_util(void) * * cdef double platform_nan */ - __pyx_v_6cpyamf_4util_PosInf = ((unsigned char *)__pyx_k_19); + __pyx_v_6cpyamf_4util_PosInf = ((unsigned char *)__pyx_k_34); /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":52 * cdef double system_neginf @@ -11179,19 +11247,13 @@ PyMODINIT_FUNC PyInit_util(void) * * */ - __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_Call(((PyObject *)((PyObject*)&PyUnicode_Type)), ((PyObject *)__pyx_k_tuple_36), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_20)); - PyTuple_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_kp_s_20)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_20)); - __pyx_t_2 = PyObject_Call(((PyObject *)((PyObject*)&PyUnicode_Type)), __pyx_t_1, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_GOTREF(__pyx_v_6cpyamf_4util_empty_unicode); __Pyx_DECREF(__pyx_v_6cpyamf_4util_empty_unicode); - __Pyx_GIVEREF(__pyx_t_2); - __pyx_v_6cpyamf_4util_empty_unicode = __pyx_t_2; - __pyx_t_2 = 0; + __Pyx_GIVEREF(__pyx_t_1); + __pyx_v_6cpyamf_4util_empty_unicode = __pyx_t_1; + __pyx_t_1 = 0; /* "/Users/nick/projects/opensource/pyamf/pyamf/cpyamf/util.pyx":1153 * # init the module from here @@ -11239,14 +11301,8 @@ PyMODINIT_FUNC PyInit_util(void) * if build_platform_exceptional_floats() == -1: * raise SystemError('Unable to initialise cpyamf.util') # <<<<<<<<<<<<<< */ - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1159; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_INCREF(((PyObject *)__pyx_kp_s_21)); - PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_kp_s_21)); - __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_21)); - __pyx_t_1 = PyObject_Call(__pyx_builtin_SystemError, __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1159; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_Call(__pyx_builtin_SystemError, ((PyObject *)__pyx_k_tuple_38), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1159; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_Raise(__pyx_t_1, 0, 0); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1159; __pyx_clineno = __LINE__; goto __pyx_L1_error;} @@ -11261,380 +11317,10 @@ PyMODINIT_FUNC PyInit_util(void) */ __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_1)); - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__cBufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__tell); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_22), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__cBufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__at_eof); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_23), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__cBufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__remaining); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_24), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__cBufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__seek); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_25), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__cBufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__getvalue); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_26), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__cBufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__truncate); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_27), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__cBufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__consume); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_28), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__cBufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__read_uchar); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_29), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__cBufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__read_char); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_30), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__cBufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__read_ushort); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_31), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__cBufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__read_short); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_32), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__cBufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__read_24bit_uint); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_33), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__cBufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__read_24bit_int); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_34), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__cBufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__read_ulong); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_35), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__cBufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__read_long); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_36), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__cBufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__write_uchar); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_37), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__cBufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__write_char); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_38), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__cBufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__write_ushort); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_39), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__cBufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__write_short); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_40), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__cBufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__write_ulong); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_41), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__cBufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__write_long); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_42), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__cBufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__write_24bit_uint); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_43), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__cBufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__write_24bit_int); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_44), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__cBufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__read_utf8_string); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_45), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__cBufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__write_utf8_string); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_46), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__cBufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__write_double); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_47), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__cBufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__write_float); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_48), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__BufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__read); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_49), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__BufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__write); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_50), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__BufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__peek); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_51), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__BufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__write_char); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_52), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__BufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__write_ushort); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_53), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__BufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__write_short); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_54), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__BufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__write_ulong); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_55), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__BufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__read_double); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_56), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__BufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__write_double); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_57), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__BufferedByteStream); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__read_float); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_GetAttrString(__pyx_t_5, "__doc__"); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_58), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_s____test__, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0; - /* "/Users/nick/dev/rtmpy/lib/python2.6/site-packages/Cython/Includes/cpython/type.pxd":2 + /* "/Library/Python/2.6/site-packages/Cython/Includes/cpython/type.pxd":2 * * cdef extern from "Python.h": # <<<<<<<<<<<<<< * # The C structure of the objects used to describe built-in types. @@ -11644,7 +11330,6 @@ PyMODINIT_FUNC PyInit_util(void) __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_1); __Pyx_XDECREF(__pyx_t_2); - __Pyx_XDECREF(__pyx_t_5); if (__pyx_m) { __Pyx_AddTraceback("init cpyamf.util"); Py_DECREF(__pyx_m); __pyx_m = 0;