fix #179 : fixed error when loading a session with non array objects from a file

alixdamman · alixdamman · commit b59f6eda33ea · 2019-08-07T12:46:46.000+02:00
diff --git a/doc/source/changes/version_0_31.rst.inc b/doc/source/changes/version_0_31.rst.inc
@@ -1,41 +1,21 @@
 ﻿.. py:currentmodule:: larray_editor
 
-Syntax changes
-^^^^^^^^^^^^^^
-
-* renamed ``MappingEditor.old_method_name()`` to :py:obj:`MappingEditor.new_method_name()` (closes :editor_issue:`1`).
-
-* renamed ``old_argument_name`` argument of :py:obj:`MappingEditor.method_name()` to ``new_argument_name``.
-
-
-Backward incompatible changes
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* other backward incompatible changes
-
-
 New features
 ^^^^^^^^^^^^
 
-* added a feature (see the :ref:`miscellaneous section <misc_editor>` for details).
-
-* added another feature in the editor (closes :editor_issue:`1`).
-
-  .. note::
-
-     - It works for foo bar !
-     - It does not work for foo baz !
+*
 
 
 .. _misc_editor:
 
 Miscellaneous improvements
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-* improved something.
+*
 
 
 Fixes
 ^^^^^
 
-* fixed something (closes :editor_issue:`1`).
+* fixed exception raised when loading a session with non array objects
+  from a file (closes :editor_issue:`179`).
diff --git a/larray_editor/editor.py b/larray_editor/editor.py
@@ -396,11 +396,14 @@ def void_formatter(array, *args, **kwargs):
                 self.new()
         # convert input data to Session if not
         else:
-            self.data = data if isinstance(data, Session) else Session(data)
-            if qtconsole_available:
-                self.kernel.shell.push(dict(self.data.items()))
-            arrays = [k for k, v in self.data.items() if self._display_in_grid(k, v)]
-            self.add_list_items(arrays)
+            self._push_data(data)
+
+    def _push_data(self, data):
+        self.data = data if isinstance(data, Session) else Session(data)
+        if qtconsole_available:
+            self.kernel.shell.push(dict(self.data.items()))
+        arrays = [k for k, v in self.data.items() if self._display_in_grid(k, v)]
+        self.add_list_items(arrays)
         self._listwidget.setCurrentRow(0)
 
     def _reset(self):
@@ -670,13 +673,6 @@ def set_current_file(self, filepath):
         self.current_file = filepath
         self.update_title()
 
-    def _add_arrays(self, arrays):
-        for k, v in arrays.items():
-            self.data[k] = v
-            self.add_list_item(k)
-        if qtconsole_available:
-            self.kernel.shell.push(dict(arrays))
-
     def _ask_to_save_if_unsaved_modifications(self):
         """
         Returns
@@ -933,8 +929,7 @@ def _open_file(self, filepath):
         try:
             session.load(filepath, names)
             self._reset()
-            self._add_arrays(session)
-            self._listwidget.setCurrentRow(0)
+            self._push_data(session)
             self.set_current_file(current_file_name)
             self.unsaved_modifications = False
             self.statusBar().showMessage("Loaded: {}".format(display_name), 4000)
