diff options
author | Benjamin Peterson <benjamin@python.org> | 2010-06-28 15:43:25 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2010-06-28 15:43:25 (GMT) |
commit | 902d2bd64d85465e5e294cfe9f526f4cd14cf4ee (patch) | |
tree | ca4e26dd030236e39f1bc2686d0be7585db32f8c /Lib/test/test_property.py | |
parent | 17e0bbc30c8310e88e03992d84c97bb67b5703e1 (diff) | |
download | cpython-902d2bd64d85465e5e294cfe9f526f4cd14cf4ee.zip cpython-902d2bd64d85465e5e294cfe9f526f4cd14cf4ee.tar.gz cpython-902d2bd64d85465e5e294cfe9f526f4cd14cf4ee.tar.bz2 |
Merged revisions 82332 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r82332 | benjamin.peterson | 2010-06-28 10:41:06 -0500 (Mon, 28 Jun 2010) | 1 line
fix skipping condition
........
Diffstat (limited to 'Lib/test/test_property.py')
-rw-r--r-- | Lib/test/test_property.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_property.py b/Lib/test/test_property.py index 5d44fb0..cc6a872 100644 --- a/Lib/test/test_property.py +++ b/Lib/test/test_property.py @@ -118,7 +118,7 @@ class PropertyTests(unittest.TestCase): self.assertEqual(base.__class__.spam.__doc__, "spam spam spam") self.assertEqual(sub.__class__.spam.__doc__, "spam spam spam") - @unittest.skipIf(sys.flags.optimize >= 1, + @unittest.skipIf(sys.flags.optimize >= 2, "Docstrings are omitted with -O2 and above") def test_property_getter_doc_override(self): newgettersub = PropertySubNewGetter() |