merge with 3.3

This commit is contained in:
Georg Brandl 2013-10-27 09:54:53 +01:00
commit 186729e812
6 changed files with 20 additions and 19 deletions

View file

@ -412,6 +412,8 @@ class ImportSideEffectTests(unittest.TestCase):
self.fail("sitecustomize not imported automatically")
@test.support.requires_resource('network')
@unittest.skipUnless(sys.version_info[3] == 'final',
'only for released versions')
def test_license_exists_at_url(self):
# This test is a bit fragile since it depends on the format of the
# string displayed by license in the absence of a LICENSE file.