From 16f4231780057ac791aebcf75e4753eb9a74bb2e Mon Sep 17 00:00:00 2001
From: Jeremy Fincher <jemfinch@users.sourceforge.net>
Date: Sun, 25 Jul 2004 18:24:51 +0000
Subject: [PATCH] Forgot questions.

---
 plugins/Amazon.py         | 2 +-
 plugins/Anonymous.py      | 2 +-
 plugins/BadWords.py       | 2 +-
 plugins/Bugzilla.py       | 2 +-
 plugins/ChannelRelay.py   | 2 +-
 plugins/Debian.py         | 2 +-
 plugins/Dict.py           | 2 +-
 plugins/Ebay.py           | 2 +-
 plugins/Enforcer.py       | 2 +-
 plugins/Format.py         | 2 +-
 plugins/Gameknot.py       | 2 +-
 plugins/Google.py         | 2 +-
 plugins/Infobot.py        | 2 +-
 plugins/LogToIrc.py       | 2 +-
 plugins/Lookup.py         | 2 +-
 plugins/Nickometer.py     | 2 +-
 plugins/Parter.py         | 2 +-
 plugins/Python.py         | 2 +-
 plugins/RSS.py            | 2 +-
 plugins/Relay.py          | 2 +-
 plugins/Services.py       | 2 +-
 plugins/Sourceforge.py    | 2 +-
 plugins/URL.py            | 2 +-
 plugins/Unix.py           | 2 +-
 plugins/UserInfo.py       | 2 +-
 plugins/XMLLogger.py      | 2 +-
 scripts/supybot-adduser   | 2 +-
 scripts/supybot-newplugin | 4 ++--
 scripts/supybot-wizard    | 4 ++--
 29 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/plugins/Amazon.py b/plugins/Amazon.py
index d94ec913d..4f5de0004 100644
--- a/plugins/Amazon.py
+++ b/plugins/Amazon.py
@@ -51,7 +51,7 @@ import supybot.callbacks as callbacks
 
 
 def configure(advanced):
-    from questions import output, expect, anything, something, yn
+    from supybot.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/Anonymous.py b/plugins/Anonymous.py
index 087cea241..3305b5bdd 100644
--- a/plugins/Anonymous.py
+++ b/plugins/Anonymous.py
@@ -51,7 +51,7 @@ def configure(advanced):
     # a bool that specifies whether the user identified himself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
-    from questions import expect, anything, something, yn
+    from supybot.questions import expect, anything, something, yn
     conf.registerPlugin('Anonymous', True)
 
 conf.registerPlugin('Anonymous')
diff --git a/plugins/BadWords.py b/plugins/BadWords.py
index fea2f4ff9..1fdbf1b56 100644
--- a/plugins/BadWords.py
+++ b/plugins/BadWords.py
@@ -53,7 +53,7 @@ import supybot.registry as registry
 import supybot.callbacks as callbacks
 
 def configure(advanced):
-    from questions import output, expect, anything, something, yn
+    from supybot.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 0f7395791..ef761953f 100644
--- a/plugins/Bugzilla.py
+++ b/plugins/Bugzilla.py
@@ -90,7 +90,7 @@ class BugzillaError(Exception):
 
 
 def configure(advanced):
-    from questions import output, expect, anything, yn
+    from supybot.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/ChannelRelay.py b/plugins/ChannelRelay.py
index 7c5790c76..b680e2345 100644
--- a/plugins/ChannelRelay.py
+++ b/plugins/ChannelRelay.py
@@ -91,7 +91,7 @@ def configure(onStart, afterConnect, advanced):
     # afterConnect are both lists.  Append to onStart the commands you would
     # like to be run when the bot is started; append to afterConnect the
     # commands you would like to be run when the bot has finished connecting.
-    from questions import expect, anything, something, yn, output
+    from supybot.questions import expect, anything, something, yn, output
     conf.registerPlugin('ChannelRelay', True)
 
 class ChannelRelay(callbacks.Privmsg):
diff --git a/plugins/Debian.py b/plugins/Debian.py
index 9253bc638..c9750522e 100644
--- a/plugins/Debian.py
+++ b/plugins/Debian.py
@@ -59,7 +59,7 @@ import supybot.callbacks as callbacks
 
 
 def configure(advanced):
-    from questions import output, expect, anything, something, yn
+    from supybot.questions import output, expect, anything, something, yn
     conf.registerPlugin('Debian', True)
     if not utils.findBinaryInPath('zgrep'):
         if not advanced:
diff --git a/plugins/Dict.py b/plugins/Dict.py
index c34848a78..67b6e98a9 100644
--- a/plugins/Dict.py
+++ b/plugins/Dict.py
@@ -53,7 +53,7 @@ import supybot.callbacks as callbacks
 
 
 def configure(advanced):
-    from questions import output, expect, anything, something, yn
+    from supybot.questions import output, expect, anything, something, yn
     conf.registerPlugin('Dict', True)
     output('The default dictd server is dict.org.')
     if yn('Would you like to specify a different dictd server?'):
