summaryrefslogtreecommitdiffstats
path: root/Lib/logging/config.py
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2010-02-07 12:56:54 (GMT)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2010-02-07 12:56:54 (GMT)
commit64e8b970f9e7364ae62bd726cea6d6d7c60ecb34 (patch)
treede83136f18a2df497c30f43304cf7ae027545296 /Lib/logging/config.py
parentb86d3fa43c0cb29c7c018c6a1e926163d7ebacf4 (diff)
downloadcpython-64e8b970f9e7364ae62bd726cea6d6d7c60ecb34.zip
cpython-64e8b970f9e7364ae62bd726cea6d6d7c60ecb34.tar.gz
cpython-64e8b970f9e7364ae62bd726cea6d6d7c60ecb34.tar.bz2
Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
Diffstat (limited to 'Lib/logging/config.py')
-rw-r--r--Lib/logging/config.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/Lib/logging/config.py b/Lib/logging/config.py
index 1145e71..fdf4397 100644
--- a/Lib/logging/config.py
+++ b/Lib/logging/config.py
@@ -58,15 +58,11 @@ def fileConfig(fname, defaults=None, disable_existing_loggers=True):
the ability to select from various pre-canned configurations (if the
developer provides a mechanism to present the choices and load the chosen
configuration).
- In versions of ConfigParser which have the readfp method [typically
- shipped in 2.x versions of Python], you can pass in a file-like object
- rather than a filename, in which case the file-like object will be read
- using readfp.
"""
import ConfigParser
cp = ConfigParser.ConfigParser(defaults)
- if hasattr(cp, 'readfp') and hasattr(fname, 'readline'):
+ if hasattr(fname, 'readline'):
cp.readfp(fname)
else:
cp.read(fname)