Forgot questions.

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?')

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')

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)')

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

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):

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:

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?'):

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

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

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)
 
 

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

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?')

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')

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

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

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)
 
 

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:

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.

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):

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.')

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?')

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

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.

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:

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)
 
 

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)
 
 

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

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)
 
 

scripts/supybot-wizard

@@ -21,8 +21,8 @@ import supybot.utils as utils
 import supybot.ircutils as ircutils
 import supybot.registry as registry
 
-import questions
+import supybot.questions as questions
-from questions import output, yn, anything, something, expect, getpass
+from supybot.questions import output, yn, anything, something, expect, getpass
 
 def getPlugins(pluginDirs):
     filenames = []