Skip to content

Commit

Permalink
Remove unsupported Python <= 2.5
Browse files Browse the repository at this point in the history
  • Loading branch information
hugovk committed Oct 14, 2017
1 parent 2d60560 commit c115489
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions src/diamond/utils/log.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,7 @@ def setup_logging(configfile, stdout=False):
log = logging.getLogger('diamond')

try:
if sys.version_info >= (2, 6):
logging.config.fileConfig(configfile,
disable_existing_loggers=False)
else:
# python <= 2.5 does not have disable_existing_loggers
# default was to always disable them, in our case we want to
# keep any logger created by handlers
logging.config.fileConfig(configfile)
for logger in logging.root.manager.loggerDict.values():
logger.disabled = 0
logging.config.fileConfig(configfile, disable_existing_loggers=False)

# if the stdout flag is set, we use the log level of the root logger
# for logging to stdout, and keep all loggers defined in the conf file
Expand Down

0 comments on commit c115489

Please sign in to comment.