← Back to branch summary

~pythonregexp2.7/python/issue2636-12

« back to all changes in this revision

Viewing changes to Lib/logging/config.py

  • Committer: Jeffrey C. "The TimeHorse" Jacobs
  • Date: 2008-06-09 14:52:42 UTC
  • mfrom: (39033.1.3 Regexp-2.6)
  • Revision ID: darklord@timehorse.com-20080609145242-9m268zc6u87rp1vp
Merged in changes from the core Regexp branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Lib/logging/config.py
35
35
except ImportError:
36
36
    thread = None
37
37
 
38
 
from socketserver import ThreadingTCPServer, StreamRequestHandler
 
38
from SocketServer import ThreadingTCPServer, StreamRequestHandler
39
39
 
40
40
 
41
41
DEFAULT_LOGGING_CONFIG_PORT = 9030
65
65
    rather than a filename, in which case the file-like object will be read
66
66
    using readfp.
67
67
    """
68
 
    import configparser
 
68
    import ConfigParser
69
69
 
70
 
    cp = configparser.ConfigParser(defaults)
 
70
    cp = ConfigParser.ConfigParser(defaults)
71
71
    if hasattr(cp, 'readfp') and hasattr(fname, 'readline'):
72
72
        cp.readfp(fname)
73
73
    else: