diff -r 1e26ee53381f -r e4db89a5f6bc twisted/plugins/fixbot_nexus_plugin.py --- a/twisted/plugins/fixbot_nexus_plugin.py Sat Feb 20 21:56:27 2010 +0200 +++ b/twisted/plugins/fixbot_nexus_plugin.py Sat Feb 20 22:31:17 2010 +0200 @@ -6,9 +6,9 @@ from twisted.application import internet -from fixbot import config, nexus +from fixbot import config, nexus, api -class NexusOptions (config.ConfigOptions) : +class NexusOptions (api.ServerOptions) : optParameters = [ ( "irc-server", "s", "irc.fixme.fi", "IRC server hostname", ), @@ -16,9 +16,6 @@ ( "irc-nickname", "N", "FixBotDev", "IRC nickname", ), ( "irc-username", "U", "fixbot", "IRC username", ), ( "irc-channel", "C", "#fixme-test", "IRC channel", ), - ( "api-listen", "l", "127.0.0.1", "address for API server to listen on" ), - ( "api-port", "P", 34888, "port for API server to listen on", int ), - ( "api-secret", None, None, "secret key for API connections" ), ] optFlags = [ @@ -32,8 +29,8 @@ options = NexusOptions def makeService (self, config) : - if config['api-secret'] is None : - raise usage.UsageError("No value given for required option api-secret") + #if config['api-secret'] is None : + # raise usage.UsageError("No value given for required option api-secret") return nexus.makeService(config)