diff --git a/src/caosadvancedtools/scifolder/utils.py b/src/caosadvancedtools/scifolder/utils.py index afa671af85506a57a06ad5198bec4495823c76f1..50e897c7d2f19c6269ec622489c5a2c6ce1a28e0 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 76f4dfcdb5f040d81d923289a7a730806ad8681b..4b8591ed009ee8e63b328ad43e0d458b3e805ce7 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 1f515e78e3ddbd198fa0336589a359ba9154f038..48cfb663a4d6749d2bdd00c5e156072b6b295bd4 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 = (