diff options
| author | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2011-08-07 17:41:24 +0200 |
|---|---|---|
| committer | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2011-08-09 13:15:20 +0200 |
| commit | f7d73aeb34ed16c7d1aa06d977ffb4c9c7a44051 (patch) | |
| tree | 2249becf821d22029df07c39600c79fb2d143d9e | |
| parent | ed7970696e3194fdfc9fb597342e2cecacc75935 (diff) | |
| download | mediagoblin-f7d73aeb34ed16c7d1aa06d977ffb4c9c7a44051.tar.lz mediagoblin-f7d73aeb34ed16c7d1aa06d977ffb4c9c7a44051.tar.xz mediagoblin-f7d73aeb34ed16c7d1aa06d977ffb4c9c7a44051.zip | |
storage Config: Stop being backward compatible (beginning).
Chris Webber says "no backward compatibility for this".
So start removing the backward compat stuff.
| -rw-r--r-- | mediagoblin/init/__init__.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/mediagoblin/init/__init__.py b/mediagoblin/init/__init__.py index b87bd7a4..32f0194c 100644 --- a/mediagoblin/init/__init__.py +++ b/mediagoblin/init/__init__.py @@ -117,19 +117,11 @@ def setup_storage(): key_short = 'publicstore' key_long = "storage:" + key_short - if global_config.has_key(key_long): - print "New style" - public_store = storage_system_from_config(global_config[key_long], None) - else: - print "old style" - public_store = storage_system_from_config(app_config, key_short) + public_store = storage_system_from_config(global_config[key_long], None) key_short = 'queuestore' key_long = "storage:" + key_short - if global_config.has_key(key_long): - queue_store = storage_system_from_config(global_config[key_long], None) - else: - queue_store = storage_system_from_config(app_config, key_short) + queue_store = storage_system_from_config(global_config[key_long], None) setup_globals( public_store = public_store, |