Replace the deprecated ConfigParser.readfp() method, and fix the incomplete merge in r82293.
diff --git a/Lib/logging/config.py b/Lib/logging/config.py
index 63193b1..c90591b 100644
--- a/Lib/logging/config.py
+++ b/Lib/logging/config.py
@@ -63,7 +63,7 @@
 
     cp = configparser.ConfigParser(defaults)
     if hasattr(fname, 'readline'):
-        cp.readfp(fname)
+        cp.read_file(fname)
     else:
         cp.read(fname)