From 30209f531efb0d899f96711d8db50b88d892a5c3 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 23 Sep 2014 07:48:34 +0200
Subject: [PATCH] Improve get_all_objects output.

---
 qutebrowser/app.py             | 14 ++++++++++----
 qutebrowser/utils/usertypes.py |  5 ++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/qutebrowser/app.py b/qutebrowser/app.py
index 63cefc539..26dcd90f5 100644
--- a/qutebrowser/app.py
+++ b/qutebrowser/app.py
@@ -483,18 +483,24 @@ class Application(QApplication):
         for name, registry in self.meta_registry.items():
             blocks.append((name, registry.dump_objects()))
         for name, data in blocks:
-            lines.append("'{}' object registry:".format(name))
+            lines.append("{} object registry - {} objects:".format(
+                name, len(data)))
             for line in data:
                 lines.append("    {}".format(line))
         return lines
 
     def get_all_objects(self):
         """Get all children of an object recursively as a string."""
-        qtb_lines = self._get_registered_objects()
+        output = ['']
+        output += self._get_registered_objects()
+        output += ['']
         pyqt_lines = []
         self._get_pyqt_objects(pyqt_lines, self)
-        pyqt_lines.insert(0, '{} PyQt objects:'.format(len(pyqt_lines)))
-        return '\n'.join([''] + qtb_lines + [''] + pyqt_lines)
+        pyqt_lines = ['    ' + e for e in pyqt_lines]
+        pyqt_lines.insert(0, 'Qt objects - {} objects:'.format(
+            len(pyqt_lines)))
+        output += pyqt_lines
+        return '\n'.join(output)
 
     def _recover_pages(self):
         """Try to recover all open pages.
diff --git a/qutebrowser/utils/usertypes.py b/qutebrowser/utils/usertypes.py
index 13163c741..6062a7ad8 100644
--- a/qutebrowser/utils/usertypes.py
+++ b/qutebrowser/utils/usertypes.py
@@ -406,9 +406,8 @@ class ObjectRegistry(collections.UserDict):
         super().__setitem__(name, obj)
 
     def dump_objects(self):
-        """Dump all objects as a string."""
+        """Dump all objects as a list of strings."""
         lines = []
         for name, obj in self.data.items():
-            lines.append("     {}: {}".format(name, repr(obj)))
-        lines.insert(0, '{} objects:'.format(len(self.data)))
+            lines.append("{}: {}".format(name, repr(obj)))
         return lines