Merge 3.3.

Stefan Krah · Stefan Krah · commit c4a10f59703e · 2013-01-26T13:07:36.000+01:00
diff --git a/Lib/test/support.py b/Lib/test/support.py
@@ -597,6 +597,10 @@ def _is_ipv6_enabled():
 
 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
@@ -1172,6 +1172,7 @@ def test_compare_bytes_to_bytearray(self):
         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__)
