Merge remote-tracking branch 'upstream/0.8.x'

hyperspy · Apr 1, 2016 · cf3845c · cf3845c
2 parents ea59b22 + cd5afa6
commit cf3845c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/hyperspy/signal.py b/hyperspy/signal.py
@@ -3034,7 +3034,7 @@ def _deepcopy_with_new_data(self, data=None):
 
     def _summary(self):
         string = "\n\tTitle: "
-        string += self.metadata.General.title.decode('utf8')
+        string += self.metadata.General.title
         if self.metadata.has_item("Signal.signal_type"):
             string += "\n\tSignal type: "
             string += self.metadata.Signal.signal_type

diff --git a/hyperspy/tests/signal/test_tools.py b/hyperspy/tests/signal/test_tools.py
@@ -123,6 +123,10 @@ def test_unfold_image_returns_true(self):
         s.axes_manager.set_signal_dimension(2)
         nt.assert_true(s.unfold())
 
+    def test_print_summary(self):
+        # Just test if it doesn't raise an exception
+        self.signal._print_summary()
+
 
 def _test_default_navigation_signal_operations_over_many_axes(self, op):
     s = getattr(self.signal, op)()