diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-03-01 16:29:22 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-03-01 16:29:22 -0600 |
| commit | ed6344009abb31326acabe95449aaa449f66f4b4 (patch) | |
| tree | 03d65052d550b890074dde3c18857371be974f5c /mediagoblin/plugins/api/tools.py | |
| parent | 5c754fdaeeddb1bbeff165bbecb77e33b75b3c7d (diff) | |
| parent | b7a3798e1806eb52a244088fb600376ff25e0de9 (diff) | |
| download | mediagoblin-ed6344009abb31326acabe95449aaa449f66f4b4.tar.lz mediagoblin-ed6344009abb31326acabe95449aaa449f66f4b4.tar.xz mediagoblin-ed6344009abb31326acabe95449aaa449f66f4b4.zip | |
Merge branch 'master' into joar-skip_transcoding
Conflicts:
mediagoblin/config_spec.ini
Diffstat (limited to 'mediagoblin/plugins/api/tools.py')
| -rw-r--r-- | mediagoblin/plugins/api/tools.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mediagoblin/plugins/api/tools.py b/mediagoblin/plugins/api/tools.py index e5878258..92411f4b 100644 --- a/mediagoblin/plugins/api/tools.py +++ b/mediagoblin/plugins/api/tools.py @@ -69,7 +69,8 @@ def json_response(serializable, _disable_cors=False, *args, **kw): 'Access-Control-Allow-Origin': '*', 'Access-Control-Allow-Methods': 'POST, GET, OPTIONS', 'Access-Control-Allow-Headers': 'Content-Type, X-Requested-With'} - (response.headers.set(key, value) for key, value in cors_headers) + for key, value in cors_headers.iteritems(): + response.headers.set(key, value) return response |