[Telemetry] Don't display "Locals:" header if there are no locals to print.

Doing the 'self' exclusion in the loop was too late.

BUG=

Review URL: https://codereview.chromium.org/94033003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238192 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 5 deletions

diff --git a/tools/telemetry/telemetry/exception_formatter.py b/tools/telemetry/telemetry/exception_formatter.py
index 553cca1..8dafd44 100644
--- a/tools/telemetry/telemetry/exception_formatter.py
+++ b/tools/telemetry/telemetry/exception_formatter.py
@@ -48,7 +48,9 @@ def PrintFormattedException(exception_class, exception, tb):
   exception = ''.join([l[2:] if l[:2] == '  ' else l for l in
                        traceback.format_exception_only(exception_class,
                                                        exception)])
-  local_variables = _GetFinalFrame(tb).tb_frame.f_locals
+  local_variables = [(variable, value) for variable, value in
+                     _GetFinalFrame(tb).tb_frame.f_locals.iteritems()
+                     if variable != 'self']
 
   # Format the traceback.
   print >> sys.stderr
@@ -64,10 +66,8 @@ def PrintFormattedException(exception_class, exception, tb):
   if local_variables:
     print >> sys.stderr
     print >> sys.stderr, 'Locals:'
-    longest_variable = max([len(v) for v in local_variables.keys()])
-    for variable, value in sorted(local_variables.iteritems()):
-      if variable == 'self':
-        continue
+    longest_variable = max([len(v) for v, _ in local_variables])
+    for variable, value in sorted(local_variables):
       value = repr(value)
       possibly_truncated_value = _AbbreviateMiddle(value, ' ... ', 1024)
       truncation_indication = ''