diff --git a/plugins/Amazon.py b/plugins/Amazon.py
index ca73e2d33..0d3e69d9d 100644
--- a/plugins/Amazon.py
+++ b/plugins/Amazon.py
@@ -50,7 +50,7 @@ import callbacks
def configure(advanced):
- from questions import expect, anything, something, yn
+ from questions import output, expect, anything, something, yn
output('To use Amazon\'s Web Services, you must have a license key.')
if yn('Do you have a license key?'):
key = anything('What is it?')
diff --git a/plugins/BadWords.py b/plugins/BadWords.py
index d3bbf9551..868e512ea 100644
--- a/plugins/BadWords.py
+++ b/plugins/BadWords.py
@@ -51,7 +51,7 @@ import registry
import callbacks
def configure(advanced):
- from questions import expect, anything, something, yn
+ from questions import output, expect, anything, something, yn
conf.registerPlugin('BadWords', True)
if yn('Would you like to add some bad words?'):
words = anything('What words? (separate individual words by spaces)')
diff --git a/plugins/Bugzilla.py b/plugins/Bugzilla.py
index 2c2b0ebca..3b239c70a 100644
--- a/plugins/Bugzilla.py
+++ b/plugins/Bugzilla.py
@@ -91,7 +91,7 @@ class BugzillaError(Exception):
def configure(advanced):
- from questions import expect, anything, yn
+ from questions import output, expect, anything, yn
conf.registerPlugin('Bugzilla', True)
output("""The Bugzilla plugin has the functionality to watch for URLs
that match a specific pattern (we call this a snarfer). When
diff --git a/plugins/Dict.py b/plugins/Dict.py
index 4ebdb2970..e67f440d0 100644
--- a/plugins/Dict.py
+++ b/plugins/Dict.py
@@ -53,7 +53,7 @@ import callbacks
def configure(advanced):
- from questions import expect, anything, something, yn
+ from questions import output, expect, anything, something, yn
output('The default dictd server is dict.org.')
if yn('Would you like to specify a different dictd server?'):
server = something('What server?')
diff --git a/plugins/Ebay.py b/plugins/Ebay.py
index 83c6cabed..a4fe86503 100644
--- a/plugins/Ebay.py
+++ b/plugins/Ebay.py
@@ -53,7 +53,7 @@ import callbacks
def configure(advanced):
- from questions import expect, anything, something, yn
+ from questions import output, expect, anything, something, yn
conf.registerPlugin('Ebay', True)
output("""The Ebay plugin has the functionality to watch for URLs
that match a specific pattern (we call this a snarfer). When
diff --git a/plugins/Enforcer.py b/plugins/Enforcer.py
index 01c9e1c11..9eb02b4bb 100644
--- a/plugins/Enforcer.py
+++ b/plugins/Enforcer.py
@@ -50,7 +50,7 @@ import registry
import callbacks
def configure(advanced):
- from questions import expect, anything, something, yn
+ from questions import output, expect, anything, something, yn
conf.registerPlugin('Enforcer', True)
chanserv = anything("""What\'s the name of ChanServ on your network? If
there is no ChanServ on your network, just press
diff --git a/plugins/Gameknot.py b/plugins/Gameknot.py
index a0ad8f0c8..fe6800b0d 100644
--- a/plugins/Gameknot.py
+++ b/plugins/Gameknot.py
@@ -52,7 +52,7 @@ import callbacks
def configure(advanced):
- from questions import expect, anything, something, yn
+ from questions import output, expect, anything, something, yn
conf.registerPlugin('Gameknot', True)
if advanced:
output("""The Gameknot plugin has the functionality to watch for URLs
diff --git a/plugins/Google.py b/plugins/Google.py
index 7d4e9e5a8..ae46bcb2c 100644
--- a/plugins/Google.py
+++ b/plugins/Google.py
@@ -60,7 +60,7 @@ import callbacks
import structures
def configure(advanced):
- from questions import expect, anything, something, yn
+ from questions import output, expect, anything, something, yn
output('To use Google\'t Web Services, you must have a license key.')
if yn('Do you have a license key?'):
key = something('What is it?')
diff --git a/plugins/Lookup.py b/plugins/Lookup.py
index a41ff68a0..d7ba5aa5b 100644
--- a/plugins/Lookup.py
+++ b/plugins/Lookup.py
@@ -57,7 +57,7 @@ except ImportError:
'plugin. Download it at '
def configure(advanced):
- from questions import expect, anything, something, yn
+ from questions import output, expect, anything, something, yn
conf.registerPlugin('Lookup', True)
lookups = conf.supybot.plugins.Lookup.lookups
output("""This module allows you to define commands that do a simple key
diff --git a/plugins/Parter.py b/plugins/Parter.py
index 88e399937..8d04d10eb 100644
--- a/plugins/Parter.py
+++ b/plugins/Parter.py
@@ -50,7 +50,7 @@ import privmsgs
import callbacks
def configure(advanced):
- from questions import something, yn
+ from questions import output, something, yn
conf.registerPlugin('Parter', True)
channel = ' '
while channel:
diff --git a/plugins/Python.py b/plugins/Python.py
index 388fcec08..a7e426406 100644
--- a/plugins/Python.py
+++ b/plugins/Python.py
@@ -66,7 +66,7 @@ if hasattr(math, '__file__'):
pythonPath = map(os.path.dirname, L)
def configure(advanced):
- from questions import expect, anything, something, yn
+ from questions import output, expect, anything, something, yn
conf.registerPlugin('Python', True)
if yn("""This plugin provides a snarfer for ASPN Python Recipe URLs;
it will output the name of the Recipe when it sees such a URL.
diff --git a/plugins/RSS.py b/plugins/RSS.py
index 5dbbaa54e..bc4e52ce7 100644
--- a/plugins/RSS.py
+++ b/plugins/RSS.py
@@ -52,7 +52,7 @@ import registry
import callbacks
def configure(advanced):
- from questions import expect, anything, something, yn
+ from questions import output, expect, anything, something, yn
conf.registerPlugin('RSS', True)
prompt = 'Would you like to add an RSS feed?'
while yn(prompt):
diff --git a/plugins/Relay.py b/plugins/Relay.py
index 0beab6c2c..d338e85e0 100644
--- a/plugins/Relay.py
+++ b/plugins/Relay.py
@@ -56,7 +56,7 @@ import callbacks
def configure(advanced):
import socket
- from questions import expect, anything, something, yn
+ from questions import output, expect, anything, something, yn
conf.registerPlugin('Relay', True)
startNetwork = anything('What is the name of the network you\'re '
'connecting to first?')
@@ -116,6 +116,9 @@ conf.registerChannelValue(conf.supybot.plugins.Relay, 'color',
conf.registerChannelValue(conf.supybot.plugins.Relay, 'topicSync',
registry.Boolean(True, """Determines whether the bot will synchronize
topics between networks in the channels it relays."""))
+
+conf.registerGroup(conf.supybot.plugins.Relay, 'networks')
+
class Relay(callbacks.Privmsg):
noIgnore = True
priority = sys.maxint
@@ -139,6 +142,9 @@ class Relay(callbacks.Privmsg):
callbacks.Privmsg.__call__(self, irc, msg)
def do376(self, irc, msg):
+# channels = []
+# networks = conf.supybot.plugins.Relay.networks
+# networked = [irc.network for irc in world.ircs]
if self.channels:
irc.queueMsg(ircmsgs.joins(self.channels))
do377 = do422 = do376
diff --git a/plugins/Services.py b/plugins/Services.py
index 40bbae1b3..be0286a44 100644
--- a/plugins/Services.py
+++ b/plugins/Services.py
@@ -49,7 +49,7 @@ import schedule
import callbacks
def configure(advanced):
- from questions import expect, anything, something, yn
+ from questions import output, expect, anything, something, yn
conf.registerPlugin('Services', True)
nick = something('What is your registered nick?')
password = something('What is your password for that nick?')
diff --git a/plugins/Sourceforge.py b/plugins/Sourceforge.py
index dae963580..61b224dfd 100644
--- a/plugins/Sourceforge.py
+++ b/plugins/Sourceforge.py
@@ -54,7 +54,7 @@ import callbacks
def configure(advanced):
- from questions import expect, anything, something, yn
+ from questions import output, expect, anything, something, yn
conf.registerPlugin('Sourceforge', True)
output("""The Sourceforge plugin has the functionality to watch for URLs
that match a specific pattern (we call this a snarfer). When
diff --git a/plugins/URL.py b/plugins/URL.py
index 28b8d36f4..813a85d9b 100644
--- a/plugins/URL.py
+++ b/plugins/URL.py
@@ -62,7 +62,7 @@ except ImportError:
'plugin. Download it at '
def configure(advanced):
- from questions import expect, anything, something, yn
+ from questions import output, expect, anything, something, yn
conf.registerPlugin('URL', True)
if yn("""This plugin offers a snarfer that will go to tinyurl.com and get
a shorter version of long URLs that are sent to the channel.
diff --git a/plugins/Unix.py b/plugins/Unix.py
index e8e9268a0..e0f7651d8 100644
--- a/plugins/Unix.py
+++ b/plugins/Unix.py
@@ -55,7 +55,7 @@ import callbacks
import utils
def configure(advanced):
- from questions import expect, anything, something, yn
+ from questions import output, expect, anything, something, yn
conf.registerPlugin('Unix', True)
spellCmd = utils.findBinaryInPath('aspell')
if not spellCmd: