tmsgpack 0.2.13__tar.gz → 0.2.15__tar.gz

tmsgpack-0.2.15/Automatic-Version

@@ -0,0 +1 @@
+0.2.15

{tmsgpack-0.2.13 → tmsgpack-0.2.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tmsgpack
-Version: 0.2.13
+Version: 0.2.15
 Summary: Typed MessagePack serializer (inspired by but different from msgpack)
 Home-page: https://github.com/Yaakov-Belch/tmsgpack
 Author: Yaakov Belch

{tmsgpack-0.2.13 → tmsgpack-0.2.15}/tmsgpack/api.py

@@ -35,14 +35,14 @@ class BasicCodec(EncodeDecode):
         if codec_type is None: return self
         raise TMsgpackError(f'Unsupported codec_type: {codec_type}')
 
-    def decompose_value(self, ectx):
+    def encode_value(self, ectx):
         raise TMsgpackError(f'Unsupported value: {ectx.value}')
 
-    def value_from_bytes(self, obj_type, data: bytes):
-        raise TMsgpackError(f'No bytes extension defined: {obj_type=} {data=}')
+    def decode_from_bytes(self, dctx):
+        raise TMsgpackError(f'No bytes extension defined: {dctx._type}')
 
-    def value_from_list(self, obj_type, values: list):
-        raise TMsgpackError(f'No tuple extension defined: {obj_type=} {values=}')
+    def decode_from_list(self, dctx):
+        raise TMsgpackError(f'No tuple extension defined: {dctx._type}')
 
 
 basic_codec = BasicCodec()

{tmsgpack-0.2.13 → tmsgpack-0.2.15}/tmsgpack/cython.c

@@ -1555,7 +1555,7 @@ struct __pyx_obj_8tmsgpack_6cython_EncodeCtx {
 
 
 /* "tmsgpack/cython.pyx":211
- *     else:            codec.decompose_value(ectx._v(value)); ectx._mark_use(True)
+ *     else:            codec.encode_value(ectx._v(value)); ectx._mark_use(True)
  * 
  * cdef class DecodeCtx:             # <<<<<<<<<<<<<<
  *     cdef readonly TMsgpackCodec  codec
@@ -1647,7 +1647,7 @@ static struct __pyx_vtabstruct_8tmsgpack_6cython_EncodeCtx *__pyx_vtabptr_8tmsgp
 
 
 /* "tmsgpack/cython.pyx":211
- *     else:            codec.decompose_value(ectx._v(value)); ectx._mark_use(True)
+ *     else:            codec.encode_value(ectx._v(value)); ectx._mark_use(True)
  * 
  * cdef class DecodeCtx:             # <<<<<<<<<<<<<<
  *     cdef readonly TMsgpackCodec  codec
@@ -2730,7 +2730,7 @@ static const char __pyx_k_start[] = "start";
 static const char __pyx_k_state[] = "state";
 static const char __pyx_k_super[] = "super";
 static const char __pyx_k_value[] = "value";
-static const char __pyx_k_0_2_13[] = "0.2.13";
+static const char __pyx_k_0_2_15[] = "0.2.15";
 static const char __pyx_k_dict_2[] = "_dict";
 static const char __pyx_k_enable[] = "enable";
 static const char __pyx_k_extend[] = "extend";
@@ -2796,6 +2796,7 @@ static const char __pyx_k_PickleError[] = "PickleError";
 static const char __pyx_k_mro_entries[] = "__mro_entries__";
 static const char __pyx_k_DecodeBuffer[] = "DecodeBuffer";
 static const char __pyx_k_EncodeBuffer[] = "EncodeBuffer";
+static const char __pyx_k_encode_value[] = "encode_value";
 static const char __pyx_k_initializing[] = "_initializing";
 static const char __pyx_k_is_coroutine[] = "_is_coroutine";
 static const char __pyx_k_put_sequence[] = "put_sequence";
@@ -2808,19 +2809,18 @@ static const char __pyx_k_reduce_cython[] = "__reduce_cython__";
 static const char __pyx_k_ebuf_put_value[] = "ebuf_put_value";
 static const char __pyx_k_dbuf_take_value[] = "dbuf_take_value";
 static const char __pyx_k_dctx_used_twice[] = "dctx used twice.";
-static const char __pyx_k_decompose_value[] = "decompose_value";
 static const char __pyx_k_ectx_used_twice[] = "ectx used twice.";
 static const char __pyx_k_pyx_PickleError[] = "__pyx_PickleError";
 static const char __pyx_k_setstate_cython[] = "__setstate_cython__";
 static const char __pyx_k_tmsgpack_cython[] = "tmsgpack.cython";
-static const char __pyx_k_value_from_list[] = "value_from_list";
 static const char __pyx_k_BaseDecodeBuffer[] = "BaseDecodeBuffer";
 static const char __pyx_k_BaseEncodeBuffer[] = "BaseEncodeBuffer";
 static const char __pyx_k_SafeDecodeBuffer[] = "SafeDecodeBuffer";
 static const char __pyx_k_SafeEncodeBuffer[] = "SafeEncodeBuffer";
 static const char __pyx_k_Undefined_opcode[] = "Undefined opcode: ";
-static const char __pyx_k_value_from_bytes[] = "value_from_bytes";
+static const char __pyx_k_decode_from_list[] = "decode_from_list";
 static const char __pyx_k_dctx_was_not_used[] = "dctx was not used.";
+static const char __pyx_k_decode_from_bytes[] = "decode_from_bytes";
 static const char __pyx_k_ectx_was_not_used[] = "ectx was not used.";
 static const char __pyx_k_EncodeCtx_put_dict[] = "EncodeCtx.put_dict";
 static const char __pyx_k_asyncio_coroutines[] = "asyncio.coroutines";
@@ -3041,7 +3041,7 @@ typedef struct {
   PyTypeObject *__pyx_ptype_8tmsgpack_6cython_BaseDecodeBuffer;
   PyTypeObject *__pyx_ptype_8tmsgpack_6cython_SafeEncodeBuffer;
   PyTypeObject *__pyx_ptype_8tmsgpack_6cython_SafeDecodeBuffer;
-  PyObject *__pyx_kp_u_0_2_13;
+  PyObject *__pyx_kp_u_0_2_15;
   PyObject *__pyx_kp_u_B;
   PyObject *__pyx_n_s_BaseDecodeBuffer;
   PyObject *__pyx_n_s_BaseDecodeBuffer___reduce_cython;
@@ -3138,7 +3138,8 @@ typedef struct {
   PyObject *__pyx_n_s_dbuf_take_value;
   PyObject *__pyx_kp_u_dctx_used_twice;
   PyObject *__pyx_kp_u_dctx_was_not_used;
-  PyObject *__pyx_n_s_decompose_value;
+  PyObject *__pyx_n_s_decode_from_bytes;
+  PyObject *__pyx_n_s_decode_from_list;
   PyObject *__pyx_n_s_dict;
   PyObject *__pyx_n_s_dict_2;
   PyObject *__pyx_kp_u_disable;
@@ -3148,6 +3149,7 @@ typedef struct {
   PyObject *__pyx_kp_u_ectx_used_twice;
   PyObject *__pyx_kp_u_ectx_was_not_used;
   PyObject *__pyx_kp_u_enable;
+  PyObject *__pyx_n_s_encode_value;
   PyObject *__pyx_n_s_end;
   PyObject *__pyx_n_s_extend;
   PyObject *__pyx_kp_u_gc;
@@ -3232,8 +3234,6 @@ typedef struct {
   PyObject *__pyx_n_s_update;
   PyObject *__pyx_n_s_use_setstate;
   PyObject *__pyx_n_s_value;
-  PyObject *__pyx_n_s_value_from_bytes;
-  PyObject *__pyx_n_s_value_from_list;
   PyObject *__pyx_n_s_version;
   PyObject *__pyx_n_s_wr_bytes;
   PyObject *__pyx_n_s_wr_float8;
@@ -3394,7 +3394,7 @@ static int __pyx_m_clear(PyObject *m) {
   Py_CLEAR(clear_module_state->__pyx_type_8tmsgpack_6cython_SafeEncodeBuffer);
   Py_CLEAR(clear_module_state->__pyx_ptype_8tmsgpack_6cython_SafeDecodeBuffer);
   Py_CLEAR(clear_module_state->__pyx_type_8tmsgpack_6cython_SafeDecodeBuffer);
-  Py_CLEAR(clear_module_state->__pyx_kp_u_0_2_13);
+  Py_CLEAR(clear_module_state->__pyx_kp_u_0_2_15);
   Py_CLEAR(clear_module_state->__pyx_kp_u_B);
   Py_CLEAR(clear_module_state->__pyx_n_s_BaseDecodeBuffer);
   Py_CLEAR(clear_module_state->__pyx_n_s_BaseDecodeBuffer___reduce_cython);
@@ -3491,7 +3491,8 @@ static int __pyx_m_clear(PyObject *m) {
   Py_CLEAR(clear_module_state->__pyx_n_s_dbuf_take_value);
   Py_CLEAR(clear_module_state->__pyx_kp_u_dctx_used_twice);
   Py_CLEAR(clear_module_state->__pyx_kp_u_dctx_was_not_used);
-  Py_CLEAR(clear_module_state->__pyx_n_s_decompose_value);
+  Py_CLEAR(clear_module_state->__pyx_n_s_decode_from_bytes);
+  Py_CLEAR(clear_module_state->__pyx_n_s_decode_from_list);
   Py_CLEAR(clear_module_state->__pyx_n_s_dict);
   Py_CLEAR(clear_module_state->__pyx_n_s_dict_2);
   Py_CLEAR(clear_module_state->__pyx_kp_u_disable);
@@ -3501,6 +3502,7 @@ static int __pyx_m_clear(PyObject *m) {
   Py_CLEAR(clear_module_state->__pyx_kp_u_ectx_used_twice);
   Py_CLEAR(clear_module_state->__pyx_kp_u_ectx_was_not_used);
   Py_CLEAR(clear_module_state->__pyx_kp_u_enable);
+  Py_CLEAR(clear_module_state->__pyx_n_s_encode_value);
   Py_CLEAR(clear_module_state->__pyx_n_s_end);
   Py_CLEAR(clear_module_state->__pyx_n_s_extend);
   Py_CLEAR(clear_module_state->__pyx_kp_u_gc);
@@ -3585,8 +3587,6 @@ static int __pyx_m_clear(PyObject *m) {
   Py_CLEAR(clear_module_state->__pyx_n_s_update);
   Py_CLEAR(clear_module_state->__pyx_n_s_use_setstate);
   Py_CLEAR(clear_module_state->__pyx_n_s_value);
-  Py_CLEAR(clear_module_state->__pyx_n_s_value_from_bytes);
-  Py_CLEAR(clear_module_state->__pyx_n_s_value_from_list);
   Py_CLEAR(clear_module_state->__pyx_n_s_version);
   Py_CLEAR(clear_module_state->__pyx_n_s_wr_bytes);
   Py_CLEAR(clear_module_state->__pyx_n_s_wr_float8);
@@ -3725,7 +3725,7 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
   Py_VISIT(traverse_module_state->__pyx_type_8tmsgpack_6cython_SafeEncodeBuffer);
   Py_VISIT(traverse_module_state->__pyx_ptype_8tmsgpack_6cython_SafeDecodeBuffer);
   Py_VISIT(traverse_module_state->__pyx_type_8tmsgpack_6cython_SafeDecodeBuffer);
-  Py_VISIT(traverse_module_state->__pyx_kp_u_0_2_13);
+  Py_VISIT(traverse_module_state->__pyx_kp_u_0_2_15);
   Py_VISIT(traverse_module_state->__pyx_kp_u_B);
   Py_VISIT(traverse_module_state->__pyx_n_s_BaseDecodeBuffer);
   Py_VISIT(traverse_module_state->__pyx_n_s_BaseDecodeBuffer___reduce_cython);
@@ -3822,7 +3822,8 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
   Py_VISIT(traverse_module_state->__pyx_n_s_dbuf_take_value);
   Py_VISIT(traverse_module_state->__pyx_kp_u_dctx_used_twice);
   Py_VISIT(traverse_module_state->__pyx_kp_u_dctx_was_not_used);
-  Py_VISIT(traverse_module_state->__pyx_n_s_decompose_value);
+  Py_VISIT(traverse_module_state->__pyx_n_s_decode_from_bytes);
+  Py_VISIT(traverse_module_state->__pyx_n_s_decode_from_list);
   Py_VISIT(traverse_module_state->__pyx_n_s_dict);
   Py_VISIT(traverse_module_state->__pyx_n_s_dict_2);
   Py_VISIT(traverse_module_state->__pyx_kp_u_disable);
@@ -3832,6 +3833,7 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
   Py_VISIT(traverse_module_state->__pyx_kp_u_ectx_used_twice);
   Py_VISIT(traverse_module_state->__pyx_kp_u_ectx_was_not_used);
   Py_VISIT(traverse_module_state->__pyx_kp_u_enable);
+  Py_VISIT(traverse_module_state->__pyx_n_s_encode_value);
   Py_VISIT(traverse_module_state->__pyx_n_s_end);
   Py_VISIT(traverse_module_state->__pyx_n_s_extend);
   Py_VISIT(traverse_module_state->__pyx_kp_u_gc);
@@ -3916,8 +3918,6 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
   Py_VISIT(traverse_module_state->__pyx_n_s_update);
   Py_VISIT(traverse_module_state->__pyx_n_s_use_setstate);
   Py_VISIT(traverse_module_state->__pyx_n_s_value);
-  Py_VISIT(traverse_module_state->__pyx_n_s_value_from_bytes);
-  Py_VISIT(traverse_module_state->__pyx_n_s_value_from_list);
   Py_VISIT(traverse_module_state->__pyx_n_s_version);
   Py_VISIT(traverse_module_state->__pyx_n_s_wr_bytes);
   Py_VISIT(traverse_module_state->__pyx_n_s_wr_float8);
@@ -4084,7 +4084,7 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
 #define __pyx_ptype_8tmsgpack_6cython_BaseDecodeBuffer __pyx_mstate_global->__pyx_ptype_8tmsgpack_6cython_BaseDecodeBuffer
 #define __pyx_ptype_8tmsgpack_6cython_SafeEncodeBuffer __pyx_mstate_global->__pyx_ptype_8tmsgpack_6cython_SafeEncodeBuffer
 #define __pyx_ptype_8tmsgpack_6cython_SafeDecodeBuffer __pyx_mstate_global->__pyx_ptype_8tmsgpack_6cython_SafeDecodeBuffer
-#define __pyx_kp_u_0_2_13 __pyx_mstate_global->__pyx_kp_u_0_2_13
+#define __pyx_kp_u_0_2_15 __pyx_mstate_global->__pyx_kp_u_0_2_15
 #define __pyx_kp_u_B __pyx_mstate_global->__pyx_kp_u_B
 #define __pyx_n_s_BaseDecodeBuffer __pyx_mstate_global->__pyx_n_s_BaseDecodeBuffer
 #define __pyx_n_s_BaseDecodeBuffer___reduce_cython __pyx_mstate_global->__pyx_n_s_BaseDecodeBuffer___reduce_cython
@@ -4181,7 +4181,8 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
 #define __pyx_n_s_dbuf_take_value __pyx_mstate_global->__pyx_n_s_dbuf_take_value
 #define __pyx_kp_u_dctx_used_twice __pyx_mstate_global->__pyx_kp_u_dctx_used_twice
 #define __pyx_kp_u_dctx_was_not_used __pyx_mstate_global->__pyx_kp_u_dctx_was_not_used
-#define __pyx_n_s_decompose_value __pyx_mstate_global->__pyx_n_s_decompose_value
+#define __pyx_n_s_decode_from_bytes __pyx_mstate_global->__pyx_n_s_decode_from_bytes
+#define __pyx_n_s_decode_from_list __pyx_mstate_global->__pyx_n_s_decode_from_list
 #define __pyx_n_s_dict __pyx_mstate_global->__pyx_n_s_dict
 #define __pyx_n_s_dict_2 __pyx_mstate_global->__pyx_n_s_dict_2
 #define __pyx_kp_u_disable __pyx_mstate_global->__pyx_kp_u_disable
@@ -4191,6 +4192,7 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
 #define __pyx_kp_u_ectx_used_twice __pyx_mstate_global->__pyx_kp_u_ectx_used_twice
 #define __pyx_kp_u_ectx_was_not_used __pyx_mstate_global->__pyx_kp_u_ectx_was_not_used
 #define __pyx_kp_u_enable __pyx_mstate_global->__pyx_kp_u_enable
+#define __pyx_n_s_encode_value __pyx_mstate_global->__pyx_n_s_encode_value
 #define __pyx_n_s_end __pyx_mstate_global->__pyx_n_s_end
 #define __pyx_n_s_extend __pyx_mstate_global->__pyx_n_s_extend
 #define __pyx_kp_u_gc __pyx_mstate_global->__pyx_kp_u_gc
@@ -4275,8 +4277,6 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
 #define __pyx_n_s_update __pyx_mstate_global->__pyx_n_s_update
 #define __pyx_n_s_use_setstate __pyx_mstate_global->__pyx_n_s_use_setstate
 #define __pyx_n_s_value __pyx_mstate_global->__pyx_n_s_value
-#define __pyx_n_s_value_from_bytes __pyx_mstate_global->__pyx_n_s_value_from_bytes
-#define __pyx_n_s_value_from_list __pyx_mstate_global->__pyx_n_s_value_from_list
 #define __pyx_n_s_version __pyx_mstate_global->__pyx_n_s_version
 #define __pyx_n_s_wr_bytes __pyx_mstate_global->__pyx_n_s_wr_bytes
 #define __pyx_n_s_wr_float8 __pyx_mstate_global->__pyx_n_s_wr_float8
@@ -7506,7 +7506,7 @@ static PyObject *__pyx_f_8tmsgpack_6cython_ectx_put_value(struct __pyx_obj_8tmsg
  *     elif t is tuple: ectx._v(None).put_sequence(True, value)
  *     elif t is list:  ectx._v(None).put_sequence(False, value)             # <<<<<<<<<<<<<<
  *     elif t is dict:  ectx._v(None).put_dict(None, value, codec.sort_keys)
- *     else:            codec.decompose_value(ectx._v(value)); ectx._mark_use(True)
+ *     else:            codec.encode_value(ectx._v(value)); ectx._mark_use(True)
  */
   __pyx_t_2 = (__pyx_v_t == ((PyObject *)(&PyList_Type)));
   if (__pyx_t_2) {
@@ -7545,7 +7545,7 @@ static PyObject *__pyx_f_8tmsgpack_6cython_ectx_put_value(struct __pyx_obj_8tmsg
  *     elif t is tuple: ectx._v(None).put_sequence(True, value)
  *     elif t is list:  ectx._v(None).put_sequence(False, value)
  *     elif t is dict:  ectx._v(None).put_dict(None, value, codec.sort_keys)             # <<<<<<<<<<<<<<
- *     else:            codec.decompose_value(ectx._v(value)); ectx._mark_use(True)
+ *     else:            codec.encode_value(ectx._v(value)); ectx._mark_use(True)
  * 
  */
   __pyx_t_2 = (__pyx_v_t == ((PyObject *)(&PyDict_Type)));
@@ -7587,12 +7587,12 @@ static PyObject *__pyx_f_8tmsgpack_6cython_ectx_put_value(struct __pyx_obj_8tmsg
   /* "tmsgpack/cython.pyx":209
  *     elif t is list:  ectx._v(None).put_sequence(False, value)
  *     elif t is dict:  ectx._v(None).put_dict(None, value, codec.sort_keys)
- *     else:            codec.decompose_value(ectx._v(value)); ectx._mark_use(True)             # <<<<<<<<<<<<<<
+ *     else:            codec.encode_value(ectx._v(value)); ectx._mark_use(True)             # <<<<<<<<<<<<<<
  * 
  * cdef class DecodeCtx:
  */
   /*else*/ {
-    __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_codec), __pyx_n_s_decompose_value); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 209, __pyx_L1_error)
+    __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_codec), __pyx_n_s_encode_value); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 209, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     __pyx_t_8 = ((struct __pyx_vtabstruct_8tmsgpack_6cython_EncodeCtx *)__pyx_v_ectx->__pyx_vtab)->_v(__pyx_v_ectx, __pyx_v_value); if (unlikely(!__pyx_t_8)) __PYX_ERR(1, 209, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_8);
@@ -10026,7 +10026,7 @@ static PyObject *__pyx_f_8tmsgpack_6cython_dctx_take_value(struct __pyx_obj_8tms
  *         if _type is True:  return dctx._ltb(_len, _type, False).take_tuple()
  *         if _type is False: return dctx._ltb(_len, _type, False).take_list()             # <<<<<<<<<<<<<<
  *         if _type is None:  return dctx._ltb(_len, _type, False).take_dict()
- *         result = codec.value_from_list(dctx._ltb(_len, _type, False))
+ *         result = codec.decode_from_list(dctx._ltb(_len, _type, False))
  */
     __pyx_t_4 = (__pyx_v__type == Py_False);
     if (__pyx_t_4) {
@@ -10070,7 +10070,7 @@ static PyObject *__pyx_f_8tmsgpack_6cython_dctx_take_value(struct __pyx_obj_8tms
  *         if _type is True:  return dctx._ltb(_len, _type, False).take_tuple()
  *         if _type is False: return dctx._ltb(_len, _type, False).take_list()
  *         if _type is None:  return dctx._ltb(_len, _type, False).take_dict()             # <<<<<<<<<<<<<<
- *         result = codec.value_from_list(dctx._ltb(_len, _type, False))
+ *         result = codec.decode_from_list(dctx._ltb(_len, _type, False))
  *         dctx._mark_use(True)
  */
     __pyx_t_4 = (__pyx_v__type == Py_None);
@@ -10114,11 +10114,11 @@ static PyObject *__pyx_f_8tmsgpack_6cython_dctx_take_value(struct __pyx_obj_8tms
     /* "tmsgpack/cython.pyx":304
  *         if _type is False: return dctx._ltb(_len, _type, False).take_list()
  *         if _type is None:  return dctx._ltb(_len, _type, False).take_dict()
- *         result = codec.value_from_list(dctx._ltb(_len, _type, False))             # <<<<<<<<<<<<<<
+ *         result = codec.decode_from_list(dctx._ltb(_len, _type, False))             # <<<<<<<<<<<<<<
  *         dctx._mark_use(True)
  *         return result
  */
-    __pyx_t_5 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_codec), __pyx_n_s_value_from_list); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 304, __pyx_L1_error)
+    __pyx_t_5 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_codec), __pyx_n_s_decode_from_list); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 304, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_5);
     __pyx_t_6 = __Pyx_PyInt_From_uint64_t(__pyx_v__len); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 304, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_6);
