[Python-checkins] cpython (merge 3.3 -> default): Merge 3.3.

[stefan.krah]

http://hg.python.org/cpython/rev/2c2cd9e833f3
changeset:   81756:2c2cd9e833f3
parent:      81754:938a045cfe7d
parent:      81755:5c7f92bfe785
user:        Stefan Krah <skrah at bytereef.org>
date:        Sat Jan 26 13:07:36 2013 +0100
summary:
  Merge 3.3.

files:
  Lib/test/support.py    |  4 ++++
  Lib/test/test_bytes.py |  1 +
  2 files changed, 5 insertions(+), 0 deletions(-)


diff --git a/Lib/test/support.py b/Lib/test/support.py
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -597,6 +597,10 @@
 
 requires_lzma = unittest.skipUnless(lzma, 'requires lzma')
 
+requires_docstrings = unittest.skipUnless(
+    sysconfig.get_config_var('WITH_DOC_STRINGS'),
+    "test requires docstrings")
+
 is_jython = sys.platform.startswith('java')
 
 # Filename used for testing
diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -1172,6 +1172,7 @@
         self.assertEqual(bytes(b"abc") < b"ab", False)
         self.assertEqual(bytes(b"abc") <= b"ab", False)
 
+    @test.support.requires_docstrings
     def test_doc(self):
         self.assertIsNotNone(bytearray.__doc__)
         self.assertTrue(bytearray.__doc__.startswith("bytearray("), bytearray.__doc__)

-- 
Repository URL: http://hg.python.org/cpython