[Python-checkins] cpython: tracemalloc: filter_traces() raises a TypeError if filters is not an iterable

[victor.stinner]

http://hg.python.org/cpython/rev/d083b6ead156
changeset:   89556:d083b6ead156
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Mon Mar 10 11:05:07 2014 +0100
summary:
  tracemalloc: filter_traces() raises a TypeError if filters is not an iterable

files:
  Lib/test/test_tracemalloc.py |  2 ++
  Lib/tracemalloc.py           |  5 ++++-
  2 files changed, 6 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_tracemalloc.py b/Lib/test/test_tracemalloc.py
--- a/Lib/test/test_tracemalloc.py
+++ b/Lib/test/test_tracemalloc.py
@@ -346,6 +346,8 @@
         self.assertIsNot(snapshot5.traces, snapshot.traces)
         self.assertEqual(snapshot5.traces, snapshot.traces)
 
+        self.assertRaises(TypeError, snapshot.filter_traces, filter1)
+
     def test_snapshot_group_by_line(self):
         snapshot, snapshot2 = create_snapshots()
         tb_0 = traceback_lineno('<unknown>', 0)
diff --git a/Lib/tracemalloc.py b/Lib/tracemalloc.py
--- a/Lib/tracemalloc.py
+++ b/Lib/tracemalloc.py
@@ -1,4 +1,4 @@
-from collections import Sequence
+from collections import Sequence, Iterable
 from functools import total_ordering
 import fnmatch
 import linecache
@@ -382,6 +382,9 @@
         is a list of Filter instances.  If filters is an empty list, return a
         new Snapshot instance with a copy of the traces.
         """
+        if not isinstance(filters, Iterable):
+            raise TypeError("filters must be a list of filters, not %s"
+                            % type(filters).__name__)
         if filters:
             include_filters = []
             exclude_filters = []

-- 
Repository URL: http://hg.python.org/cpython