From aabd095239a613cbd6225e3cfaf4157dac1b4712 Mon Sep 17 00:00:00 2001
From: Jeremy Fincher <jemfinch@users.sourceforge.net>
Date: Thu, 28 Aug 2003 13:59:07 +0000
Subject: [PATCH] Moved world.version to conf.version.

---
 plugins/Ctcp.py     | 3 ++-
 src/MiscCommands.py | 3 +--
 src/conf.py         | 2 ++
 src/world.py        | 3 ---
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/plugins/Ctcp.py b/plugins/Ctcp.py
index dd7cf35b3..5bdca686e 100644
--- a/plugins/Ctcp.py
+++ b/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):
diff --git a/src/MiscCommands.py b/src/MiscCommands.py
index ef70b2814..134039d71 100755
--- a/src/MiscCommands.py
+++ b/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
diff --git a/src/conf.py b/src/conf.py
index b91ccddc8..7bc977c82 100644
--- a/src/conf.py
+++ b/src/conf.py
@@ -195,6 +195,8 @@ driverModule = 'asyncoreDrivers'
 ###############################
 ###############################
 ###############################
+version ='0.70.0'
+
 import debug
 
 class ConfigurationDict(dict):
diff --git a/src/world.py b/src/world.py
index 247b10f69..3e9aa0d55 100644
--- a/src/world.py
+++ b/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