diff -r fee3a1f28ed7 -r 9b1f9bc74f5d devtools/__init__.py --- a/devtools/__init__.py Fri Feb 18 17:11:45 2011 +0100 +++ b/devtools/__init__.py Mon Mar 07 17:02:15 2011 +0100 @@ -85,20 +85,10 @@ read_instance_schema = False init_repository = True db_require_setup = True - options = cwconfig.merge_options(ServerConfiguration.options + ( - ('anonymous-user', - {'type' : 'string', - 'default': None, - 'help': 'login of the CubicWeb user account to use for anonymous user (if you want to allow anonymous)', - 'group': 'main', 'level': 1, - }), - ('anonymous-password', - {'type' : 'string', - 'default': None, - 'help': 'password of the CubicWeb user account matching login', - 'group': 'main', 'level': 1, - }), - )) + options = cwconfig.merge_options( + ServerConfiguration.options + + tuple((opt, optdict) for opt, optdict in TwistedConfiguration.options + if opt in ('anonymous-user', 'anonymous-password'))) def __init__(self, appid, apphome=None, log_threshold=logging.CRITICAL+10): # must be set before calling parent __init__