@@ -10153,7 +10153,7 @@ static PyObject *__pyx_f_8tmsgpack_6cython_dctx_take_value(struct __pyx_obj_8tms
 
     /* "tmsgpack/cython.pyx":305
  *         if _type is None:  return dctx._ltb(_len, _type, False).take_dict()
- *         result = codec.value_from_list(dctx._ltb(_len, _type, False))
+ *         result = codec.decode_from_list(dctx._ltb(_len, _type, False))
  *         dctx._mark_use(True)             # <<<<<<<<<<<<<<
  *         return result
  * 
@@ -10163,7 +10163,7 @@ static PyObject *__pyx_f_8tmsgpack_6cython_dctx_take_value(struct __pyx_obj_8tms
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
     /* "tmsgpack/cython.pyx":306
- *         result = codec.value_from_list(dctx._ltb(_len, _type, False))
+ *         result = codec.decode_from_list(dctx._ltb(_len, _type, False))
  *         dctx._mark_use(True)
  *         return result             # <<<<<<<<<<<<<<
  * 
@@ -10272,7 +10272,7 @@ static PyObject *__pyx_f_8tmsgpack_6cython_dctx_take_value(struct __pyx_obj_8tms
  *         _type = dbuf_take_value(codec, dbuf)
  * 
  *         if _type is True: return dctx._ltb(_len, _type, True).take_bytes()             # <<<<<<<<<<<<<<
- *         result = codec.value_from_bytes(dctx._ltb(_len, _type, True))
+ *         result = codec.decode_from_bytes(dctx._ltb(_len, _type, True))
  *         dctx._mark_use(True)
  */
     __pyx_t_4 = (__pyx_v__type == Py_True);
@@ -10316,11 +10316,11 @@ static PyObject *__pyx_f_8tmsgpack_6cython_dctx_take_value(struct __pyx_obj_8tms
     /* "tmsgpack/cython.pyx":318
  * 
  *         if _type is True: return dctx._ltb(_len, _type, True).take_bytes()
- *         result = codec.value_from_bytes(dctx._ltb(_len, _type, True))             # <<<<<<<<<<<<<<
+ *         result = codec.decode_from_bytes(dctx._ltb(_len, _type, True))             # <<<<<<<<<<<<<<
  *         dctx._mark_use(True)
  *         return result
  */
-    __pyx_t_5 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_codec), __pyx_n_s_value_from_bytes); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 318, __pyx_L1_error)
+    __pyx_t_5 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_codec), __pyx_n_s_decode_from_bytes); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 318, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_5);
     __pyx_t_7 = __Pyx_PyInt_From_uint64_t(__pyx_v__len); if (unlikely(!__pyx_t_7)) __PYX_ERR(1, 318, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_7);
