From dc692740a8609b535b44931b93a290d594b92fd0 Mon Sep 17 00:00:00 2001 From: Florent Xicluna Date: Sun, 15 Aug 2010 20:16:27 +0000 Subject: [PATCH] Replace the deprecated ConfigParser.readfp() method, and fix the incomplete merge in r82293. --- Lib/logging/config.py | 2 +- Lib/test/test_logging.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Lib/logging/config.py b/Lib/logging/config.py index 63193b1c7f..c90591b9fe 100644 --- a/Lib/logging/config.py +++ b/Lib/logging/config.py @@ -63,7 +63,7 @@ def fileConfig(fname, defaults=None, disable_existing_loggers=True): cp = configparser.ConfigParser(defaults) if hasattr(fname, 'readline'): - cp.readfp(fname) + cp.read_file(fname) else: cp.read(fname) diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py index d7634593dc..511b2e058b 100644 --- a/Lib/test/test_logging.py +++ b/Lib/test/test_logging.py @@ -38,8 +38,7 @@ from socketserver import ThreadingTCPServer, StreamRequestHandler import struct import sys import tempfile -from test.support import captured_stdout, run_with_locale, run_unittest,\ - find_unused_port +from test.support import captured_stdout, run_with_locale, run_unittest import textwrap import unittest import warnings @@ -1666,8 +1665,8 @@ class ConfigDictTest(BaseTest): @unittest.skipUnless(threading, 'listen() needs threading to work') def setup_via_listener(self, text): text = text.encode("utf-8") - port = find_unused_port() - t = logging.config.listen(port) + # Ask for a randomly assigned port (by using port 0) + t = logging.config.listen(0) t.start() t.ready.wait() # Now get the port allocated -- 2.40.0