From: Eric V. Smith <eric@trueblade.com> Date: Mon, 12 Mar 2012 05:46:04 +0000 (-0700) Subject: Make test_logging no longer fail if zlib not present. Closes #14256. Patch by Pedro... X-Git-Tag: v3.3.0a2~236^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=851cad76164bb8ebc84937bfd14a7ea00e4911bc;p=python Make test_logging no longer fail if zlib not present. Closes #14256. Patch by Pedro Kroger. --- diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py index 98a28193b4..be84be682f 100644 --- a/Lib/test/test_logging.py +++ b/Lib/test/test_logging.py @@ -39,14 +39,13 @@ import socket 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 @@ -70,6 +69,10 @@ try: except ImportError: win32evtlogutil = None win32evtlog = None +try: + import zlib +except ImportError: + pass class BaseTest(unittest.TestCase): @@ -3602,6 +3605,7 @@ class RotatingFileHandlerTest(BaseFileTest): self.assertFalse(os.path.exists(namer(self.fn + ".3"))) rh.close() + @requires_zlib def test_rotator(self): def namer(name): return name + ".gz" diff --git a/Misc/ACKS b/Misc/ACKS index 17ea9198fe..49efa297f7 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -559,6 +559,7 @@ Holger Krekel Michael Kremer Fabian Kreutz Cédric Krier +Pedro Kroger Hannu Krosing Andrej Krpic Ivan KrstiÄ