diff options
| author | Michael Merickel <mmerickel@users.noreply.github.com> | 2016-04-06 15:58:13 -0500 |
|---|---|---|
| committer | Michael Merickel <mmerickel@users.noreply.github.com> | 2016-04-06 15:58:13 -0500 |
| commit | d9f9d88fa6521762b357c84f2df084215ae618a0 (patch) | |
| tree | 0f6c0d25be331515fdd7f2e17988c7a877e85cae | |
| parent | 23feec43c9005001ba2ea4cd401d52ff83cf4081 (diff) | |
| parent | 44809378b8e1d53cc2d5482b08d92a208e9fbfdb (diff) | |
| download | pyramid-d9f9d88fa6521762b357c84f2df084215ae618a0.tar.gz pyramid-d9f9d88fa6521762b357c84f2df084215ae618a0.tar.bz2 pyramid-d9f9d88fa6521762b357c84f2df084215ae618a0.zip | |
Merge pull request #2433 from msabramo/setup_logging_nicer
setup_logging: global_conf => extra_global_conf
| -rw-r--r-- | pyramid/paster.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/pyramid/paster.py b/pyramid/paster.py index b371eea6f..3916be8f0 100644 --- a/pyramid/paster.py +++ b/pyramid/paster.py @@ -69,15 +69,12 @@ def setup_logging(config_uri, global_conf=None, parser.read([path]) if parser.has_section('loggers'): config_file = os.path.abspath(path) - if global_conf: - # Copy to avoid side effects - global_conf = dict(global_conf) - else: - global_conf = {} - global_conf.update( + full_global_conf = dict( __file__=config_file, here=os.path.dirname(config_file)) - return fileConfig(config_file, global_conf) + if global_conf: + full_global_conf.update(global_conf) + return fileConfig(config_file, full_global_conf) def _getpathsec(config_uri, name): if '#' in config_uri: |