From: R. David Murray Date: Thu, 14 May 2009 16:17:50 +0000 (+0000) Subject: Merged revisions 72630 via svnmerge from X-Git-Tag: v3.1rc1~156 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b565577aa722d8b39aa42da0384f776680c03c36;p=python Merged revisions 72630 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r72630 | r.david.murray | 2009-05-14 12:12:57 -0400 (Thu, 14 May 2009) | 3 lines Fix test failure on Windows, and add skip check if even unicodedata turns out not to be an external module on some other platform. ........ --- diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py index 270ebfde2b..26ec953e03 100644 --- a/Lib/test/test_inspect.py +++ b/Lib/test/test_inspect.py @@ -12,7 +12,7 @@ from test import inspect_fodder as mod from test import inspect_fodder2 as mod2 # C module for test_findsource_binary -import time +import unicodedata # Functions tested in this suite: # ismodule, isclass, ismethod, isfunction, istraceback, isframe, iscode, @@ -339,9 +339,13 @@ class TestBuggyCases(GetSourceBase): def test_method_in_dynamic_class(self): self.assertSourceEqual(mod2.method_in_dynamic_class, 95, 97) + @unittest.skipIf( + not hasattr(unicodedata, '__file__') or + unicodedata.__file__[-4:] in (".pyc", ".pyo"), + "unicodedata is not an external binary module") def test_findsource_binary(self): - self.assertRaises(IOError, inspect.getsource, time) - self.assertRaises(IOError, inspect.findsource, time) + self.assertRaises(IOError, inspect.getsource, unicodedata) + self.assertRaises(IOError, inspect.findsource, unicodedata) # Helper for testing classify_class_attrs. def attrs_wo_objs(cls):