From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Fri, 15 Apr 2011 21:29:15 +0000 (+0100)
Subject: Issue #11852: Merge fix from 3.2.
X-Git-Tag: v3.3.0a1~2579
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd5a2bd48ef2c8fa07a2d47833f5b51c8468aab6;p=thirdparty%2FPython%2Fcpython.git

Issue #11852: Merge fix from 3.2.
---

cd5a2bd48ef2c8fa07a2d47833f5b51c8468aab6
diff --cc Lib/test/test_logging.py
index 88f0ebc42eee,6623a0f53225..b2e3327fd56b
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@@ -40,7 -40,8 +40,8 @@@ from socketserver import ThreadingTCPSe
  import struct
  import sys
  import tempfile
 -from test.support import captured_stdout, run_with_locale, run_unittest
 +from test.support import captured_stdout, run_with_locale, run_unittest, patch
+ from test.support import TestHandler, Matcher
  import textwrap
  import unittest
  import warnings