Change boxing of DataFrame.data

densmirn · densmirn · commit bc0c1ec7b527 · 2020-05-28T19:22:30.000+03:00
diff --git a/sdc/hiframes/boxing.py b/sdc/hiframes/boxing.py
@@ -234,29 +234,13 @@ def box_dataframe(typ, val, c):
 
         # extracting list from the tuple
         list_val = builder.extract_value(dataframe.data, type_id)
-        typ_arrs = listobj.ListInstance(context, builder, list_type, list_val)
         # getting array from the list to box it then
-        arr = typ_arrs.getitem(col_id)
-        typ_arrs.incref_value(arr)
-
-        if dtype == string_type:
-            arr_obj = box_str_arr(arr_typ, arr, c)
-        elif isinstance(dtype, PDCategoricalDtype):
-            arr_obj = box_categorical_array(arr_typ, arr, c)
-            # context.nrt.incref(builder, arr_typ, arr)
-        elif dtype == types.List(string_type):
-            arr_obj = box_list(list_string_array_type, arr, c)
-            # context.nrt.incref(builder, arr_typ, arr)  # TODO required?
-            # pyapi.print_object(arr_obj)
-        else:
-            arr_obj = box_array(arr_typ, arr, c)
-            # TODO: is incref required?
-            # context.nrt.incref(builder, arr_typ, arr)
+        typ_arrs = box_list(list_type, list_val, c)
+        # PyList_GetItem returns borrowed reference
+        arr_obj = pyapi.list_getitem(typ_arrs, col_id)
         pyapi.dict_setitem(df_dict, cname_obj, arr_obj)
 
-        if c.context.enable_nrt:
-            c.context.nrt.decref(c.builder, list_type, list_val)
-        pyapi.decref(arr_obj)
+        pyapi.decref(typ_arrs)
         pyapi.decref(cname_obj)
 
     df_obj = pyapi.call_method(class_obj, "DataFrame", (df_dict,))
