diff -r f452d7d5470d Lib/test/test_logging.py --- a/Lib/test/test_logging.py Sun Mar 11 19:33:29 2012 +0100 +++ b/Lib/test/test_logging.py Sun Mar 11 18:45:18 2012 -0700 @@ -39,14 +39,14 @@ import struct import sys import tempfile -from test.support import captured_stdout, run_with_locale, run_unittest, patch -from test.support import TestHandler, Matcher +from test.support import (captured_stdout, run_with_locale, run_unittest, + patch, requires_zlib, TestHandler, Matcher) import textwrap import time import unittest import warnings import weakref -import zlib + try: import threading # The following imports are needed only for tests which @@ -71,6 +71,11 @@ win32evtlogutil = None win32evtlog = None +try: + import zlib +except ImportError: + pass + class BaseTest(unittest.TestCase): @@ -3602,6 +3607,7 @@ self.assertFalse(os.path.exists(namer(self.fn + ".3"))) rh.close() + @requires_zlib def test_rotator(self): def namer(name): return name + ".gz" diff -r f452d7d5470d Misc/ACKS --- a/Misc/ACKS Sun Mar 11 19:33:29 2012 +0100 +++ b/Misc/ACKS Sun Mar 11 18:45:18 2012 -0700 @@ -559,6 +559,7 @@ Michael Kremer Fabian Kreutz Cédric Krier +Pedro Kroger Hannu Krosing Andrej Krpic Ivan Krstić