summaryrefslogtreecommitdiffstats
path: root/Lib/logging
diff options
context:
space:
mode:
authorFlorent Xicluna <florent.xicluna@gmail.com>2010-08-15 20:16:27 (GMT)
committerFlorent Xicluna <florent.xicluna@gmail.com>2010-08-15 20:16:27 (GMT)
commitdc692740a8609b535b44931b93a290d594b92fd0 (patch)
tree26e19a2a51d1bbe599c7ad91bcfc4834bd9281e3 /Lib/logging
parenta0241c8587fb15ccfb161762754e65c4cc11d421 (diff)
downloadcpython-dc692740a8609b535b44931b93a290d594b92fd0.zip
cpython-dc692740a8609b535b44931b93a290d594b92fd0.tar.gz
cpython-dc692740a8609b535b44931b93a290d594b92fd0.tar.bz2
Replace the deprecated ConfigParser.readfp() method, and fix the incomplete merge in r82293.
Diffstat (limited to 'Lib/logging')
-rw-r--r--Lib/logging/config.py2
1 files changed, 1 insertions, 1 deletions
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 @@ 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)