Skip to content
Snippets Groups Projects
Verified Commit 187bcfa5 authored by Daniel Hornung's avatar Daniel Hornung
Browse files

WIP: Compatibility with Python 3.8

parent 27d0aa5d
No related branches found
No related tags found
2 merge requests!100WIP: Filling XLSX: Seems to be working.,!99FIX: `to_table` failed on lists
Pipeline #50258 passed with warnings
This commit is part of merge request !99. Comments created here will be created in the context of that merge request.
...@@ -59,10 +59,10 @@ def to_table(container): ...@@ -59,10 +59,10 @@ def to_table(container):
properties.update([generate_property_name(p) properties.update([generate_property_name(p)
for p in container[0].get_properties()]) for p in container[0].get_properties()])
df = pd.DataFrame(columns=list(properties)) df = pd.DataFrame(columns=list(properties))
rts = set([p.name for p in container[0].parents]) rts = {p.name for p in container[0].parents}
for ii, rec in enumerate(container): for ii, rec in enumerate(container):
if set([p.name for p in rec.parents]) != rts: if {p.name for p in rec.parents} != rts:
raise ValueError("Parents differ") raise ValueError("Parents differ")
for prop in rec.get_properties(): for prop in rec.get_properties():
...@@ -70,7 +70,7 @@ def to_table(container): ...@@ -70,7 +70,7 @@ def to_table(container):
if isinstance(prop.value, list): if isinstance(prop.value, list):
if propname not in df: if propname not in df:
df[propname] = pd.Series(dtype=object) df[propname] = pd.Series(dtype=object)
elif df[propname].dtype != np.dtypes.ObjectDType: elif df[propname].dtype != object:
df[propname] = df[propname].astype(object) df[propname] = df[propname].astype(object)
df.at[ii, propname] = prop.value df.at[ii, propname] = prop.value
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment