moving config information to config/

actions.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8  -*-
 
 import string, re, subprocess
-from config import *
+from config.irc_config import *
 
 s, send, say, action, notice, join = None, None, None, None, None, None
 

bot.py

@@ -3,8 +3,8 @@
 ## Imports
 import socket, string, re
 from actions import *
-from config import *
-from secure_config import *
+from config.irc_config import *
+from config.secure_config import *
 
 def send(msg): # send a message 'msg' to the server
     s.send(msg + "\r\n")

config.py → config/irc_config.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8  -*-
 
+# EarwigBot Configuration File
+# This file contains information that the bot uses to connect to IRC.
+
 # our server's hostname
 HOST = "irc.freenode.net"
 
@@ -18,8 +21,5 @@ REALNAME = "[[w:en:User:EarwigBot]]"
 # channel to join on startup
 CHANS = ["##earwigbot"]
 
-# sleep this number of seconds in between API calls and messages sent to IRC
-THROTTLE = 1
-
 # hostnames of users who can update/restart the bot with !update
 ADMINS = ["wikipedia/The-Earwig"]