From 807d5962f1b26d096a24ca4282b210a957e8b481 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com>
Date: Thu, 6 Apr 2023 14:01:43 +0200
Subject: [PATCH] FIX: remove deprecated iteritems
---
src/caosadvancedtools/scifolder/utils.py | 2 +-
src/caosadvancedtools/table_converter.py | 2 +-
src/caosadvancedtools/table_importer.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/caosadvancedtools/scifolder/utils.py b/src/caosadvancedtools/scifolder/utils.py
index afa671af..50e897c7 100644
--- a/src/caosadvancedtools/scifolder/utils.py
+++ b/src/caosadvancedtools/scifolder/utils.py
@@ -154,7 +154,7 @@ def create_files_list(df, ftype):
files = []
for indx, src in df.loc[ftype,
- pd.notnull(df.loc[ftype])].iteritems():
+ pd.notnull(df.loc[ftype])].items():
desc = df.loc[ftype+" description", indx]
if pd.notnull(desc):
diff --git a/src/caosadvancedtools/table_converter.py b/src/caosadvancedtools/table_converter.py
index 76f4dfcd..4b8591ed 100644
--- a/src/caosadvancedtools/table_converter.py
+++ b/src/caosadvancedtools/table_converter.py
@@ -79,7 +79,7 @@ def from_table(spreadsheet, recordtype):
rec = db.Record()
rec.add_parent(name=recordtype)
- for key, value in row.iteritems():
+ for key, value in row.items():
if key.lower() == "description":
rec.description = value
continue
diff --git a/src/caosadvancedtools/table_importer.py b/src/caosadvancedtools/table_importer.py
index 1f515e78..48cfb663 100755
--- a/src/caosadvancedtools/table_importer.py
+++ b/src/caosadvancedtools/table_importer.py
@@ -334,7 +334,7 @@ class TableImporter():
# Now check each element
for idx, val in df.loc[
- pd.notnull(df.loc[:, key]), key].iteritems():
+ pd.notnull(df.loc[:, key]), key].items():
if not isinstance(val, datatype):
msg = (
--
GitLab