Scenario loading bugfix + Better error message on missing keys

activity_browser/bwutils/superstructure/excel.py

@@ -34,11 +34,14 @@ def get_header_index(document_path: Union[str, Path], import_sheet: int):
         for i in range(10):
             value = sheet.cell(i + 1, 1).value
             if isinstance(value, str) and value.startswith("from activity name"):
+                wb.close()
                 return i
     except IndexError as e:
+        wb.close()
         raise IndexError("Expected headers not found in file").with_traceback(e.__traceback__)
     except UnicodeDecodeError as e:
         print("Given document uses an unknown encoding: {}".format(e))
+        wb.close()
     raise ValueError("Could not find required headers in given document sheet.")
 
 
@@ -56,7 +59,7 @@ def import_from_excel(document_path: Union[str, Path], import_sheet: int = 1):
 
     Any '*' character used at the start of a row or will cause that row
     to be excluded from the import.
-    A '#' charater at the start of a column will cause that column to be
+    A '#' character at the start of a column will cause that column to be
     excluded from the import.
 
     'usecols' is used to exclude specific columns from the excel document.

activity_browser/bwutils/superstructure/manager.py

@@ -123,7 +123,9 @@ def build_index(df: pd.DataFrame) -> pd.MultiIndex:
         """
         if df.loc[:, EXCHANGE_KEYS].isna().any().all():
             df = fill_df_keys_with_fields(df)
-            assert df.loc[:, EXCHANGE_KEYS].notna().all().all(), "Cannot find all keys."
+            _df = df.loc[:, EXCHANGE_KEYS].notna()
+            assert _df.all().all(), "Cannot find all keys. {} of {} exchanges are broken.".format(len(df[_df]),
+                                                                                                  len(df))
         unknown_flows = df.loc[:, "flow type"].isna()
         if unknown_flows.any():
             print("Not all flow types are known, guessing {} flows".format(

activity_browser/ui/widgets/__init__.py

@@ -5,7 +5,7 @@
 from .cutoff_menu import CutoffMenu
 from .database_copy import CopyDatabaseDialog
 from .dialog import (
-    ForceInputDialog, TupleNameDialog, ExcelReadDialog, ChoiceSelectionDialog,
+    ForceInputDialog, TupleNameDialog, ExcelReadDialog,
     DatabaseLinkingDialog, DefaultBiosphereDialog
 )
 from .line_edit import (SignalledPlainTextEdit, SignalledComboEdit,

activity_browser/ui/widgets/dialog.py

@@ -54,55 +54,6 @@ def get_text(cls, parent: QtWidgets.QWidget, title: str, label: str, text: str =
         return obj
 
 
-class ChoiceSelectionDialog(QtWidgets.QDialog):
-    """Given a number of options, select one of them."""
-    def __init__(self, parent=None):
-        super().__init__(parent)
-
-        self.input_box = QtWidgets.QGroupBox(self)
-        self.input_box.setStyleSheet(style_group_box.border_title)
-        input_field_layout = QtWidgets.QVBoxLayout()
-        self.input_box.setLayout(input_field_layout)
-        self.group = QtWidgets.QButtonGroup(self)
-        self.group.setExclusive(True)
-
-        self.buttons = QtWidgets.QDialogButtonBox(
-            QtWidgets.QDialogButtonBox.Ok | QtWidgets.QDialogButtonBox.Cancel,
-        )
-        self.buttons.accepted.connect(self.accept)
-        self.buttons.rejected.connect(self.reject)
-
-        layout = QtWidgets.QVBoxLayout()
-        layout.addWidget(self.input_box)
-        layout.addWidget(self.buttons)
-        self.setLayout(layout)
-
-    @property
-    def choice(self) -> str:
-        """Returns the name of the chosen option, allowing for a comparison"""
-        checked = self.group.checkedButton()
-        return checked.text()
-
-    @classmethod
-    def get_choice(cls, parent: QtWidgets.QWidget, *choices) -> 'ChoiceSelectionDialog':
-        assert len(choices) > 0, "Must give choices to choose from."
-
-        obj = cls(parent)
-        obj.setWindowTitle("Select the option")
-
-        iterable = iter(choices)
-        first = QtWidgets.QRadioButton(str(next(iterable)))
-        first.setChecked(True)
-        obj.group.addButton(first)
-        obj.input_box.layout().addWidget(first)
-        for choice in iterable:
-            btn = QtWidgets.QRadioButton(str(choice))
-            obj.group.addButton(btn)
-            obj.input_box.layout().addWidget(btn)
-        obj.input_box.updateGeometry()
-        return obj
-
-
 class TupleNameDialog(QtWidgets.QDialog):
     def __init__(self, parent=None):
         super().__init__(parent)