From 6379b478921b314c262aa168ff3012196093a893 Mon Sep 17 00:00:00 2001
From: Bert Palm <bert.palm@ufz.de>
Date: Tue, 25 Feb 2020 11:22:30 +0100
Subject: [PATCH] damn pandas revert bugfixes
---
dios/dios.py | 10 +++-------
test/test__getitem__.py | 1 +
test/test_df_like.py | 1 +
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/dios/dios.py b/dios/dios.py
index 0597d08..3031107 100644
--- a/dios/dios.py
+++ b/dios/dios.py
@@ -63,8 +63,6 @@ class DictOfSeries:
- ``dios.loc[..]`` loc[cation] based indexing, work on row and/or columns `labels`, align, return dios
- ``dios.iloc[..]`` i[nteger]loc[cation] based indexing, work on row and/or columns, align, return dios
- Todos:
- -----
"""
def __init__(self, data=None, columns=None, itype=MixedItype, downcast_policy='save'):
@@ -192,9 +190,7 @@ class DictOfSeries:
new = self.copy_empty(columns=False)
for k in self.columns:
- # bug-fix: must be .loc, simple
- # ser[key] may work positional!
- new._data.at[k] = self._data.at[k].loc[key]
+ new._data.at[k] = self._data.at[k][key]
return new
def _getitem_bool_dios(self, key):
@@ -209,7 +205,7 @@ class DictOfSeries:
raise ValueError("Must pass DictOfSeries with boolean values only")
# align rows
idx = boolser[boolser].index.intersection(ser.index)
- new._data.at[k] = ser.loc[idx]
+ new._data.at[k] = ser[idx]
return new
def _getitem_bool_listlike(self, key):
@@ -239,7 +235,7 @@ class DictOfSeries:
for k in data.columns:
s = data._data.at[k]
s[:] = value
- self._data.at[k].loc[s.index] = s
+ self._data.at[k][s.index] = s
def _setitem_dios(self, data, value):
keys = self.columns.intersection(data.columns)
diff --git a/test/test__getitem__.py b/test/test__getitem__.py
index 9b0ee84..78ab333 100644
--- a/test/test__getitem__.py
+++ b/test/test__getitem__.py
@@ -1,5 +1,6 @@
from dios import *
from test.test_setup import *
+from pandas.core.dtypes.common import is_scalar
# s1 = pd.Series(range(10), index=range(10))
# s2 = pd.Series(range(5, 10), index=range(5, 10))
diff --git a/test/test_df_like.py b/test/test_df_like.py
index 17ee9a6..77d661c 100644
--- a/test/test_df_like.py
+++ b/test/test_df_like.py
@@ -3,6 +3,7 @@ import pytest
from dios import *
import pandas as pd
+from pandas.core.dtypes.common import is_dict_like, is_nested_list_like
import numpy as np
from copy import deepcopy
--
GitLab