[Python-checkins] r82333 - in python/branches/py3k: Lib/test/test_property.py
benjamin.peterson
python-checkins at python.org
Mon Jun 28 17:43:25 CEST 2010
Author: benjamin.peterson
Date: Mon Jun 28 17:43:25 2010
New Revision: 82333
Log:
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
........
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Lib/test/test_property.py
Modified: python/branches/py3k/Lib/test/test_property.py
==============================================================================
--- python/branches/py3k/Lib/test/test_property.py (original)
+++ python/branches/py3k/Lib/test/test_property.py Mon Jun 28 17:43:25 2010
@@ -118,7 +118,7 @@
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()
More information about the Python-checkins
mailing list