diff options
| -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: |