Replace the deprecated ConfigParser.readfp() method, and fix the incomplete merge in r82293.
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index d763459..511b2e0 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -38,8 +38,7 @@
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 @@
@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