Fix a merging artifact that broke the linter

This commit is contained in:
Pradyun Gedam 2018-07-17 12:46:37 +05:30
parent cff2367bf5
commit 901578419d
No known key found for this signature in database
GPG Key ID: DA17C4B29CB32E4B
1 changed files with 45 additions and 45 deletions

View File

@ -173,53 +173,53 @@ def setup_logging(verbosity, no_color, user_log_file):
} }
logging.config.dictConfig({ logging.config.dictConfig({
"version": 1, "version": 1,
"disable_existing_loggers": False, "disable_existing_loggers": False,
"filters": { "filters": {
"exclude_warnings": { "exclude_warnings": {
"()": "pip._internal.utils.logging.MaxLevelFilter", "()": "pip._internal.utils.logging.MaxLevelFilter",
"level": logging.WARNING, "level": logging.WARNING,
},
}, },
"formatters": { },
"indent": { "formatters": {
"()": IndentingFormatter, "indent": {
"format": "%(message)s", "()": IndentingFormatter,
}, "format": "%(message)s",
}, },
"handlers": { },
"console": { "handlers": {
"level": level, "console": {
"class": handler_classes["stream"], "level": level,
"no_color": no_color, "class": handler_classes["stream"],
"stream": log_streams["stdout"], "no_color": no_color,
"filters": ["exclude_warnings"], "stream": log_streams["stdout"],
"formatter": "indent", "filters": ["exclude_warnings"],
}, "formatter": "indent",
"console_errors": {
"level": "WARNING",
"class": handler_classes["stream"],
"no_color": no_color,
"stream": log_streams["stderr"],
"formatter": "indent",
},
"user_log": {
"level": "DEBUG",
"class": handler_classes["file"],
"filename": additional_log_file,
"delay": True,
"formatter": "indent",
},
}, },
"root": { "console_errors": {
"level": root_level, "level": "WARNING",
"handlers": ["console", "console_errors"] + ( "class": handler_classes["stream"],
["user_log"] if include_user_log else [] "no_color": no_color,
), "stream": log_streams["stderr"],
"formatter": "indent",
}, },
"loggers": { "user_log": {
"pip._vendor": { "level": "DEBUG",
"level": vendored_log_level "class": handler_classes["file"],
} "filename": additional_log_file,
"delay": True,
"formatter": "indent",
}, },
}) },
"root": {
"level": root_level,
"handlers": ["console", "console_errors"] + (
["user_log"] if include_user_log else []
),
},
"loggers": {
"pip._vendor": {
"level": vendored_log_level
}
},
})