Moved world.version to conf.version.

plugins/Ctcp.py

@@ -42,6 +42,7 @@ import time
 
 sys.path.append(os.pardir)
 
+import conf
 import debug
 import ircmsgs
 import callbacks
@@ -58,7 +59,7 @@ class Ctcp(callbacks.PrivmsgRegexp):
     def version(self, irc, msg, match):
         "\x01VERSION\x01"
         debug.msg('Received CTCP VERSION from %s' % msg.nick, 'normal')
-        s = '\x01VERSION SupyBot %s\x01' % world.version
+        s = '\x01VERSION SupyBot %s\x01' % conf.version
         irc.queueMsg(notice(msg.nick, s))
 
     def userinfo(self, irc, msg, match):

src/MiscCommands.py

@@ -37,7 +37,6 @@ import os
 import pprint
 
 import conf
-import world
 import debug
 import privmsgs
 import callbacks
@@ -147,7 +146,7 @@ class MiscCommands(callbacks.Privmsg):
 
         Returns the version of the current bot.
         """
-        irc.reply(msg, world.version)
+        irc.reply(msg, conf.version)
 
     def source(self, irc, msg, args):
         """takes no arguments

src/conf.py

@@ -195,6 +195,8 @@ driverModule = 'asyncoreDrivers'
 ###############################
 ###############################
 ###############################
+version ='0.70.0'
+
 import debug
 
 class ConfigurationDict(dict):

src/world.py

@@ -47,9 +47,6 @@ except ImportError:
 import conf
 import debug
 
-# version: The version of the bot.
-version = '0.70.0'
-
 startedAt = 0.0
 
 threadsSpawned = 0