@@ -10355,7 +10355,7 @@ static PyObject *__pyx_f_8tmsgpack_6cython_dctx_take_value(struct __pyx_obj_8tms
 
     /* "tmsgpack/cython.pyx":319
  *         if _type is True: return dctx._ltb(_len, _type, True).take_bytes()
- *         result = codec.value_from_bytes(dctx._ltb(_len, _type, True))
+ *         result = codec.decode_from_bytes(dctx._ltb(_len, _type, True))
  *         dctx._mark_use(True)             # <<<<<<<<<<<<<<
  *         return result
  * 
@@ -10365,7 +10365,7 @@ static PyObject *__pyx_f_8tmsgpack_6cython_dctx_take_value(struct __pyx_obj_8tms
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
     /* "tmsgpack/cython.pyx":320
- *         result = codec.value_from_bytes(dctx._ltb(_len, _type, True))
+ *         result = codec.decode_from_bytes(dctx._ltb(_len, _type, True))
  *         dctx._mark_use(True)
  *         return result             # <<<<<<<<<<<<<<
  * 
@@ -25214,7 +25214,7 @@ static PyMethodDef __pyx_methods[] = {
 
 static int __Pyx_CreateStringTabAndInitStrings(void) {
   __Pyx_StringTabEntry __pyx_string_tab[] = {
-    {&__pyx_kp_u_0_2_13, __pyx_k_0_2_13, sizeof(__pyx_k_0_2_13), 0, 1, 0, 0},
+    {&__pyx_kp_u_0_2_15, __pyx_k_0_2_15, sizeof(__pyx_k_0_2_15), 0, 1, 0, 0},
     {&__pyx_kp_u_B, __pyx_k_B, sizeof(__pyx_k_B), 0, 1, 0, 0},
     {&__pyx_n_s_BaseDecodeBuffer, __pyx_k_BaseDecodeBuffer, sizeof(__pyx_k_BaseDecodeBuffer), 0, 0, 1, 1},
     {&__pyx_n_s_BaseDecodeBuffer___reduce_cython, __pyx_k_BaseDecodeBuffer___reduce_cython, sizeof(__pyx_k_BaseDecodeBuffer___reduce_cython), 0, 0, 1, 1},
@@ -25311,7 +25311,8 @@ static int __Pyx_CreateStringTabAndInitStrings(void) {
     {&__pyx_n_s_dbuf_take_value, __pyx_k_dbuf_take_value, sizeof(__pyx_k_dbuf_take_value), 0, 0, 1, 1},
     {&__pyx_kp_u_dctx_used_twice, __pyx_k_dctx_used_twice, sizeof(__pyx_k_dctx_used_twice), 0, 1, 0, 0},
     {&__pyx_kp_u_dctx_was_not_used, __pyx_k_dctx_was_not_used, sizeof(__pyx_k_dctx_was_not_used), 0, 1, 0, 0},
-    {&__pyx_n_s_decompose_value, __pyx_k_decompose_value, sizeof(__pyx_k_decompose_value), 0, 0, 1, 1},
+    {&__pyx_n_s_decode_from_bytes, __pyx_k_decode_from_bytes, sizeof(__pyx_k_decode_from_bytes), 0, 0, 1, 1},
+    {&__pyx_n_s_decode_from_list, __pyx_k_decode_from_list, sizeof(__pyx_k_decode_from_list), 0, 0, 1, 1},
     {&__pyx_n_s_dict, __pyx_k_dict, sizeof(__pyx_k_dict), 0, 0, 1, 1},
     {&__pyx_n_s_dict_2, __pyx_k_dict_2, sizeof(__pyx_k_dict_2), 0, 0, 1, 1},
     {&__pyx_kp_u_disable, __pyx_k_disable, sizeof(__pyx_k_disable), 0, 1, 0, 0},
@@ -25321,6 +25322,7 @@ static int __Pyx_CreateStringTabAndInitStrings(void) {
     {&__pyx_kp_u_ectx_used_twice, __pyx_k_ectx_used_twice, sizeof(__pyx_k_ectx_used_twice), 0, 1, 0, 0},
     {&__pyx_kp_u_ectx_was_not_used, __pyx_k_ectx_was_not_used, sizeof(__pyx_k_ectx_was_not_used), 0, 1, 0, 0},
     {&__pyx_kp_u_enable, __pyx_k_enable, sizeof(__pyx_k_enable), 0, 1, 0, 0},
+    {&__pyx_n_s_encode_value, __pyx_k_encode_value, sizeof(__pyx_k_encode_value), 0, 0, 1, 1},
     {&__pyx_n_s_end, __pyx_k_end, sizeof(__pyx_k_end), 0, 0, 1, 1},
     {&__pyx_n_s_extend, __pyx_k_extend, sizeof(__pyx_k_extend), 0, 0, 1, 1},
     {&__pyx_kp_u_gc, __pyx_k_gc, sizeof(__pyx_k_gc), 0, 1, 0, 0},
@@ -25405,8 +25407,6 @@ static int __Pyx_CreateStringTabAndInitStrings(void) {
     {&__pyx_n_s_update, __pyx_k_update, sizeof(__pyx_k_update), 0, 0, 1, 1},
     {&__pyx_n_s_use_setstate, __pyx_k_use_setstate, sizeof(__pyx_k_use_setstate), 0, 0, 1, 1},
     {&__pyx_n_s_value, __pyx_k_value, sizeof(__pyx_k_value), 0, 0, 1, 1},
-    {&__pyx_n_s_value_from_bytes, __pyx_k_value_from_bytes, sizeof(__pyx_k_value_from_bytes), 0, 0, 1, 1},
-    {&__pyx_n_s_value_from_list, __pyx_k_value_from_list, sizeof(__pyx_k_value_from_list), 0, 0, 1, 1},
     {&__pyx_n_s_version, __pyx_k_version, sizeof(__pyx_k_version), 0, 0, 1, 1},
     {&__pyx_n_s_wr_bytes, __pyx_k_wr_bytes, sizeof(__pyx_k_wr_bytes), 0, 0, 1, 1},
     {&__pyx_n_s_wr_float8, __pyx_k_wr_float8, sizeof(__pyx_k_wr_float8), 0, 0, 1, 1},
@@ -26681,11 +26681,11 @@ if (!__Pyx_RefNanny) {
   /* "tmsgpack/cython.pyx":4
  * # DON'T EDIT THIS FILE.  EDIT THE SOURCES, INSTEAD: tmsgpack/src-parts/[inserted by cython to avoid comment start]*
  * 
- * __version__ = "0.2.13"             # <<<<<<<<<<<<<<
+ * __version__ = "0.2.15"             # <<<<<<<<<<<<<<
  * 
  * from libc.stdint cimport int8_t, int16_t, int32_t, int64_t
  */
-  if (PyDict_SetItem(__pyx_d, __pyx_n_s_version, __pyx_kp_u_0_2_13) < 0) __PYX_ERR(1, 4, __pyx_L1_error)
+  if (PyDict_SetItem(__pyx_d, __pyx_n_s_version, __pyx_kp_u_0_2_15) < 0) __PYX_ERR(1, 4, __pyx_L1_error)
 
   /* "tmsgpack/cython.pyx":13
  * ctypedef double float64_t

{tmsgpack-0.2.13 → tmsgpack-0.2.15}/tmsgpack/cython.pyx

@@ -1,7 +1,7 @@
 # THIS FILE IS AUTOMATICALLY CREATED BY THE test-run.sh SCRIPT!
 # DON'T EDIT THIS FILE.  EDIT THE SOURCES, INSTEAD: tmsgpack/src-parts/*
 
-__version__ = "0.2.13"
+__version__ = "0.2.15"
 
 from libc.stdint cimport int8_t, int16_t, int32_t, int64_t
 from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t
@@ -206,7 +206,7 @@ cdef ectx_put_value(EncodeCtx ectx, object value):
     elif t is tuple: ectx._v(None).put_sequence(True, value)
     elif t is list:  ectx._v(None).put_sequence(False, value)
     elif t is dict:  ectx._v(None).put_dict(None, value, codec.sort_keys)
-    else:            codec.decompose_value(ectx._v(value)); ectx._mark_use(True)
+    else:            codec.encode_value(ectx._v(value)); ectx._mark_use(True)
 
 cdef class DecodeCtx:
     cdef readonly TMsgpackCodec  codec
@@ -301,7 +301,7 @@ cdef dctx_take_value(DecodeCtx dctx):
         if _type is True:  return dctx._ltb(_len, _type, False).take_tuple()
         if _type is False: return dctx._ltb(_len, _type, False).take_list()
         if _type is None:  return dctx._ltb(_len, _type, False).take_dict()
-        result = codec.value_from_list(dctx._ltb(_len, _type, False))
+        result = codec.decode_from_list(dctx._ltb(_len, _type, False))
         dctx._mark_use(True)
         return result
 
@@ -315,7 +315,7 @@ cdef dctx_take_value(DecodeCtx dctx):
         _type = dbuf_take_value(codec, dbuf)
 
         if _type is True: return dctx._ltb(_len, _type, True).take_bytes()
-        result = codec.value_from_bytes(dctx._ltb(_len, _type, True))
+        result = codec.decode_from_bytes(dctx._ltb(_len, _type, True))
         dctx._mark_use(True)
         return result
 

{tmsgpack-0.2.13 → tmsgpack-0.2.15}/tmsgpack.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tmsgpack
-Version: 0.2.13
+Version: 0.2.15
 Summary: Typed MessagePack serializer (inspired by but different from msgpack)
 Home-page: https://github.com/Yaakov-Belch/tmsgpack
 Author: Yaakov Belch

tmsgpack-0.2.13/Automatic-Version

@@ -1 +0,0 @@
-0.2.13