Merged revisions 79848 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79848 | antoine.pitrou | 2010-04-06 19:21:09 +0200 (mar., 06 avril 2010) | 3 lines

  Issue #8193: Fix test_zlib failure with zlib 1.2.4.
........

Lib/test/test_zlib.py

@@ -85,7 +85,7 @@ class ExceptionTestCase(unittest.TestCase):
 
     def test_baddecompressobj(self):
         # verify failure on building decompress object with bad params
-        self.assertRaises(ValueError, zlib.decompressobj, 0)
+        self.assertRaises(ValueError, zlib.decompressobj, -1)
 
     def test_decompressobj_badflush(self):
         # verify failure on calling decompressobj.flush with bad params

Misc/NEWS

@@ -1015,6 +1015,8 @@ Documentation
 Tests
 -----
 
+- Issue #8193: Fix test_zlib failure with zlib 1.2.4.
+
 - Issue #8248: Add some tests for the bool type.  Patch by Gregory Nofi.
 
 - Issue #8263: Now regrtest.py will report a failure if it receives a