Merge 3.3.

This commit is contained in:
Stefan Krah 2013-01-26 13:07:36 +01:00
commit c4a10f5970
2 changed files with 5 additions and 0 deletions

View File

@ -597,6 +597,10 @@ requires_bz2 = unittest.skipUnless(bz2, 'requires bz2')
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

View File

@ -1172,6 +1172,7 @@ class AssortedBytesTest(unittest.TestCase):
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__)