diff --git a/plugins/Ebay.py b/plugins/Ebay.py
index fd10ca321..1ec40294c 100644
--- a/plugins/Ebay.py
+++ b/plugins/Ebay.py
@@ -51,7 +51,7 @@ import supybot.callbacks as callbacks
 
 
 def configure(advanced):
-    from questions import output, expect, anything, something, yn
+    from supybot.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 e4d59d0ac..90ef8aca9 100644
--- a/plugins/Enforcer.py
+++ b/plugins/Enforcer.py
@@ -51,7 +51,7 @@ import supybot.registry as registry
 import supybot.callbacks as callbacks
 
 def configure(advanced):
-    from questions import output, expect, anything, something, yn
+    from supybot.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/Format.py b/plugins/Format.py
index 9aa8bd91f..b8b8dffa6 100644
--- a/plugins/Format.py
+++ b/plugins/Format.py
@@ -52,7 +52,7 @@ def configure(advanced):
     # a bool that specifies whether the user identified himself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
-    from questions import expect, anything, something, yn
+    from supybot.questions import expect, anything, something, yn
     conf.registerPlugin('Format', True)
 
 
diff --git a/plugins/Gameknot.py b/plugins/Gameknot.py
index bd842341a..d7d6f91f2 100644
--- a/plugins/Gameknot.py
+++ b/plugins/Gameknot.py
@@ -52,7 +52,7 @@ import supybot.callbacks as callbacks
 
 
 def configure(advanced):
-    from questions import output, expect, anything, something, yn
+    from supybot.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 cd77b1dd3..251a4773c 100644
--- a/plugins/Google.py
+++ b/plugins/Google.py
@@ -60,7 +60,7 @@ import supybot.callbacks as callbacks
 import supybot.structures as structures
 
 def configure(advanced):
-    from questions import output, expect, anything, something, yn
+    from supybot.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/Infobot.py b/plugins/Infobot.py
index 92ed6ef04..66f47f32b 100755
--- a/plugins/Infobot.py
+++ b/plugins/Infobot.py
@@ -73,7 +73,7 @@ def configure(advanced):
     # a bool that specifies whether the user identified himself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
-    from questions import expect, anything, something, yn
+    from supybot.questions import expect, anything, something, yn
     conf.registerPlugin('Infobot', True)
 
 filename = os.path.join(conf.supybot.directories.data(), 'Infobot.db')
