From: Georg Brandl <georg@python.org>
Date: Sun, 1 Aug 2010 07:48:43 +0000 (+0000)
Subject: #7395: fix traceback in do_add() when no stats are loaded.  Apply same fix for do_sor... 
X-Git-Tag: v3.2a2~579
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3e4f2ec7047dfec4ced9ec1ee791eaa837655b8e;p=thirdparty%2FPython%2Fcpython.git

#7395: fix traceback in do_add() when no stats are loaded.  Apply same fix for do_sort() and do_reverse().
---

diff --git a/Lib/pstats.py b/Lib/pstats.py
index 14c460680cd8..8f1d7950c2e0 100644
--- a/Lib/pstats.py
+++ b/Lib/pstats.py
@@ -576,7 +576,10 @@ if __name__ == '__main__':
             print("  that match it are printed.", file=self.stream)
 
         def do_add(self, line):
-            self.stats.add(line)
+            if self.stats:
+                self.stats.add(line)
+            else:
+                print("No statistics object is loaded.", file=self.stream)
             return 0
         def help_add(self):
             print("Add profile info from given file to current statistics object.", file=self.stream)
@@ -621,12 +624,18 @@ if __name__ == '__main__':
             print("Read in profile data from a specified file.", file=self.stream)
 
         def do_reverse(self, line):
-            self.stats.reverse_order()
+            if self.stats:
+                self.stats.reverse_order()
+            else:
+                print("No statistics object is loaded.", file=self.stream)
             return 0
         def help_reverse(self):
             print("Reverse the sort order of the profiling report.", file=self.stream)
 
         def do_sort(self, line):
+            if not self.stats:
+                print("No statistics object is loaded.", file=self.stream)
+                return
             abbrevs = self.stats.get_sort_arg_defs()
             if line and all((x in abbrevs) for x in line.split()):
                 self.stats.sort_stats(*line.split())
@@ -648,8 +657,10 @@ if __name__ == '__main__':
             self.generic_help()
 
         def do_strip(self, line):
-            self.stats.strip_dirs()
-            return 0
+            if self.stats:
+                self.stats.strip_dirs()
+            else:
+                print("No statistics object is loaded.", file=self.stream)
         def help_strip(self):
             print("Strip leading path information from filenames in the report.", file=self.stream)