[Python-checkins] cpython (merge default -> default): merge heads

Mon Mar 12 17:56:07 CET 2012

http://hg.python.org/cpython/rev/a4aa5ac6f425
changeset: 75539:a4aa5ac6f425
parent: 75538:fd60aab46733
parent: 75535:b8a14f95453a
user: Benjamin Peterson <benjamin at python.org>
date: Mon Mar 12 09:28:51 2012 -0700
summary:
 merge heads
files:
 Lib/test/test_logging.py | 10 +++++++---
 Misc/ACKS | 1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -39,14 +39,13 @@
 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 @@
 except ImportError:
 win32evtlogutil = None
 win32evtlog = None
+try:
+ import zlib
+except ImportError:
+ pass
 
 
 class BaseTest(unittest.TestCase):
@@ -3602,6 +3605,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 --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -559,6 +559,7 @@
 Michael Kremer
 Fabian Kreutz
 Cédric Krier
+Pedro Kroger
 Hannu Krosing
 Andrej Krpic
 Ivan Krstić
-- 
Repository URL: http://hg.python.org/cpython