diff --git a/plugins/LogToIrc.py b/plugins/LogToIrc.py
index 29f8c0da1..194eb51c4 100644
--- a/plugins/LogToIrc.py
+++ b/plugins/LogToIrc.py
@@ -182,7 +182,7 @@ conf.registerGlobalValue(conf.supybot.plugins.LogToIrc, 'notice',
     True and the target is a nick, not a channel."""))
 
 def configure(advanced):
-    from questions import something, anything, yn, output
+    from supybot.questions import something, anything, yn, output
     output("""Here you can set which channels and who the bot has to send log
               messages to. Note that by default in order to log to a channel
               the channel has to have mode +s set. Logging to a user requires
diff --git a/plugins/Lookup.py b/plugins/Lookup.py
index 557bd94c7..c3c575a05 100644
--- a/plugins/Lookup.py
+++ b/plugins/Lookup.py
@@ -57,7 +57,7 @@ except ImportError:
                            'plugin.  Download it at <http://pysqlite.sf.net/>'
 
 def configure(advanced):
-    from questions import output, expect, anything, something, yn
+    from supybot.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/Nickometer.py b/plugins/Nickometer.py
index aca27c1df..0803312aa 100644
--- a/plugins/Nickometer.py
+++ b/plugins/Nickometer.py
@@ -90,7 +90,7 @@ def configure(advanced):
     # a bool that specifies whether the user identified himself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
-    from questions import expect, anything, something, yn
+    from supybot.questions import expect, anything, something, yn
     conf.registerPlugin('Nickometer', True)
 
 
diff --git a/plugins/Parter.py b/plugins/Parter.py
index 066f97769..4cd5533e3 100644
--- a/plugins/Parter.py
+++ b/plugins/Parter.py
@@ -50,7 +50,7 @@ import supybot.privmsgs as privmsgs
 import supybot.callbacks as callbacks
 
 def configure(advanced):
-    from questions import output, something, yn
+    from supybot.questions import output, something, yn
     conf.registerPlugin('Parter', True)
     channel = ' '
     while channel:
diff --git a/plugins/Python.py b/plugins/Python.py
index ddd049c4c..a8de95865 100644
--- a/plugins/Python.py
+++ b/plugins/Python.py
@@ -68,7 +68,7 @@ if hasattr(math, '__file__'):
 pythonPath = map(os.path.dirname, L)
 
 def configure(advanced):
-    from questions import output, expect, anything, something, yn
+    from supybot.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 82e9f00bc..93db960b3 100644
--- a/plugins/RSS.py
+++ b/plugins/RSS.py
@@ -56,7 +56,7 @@ import supybot.registry as registry
 import supybot.callbacks as callbacks
 
 def configure(advanced):
-    from questions import output, expect, anything, something, yn
+    from supybot.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 ead45b129..a0ed4c899 100644
--- a/plugins/Relay.py
+++ b/plugins/Relay.py
@@ -56,7 +56,7 @@ import supybot.registry as registry
 import supybot.callbacks as callbacks
 
 def configure(advanced):
-    from questions import output, expect, anything, something, yn
+    from supybot.questions import output, expect, anything, something, yn
     conf.registerPlugin('Relay', True)
     if yn('Would you like to relay between any channels?'):
         channels = anything('What channels?  Separated them by spaces.')
diff --git a/plugins/Services.py b/plugins/Services.py
index d9f8e256d..f029528fa 100644
--- a/plugins/Services.py
+++ b/plugins/Services.py
@@ -49,7 +49,7 @@ import supybot.schedule as schedule
 import supybot.callbacks as callbacks
 
 def configure(advanced):
-    from questions import output, expect, anything, something, yn
+    from supybot.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 bc909be53..29405f1f8 100644
--- a/plugins/Sourceforge.py
+++ b/plugins/Sourceforge.py
@@ -56,7 +56,7 @@ import supybot.callbacks as callbacks
 
 
 def configure(advanced):
-    from questions import output, expect, anything, something, yn
+    from supybot.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 6604c3887..4c9bff7e4 100644
--- a/plugins/URL.py
+++ b/plugins/URL.py
@@ -62,7 +62,7 @@ except ImportError:
                            'plugin.  Download it at <http://pysqlite.sf.net/>'
 
 def configure(advanced):
-    from questions import output, expect, anything, something, yn
+    from supybot.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 0f9f987d5..9c438bb52 100644
--- a/plugins/Unix.py
+++ b/plugins/Unix.py
@@ -56,7 +56,7 @@ import supybot.privmsgs as privmsgs
 import supybot.callbacks as callbacks
 
 def configure(advanced):
-    from questions import output, expect, anything, something, yn
+    from supybot.questions import output, expect, anything, something, yn
     conf.registerPlugin('Unix', True)
     spellCmd = utils.findBinaryInPath('aspell')
     if not spellCmd:
diff --git a/plugins/UserInfo.py b/plugins/UserInfo.py
index 833818784..e99c4a73d 100644
--- a/plugins/UserInfo.py
+++ b/plugins/UserInfo.py
@@ -58,7 +58,7 @@ def configure(advanced):
     # a bool that specifies whether the user identified himself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
-    from questions import expect, anything, something, yn
+    from supybot.questions import expect, anything, something, yn
     conf.registerPlugin('UserInfo', True)
 
 
diff --git a/plugins/XMLLogger.py b/plugins/XMLLogger.py
index 45d9c0738..338154fc3 100644
--- a/plugins/XMLLogger.py
+++ b/plugins/XMLLogger.py
@@ -62,7 +62,7 @@ def configure(advanced):
     # a bool that specifies whether the user identified himself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
-    from questions import expect, anything, something, yn
+    from supybot.questions import expect, anything, something, yn
     conf.registerPlugin('XMLLogger', True)
 
 
diff --git a/scripts/supybot-adduser b/scripts/supybot-adduser
index 58fd07db2..a13b37b96 100755
--- a/scripts/supybot-adduser
+++ b/scripts/supybot-adduser
@@ -32,7 +32,7 @@
 import supybot
 
 import supybot.fix as fix
-from questions import *
+from supybot.questions import *
 
 import os
 import sys
diff --git a/scripts/supybot-newplugin b/scripts/supybot-newplugin
index 41ca792b7..f459f96ee 100755
--- a/scripts/supybot-newplugin
+++ b/scripts/supybot-newplugin
@@ -12,7 +12,7 @@ if sys.version_info < (2, 3, 0):
     sys.exit(-1)
 
 import supybot.conf as conf
-from questions import *
+from supybot.questions import *
 
 template = '''
 #!%s
@@ -66,7 +66,7 @@ def configure(advanced):
     # a bool that specifies whether the user identified himself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
-    from questions import expect, anything, something, yn
+    from supybot.questions import expect, anything, something, yn
     conf.registerPlugin(%r, True)
 
 
diff --git a/scripts/supybot-wizard b/scripts/supybot-wizard
index 47c5356f6..2bb366fd3 100755
--- a/scripts/supybot-wizard
+++ b/scripts/supybot-wizard
@@ -21,8 +21,8 @@ import supybot.utils as utils
 import supybot.ircutils as ircutils
 import supybot.registry as registry
 
-import questions
-from questions import output, yn, anything, something, expect, getpass
+import supybot.questions as questions
+from supybot.questions import output, yn, anything, something, expect, getpass
 
 def getPlugins(pluginDirs):
     filenames = []