storage Config: Stop being backward compatible (beginning).

Chris Webber says "no backward compatibility for this".
So start removing the backward compat stuff.
This commit is contained in:
Elrond 2011-08-07 17:41:24 +02:00
parent ed7970696e
commit f7d73aeb34

View File

@ -117,19 +117,11 @@ def setup_storage():
key_short = 'publicstore' key_short = 'publicstore'
key_long = "storage:" + key_short key_long = "storage:" + key_short
if global_config.has_key(key_long): public_store = storage_system_from_config(global_config[key_long], None)
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)
key_short = 'queuestore' key_short = 'queuestore'
key_long = "storage:" + key_short key_long = "storage:" + key_short
if global_config.has_key(key_long): queue_store = storage_system_from_config(global_config[key_long], None)
queue_store = storage_system_from_config(global_config[key_long], None)
else:
queue_store = storage_system_from_config(app_config, key_short)
setup_globals( setup_globals(
public_store = public_store, public_store = public_store,