diff options
author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-16 11:38:59 +0200 |
---|---|---|
committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-16 11:38:59 +0200 |
commit | 824ead71ff37bbf9ba57674f2bf6cc4cf9f92a70 (patch) | |
tree | 1dd1a1f8864bb4ea4da86e403e0a0c3a4b74c14d /Lib/test/test_descr.py | |
parent | a8fef3700df5400004ac88fa20c8bb4ff6f44ca3 (diff) | |
parent | fd20eca68b680d81b45ec4ce421d1d942dd29c1b (diff) | |
download | cpython-824ead71ff37bbf9ba57674f2bf6cc4cf9f92a70.tar.gz |
#11565: Merge with 3.2.
Diffstat (limited to 'Lib/test/test_descr.py')
-rw-r--r-- | Lib/test/test_descr.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py index 41dfa70e55..b0d531a9a3 100644 --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -4243,6 +4243,8 @@ class DictProxyTests(unittest.TestCase): pass self.C = C + @unittest.skipIf(hasattr(sys, 'gettrace') and sys.gettrace(), + 'trace function introduces __local__') def test_iter_keys(self): # Testing dict-proxy keys... it = self.C.__dict__.keys() @@ -4252,6 +4254,8 @@ class DictProxyTests(unittest.TestCase): self.assertEqual(keys, ['__dict__', '__doc__', '__module__', '__weakref__', 'meth']) + @unittest.skipIf(hasattr(sys, 'gettrace') and sys.gettrace(), + 'trace function introduces __local__') def test_iter_values(self): # Testing dict-proxy values... it = self.C.__dict__.values() @@ -4259,6 +4263,8 @@ class DictProxyTests(unittest.TestCase): values = list(it) self.assertEqual(len(values), 5) + @unittest.skipIf(hasattr(sys, 'gettrace') and sys.gettrace(), + 'trace function introduces __local__') def test_iter_items(self): # Testing dict-proxy iteritems... it = self.C.__dict__.items() |