diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-02 13:38:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-02 13:38:05 +0000 |
| commit | 619ed56093d2cfdc0b926cd4907156f5e58dc6d2 (patch) | |
| tree | d77a09be006a4015eed6bebc980d8105d48cc551 /openstack | |
| parent | 90ae2f7a3db5eba091937127ed6acb386c14bdcd (diff) | |
| parent | 52c2c1e5f357867226b71e1edbaae54c0733db3f (diff) | |
| download | oslo-619ed56093d2cfdc0b926cd4907156f5e58dc6d2.tar.gz oslo-619ed56093d2cfdc0b926cd4907156f5e58dc6d2.tar.xz oslo-619ed56093d2cfdc0b926cd4907156f5e58dc6d2.zip | |
Merge "Pass in stream as positional argument to StreamHandler."
Diffstat (limited to 'openstack')
| -rw-r--r-- | openstack/common/log.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/openstack/common/log.py b/openstack/common/log.py index bd2724f..9d8bddf 100644 --- a/openstack/common/log.py +++ b/openstack/common/log.py @@ -327,7 +327,9 @@ def _setup_logging_from_conf(product_name): log_root.addHandler(streamlog) elif not CONF.log_file: - streamlog = logging.StreamHandler(stream=sys.stdout) + # pass sys.stdout as a positional argument + # python2.6 calls the argument strm, in 2.7 it's stream + streamlog = logging.StreamHandler(sys.stdout) log_root.addHandler(streamlog) if CONF.publish_errors: |