From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 28 Jun 2010 15:43:25 +0000 (+0000)
Subject: Merged revisions 82332 via svnmerge from
X-Git-Tag: v3.2a1~403
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=902d2bd64d85465e5e294cfe9f526f4cd14cf4ee;p=thirdparty%2FPython%2Fcpython.git

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
........
---

diff --git a/Lib/test/test_property.py b/Lib/test/test_property.py
index 5d44fb0eeee9..cc6a872179c3 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()