Tried to clean up the code a bit, and make it more readable.

Author: llam-en

actions.py

@@ -38,43 +38,48 @@
 ## OF, OR IN CONNECTION WITH THE WORK OR THE USE OF OR OTHER DEALINGS IN THE WORK.
 #
 
-# import the files required for this to work
+
+##  Import the files required for this to work.
 import requests, wikipedia
 import urbandictionary as ud
 import mwaaa
 from HTMLParser import HTMLParser
 from imdbparser import IMDb
 
-# define a list of commands 
+
+##  Define a list of commands.
 commands = ["?song", "?wiki", "?bye", "?ud", "?/", "?imdb"]
 commands += list(mwaaa.reply.keys())
 commands += ["PRIVMSG "+mwaaa.nick, mwaaa.updateKey]
 
+
+
 def act(c,msg,sender,mem):
-    
     with open('callLog', 'a') as f:
         f.write(sender+": "+c+"\n"+msg+"\n\n")
 
     r = ""
 
-    #basic text response
+
+    ##  Basic text response.
     if c in mwaaa.reply:
         r = mwaaa.reply[c]
 
-    #song
+
+    ##  Song.
     elif c == "?song":
         try:
             req = requests.get("http://letty.tk:8000/rds-xml.xsl")
             h = HTMLParser()
             r = h.unescape(req.content[29:-9])
 	    if len(r) < 3:
 		r = "I don't hear anything."			
-			
         except:
             r = "not now " + sender
-        #r = "This feature is disabled :("
+            #r = "This feature is disabled :("
+
 
-    #text replacement
+    ##  Text replacement.
     elif c == "?/":
         if msg[-1] == '/':
             msg = msg[:-1]
@@ -105,7 +110,8 @@ def act(c,msg,sender,mem):
         except:
 	    r = "well that didn't work :/"
 
-    #urban dictionary
+
+    ##  Urban Dictionary.
     elif c == "?ud":
         query = msg[msg.find("?ud") + 4:].replace('"',"'")
         try:
@@ -115,7 +121,8 @@ def act(c,msg,sender,mem):
         except:
             r = "well that didn't work :/"
 
-    #wikipedia
+
+    ##  Wikipedia.
     elif c == "?wiki":
         query = msg[msg.find("?wiki") + 6:]
         try:
@@ -128,7 +135,8 @@ def act(c,msg,sender,mem):
         except wikipedia.exceptions.PageError as e2:
             r = "Didn't find anything"
 
-    #IMDb
+
+    ##  IMDb.
     elif c == "?imdb":
         imdb = IMDb()
         title = msg[msg.find("?imdb") + 6:]
@@ -143,18 +151,24 @@ def act(c,msg,sender,mem):
 		r = movie.title+" ("+str(movie.year)+") -- "+movie.plot
 	except:
 	    r = "something went wrong :/"
-	    
-    #bot driver  ### this will need to be redone in llamabot.py
-#    if c == "PRIVMSG "+mwaaa.nick and sender in mwaaa.admins:
-#        r = msg[msg.find("PRIVMSG "+mwaaa.nick)+15:]
-#    elif c == "PRIVMSG "+mwaaa.nick and msg.find("?say") != -1:
-#        r = msg[msg.find("?say")+5:]
-    
-    #quit
+
+
+    """
+    ##  Bot driver.
+    ##  This will need to be redone in llamabot.py
+    if c == "PRIVMSG "+mwaaa.nick and sender in mwaaa.admins:
+        r = msg[msg.find("PRIVMSG "+mwaaa.nick)+15:]
+    elif c == "PRIVMSG "+mwaaa.nick and msg.find("?say") != -1:
+        r = msg[msg.find("?say")+5:]
+
+    """
+
+
+    ##  Quit.
     if c == "?bye" and sender in mwaaa.admins:
         exit(0)
-
     if c == mwaaa.updateKey:
         reload(mwaaa)
 
     return r.encode('utf-8')
+

llamabot.py

@@ -39,49 +39,54 @@
 #
 
 
-# import the required libraries/files for this to work
+##  Import the required libraries/files for this to work.
 import re, socket, os
 from time import sleep
 import actions
 import mwaaa
 import details
 
-# Connect to the internet, then to IRC(at freenode for now, but it can be changed to other servers)
+
+##  Connect to the internet, then to IRC (at freenode for now, but it can be changed to other servers).
 sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 sock.connect(("irc.freenode.net", 6667))
 sock.send("USER "+details.username+" 2 3 "+details.username+ "\n")
 sock.send("NICK "+details.nick+"\n")
 
-# use mwaaa.secret to use the password from the mwaaa.py file. 
+
+##  Use mwaaa.secret to use the password from the mwaaa.py file.
 sock.send("PRIVMSG NickServ :identify "+details.secret+" \n")
 sleep(30)  # finish ident before joining channel
 sock.send("JOIN "+details.channel+"\n")
 
-# instantiate message buffer
-msgMem = []
 
+##  Instantiate message buffer.
+msgMem = []
 while True:
     msg = sock.recv(2048)
     print(msg)
-    msg = msg.strip("\n\r")
 
+    msg = msg.strip("\n\r")
     sender = msg[1:msg.find('!')]
-    
     mloc = msg.find("PRIVMSG "+details.channel)+len(details.channel)+10
     msgMem.append(sender +"??"+ msg[mloc:])
 
     if len(msgMem) > 20:
         msgMem.pop(0)
-        
-# if you receive a /PING send a response
+
+
+    ##  If you receive a /PING send a response.
     if msg.find("PING :") != -1:
         sock.send("PONG :pingis\n")
-# if you find the update key defined in mwaaa.py, print 'update complete' and reload actions.py and mwaaa.py
+
+
+    ##  If you find the update key defined in mwaaa.py, print 'update complete' and reload actions.py and mwaaa.py
     if msg.find(mwaaa.updateKey) != -1:
         print("update complete")
         reload(actions)
         reload(mwaaa)
 
+
     for command in actions.commands:
         msgLow = msg.lower()
         if msgLow.find(command.lower()) != -1:

mwaaa.py

@@ -39,38 +39,42 @@
 #
 
 
-# change all of these things:
 
-nick = "pronk"          # the nickname the bot uses
-username = "pronk"      # the bot's username
-channel = "##llamas"  # the channel it joins when you start the bot script 
-secret = "notreallythis" 
-updateKey = "?update"   # the command for updating the bot
-admins = ["mikez"]      # a list of admins for the bot, who can give commands 
+##  Change all of these things:
+nick = "pronk"             # the nickname the bot uses
+username = "pronk"         # the username the bot uses
+channel = "##llamas"       # the channel  the bot joins, when you start the bot script 
+secret = "notreallythis"   # -
+updateKey = "?update"      # the command for updating the bot
+admins = ["mikez"]         # the list of Admins for the bot, who can give commands 
+
+
+
+##  The reply ["?foo"] list below, defines a list of replies for preset commands.
+##  They can be used for comedic effect.
+reply = dict()           #   <--- create the reply dictionary
+reply["?duckgoose"]      =  "The coolest duck/goose hybrid around. He's so perfect, words can't describe his awesomeness."
+reply["?fChanX"]         =  "One young, vibrant and perfect llama. <3"
+reply["?GPenguin"]       =  "Being from Germany, he enjoys meeting all kinds of people on IRC"
+reply["?help"]           =  "You're on your own."
+reply["?Kremator"]       =  "Booo!"
+reply["?letty"]          =  "All hail letty, our llama queen. She's leet af."
+reply["?list"]           =  "?song ?wiki ?ud ?/old/new ?help"
+reply["?mikez"]          =  "My daddy! :)"
+reply["?more"]           =  "No! No more!"
+reply["?mwaaa"]          =  "That's llama speak."
+reply["?Nawab"]          =  "The cool and sometimes mischievious guy next door who likes C++ and tea."
+reply["?[n0mad]"]        =  "[n0mwaaad]"
+reply["?pebble"]         =  "o"
+reply["?pronk"]          =  "Who me? llamabot by mikellama, https://github.com/mikellama/ircbot-llama/"
+reply["?radio"]          =  "http://letty.tk"
+reply["?Roserin"]        =  "?Hm yes."
+reply["?shantaram3013"]  =  "The cliche Asian whiz kid/emotional teenager. Loves electrical engineering and hanging out on ##llamas."
+reply["?Taco"]           =  "Im yummy! Gobble me up in a hurry and go to taco heaven!"
+reply["?Time-Warp"]      =  "OH NOZ!"
+reply["?website"]        =  "http://llamas.haxed.net"
+reply["?welcome"]        =  "[Welcome to ##llamas] - \"Keep calm and be a llama!\" We generally talk about anything here, as long as we respect the wishes of the owner of this channel."
+reply["?wodencafe"]      =  "The Java master!"
+reply["?WSPR"]           =  "Weak Signal Propagation Reporter"
+reply["?Zerock"]         =  "Henlo. Please remember, Zerock is the leetest llama."
 
-# the reply ["?foo"] list below defines a list of replies for preset commands that can be used for comedic effect
-reply = dict()
-reply["?duckgoose"] = "The coolest duck/goose hybrid around. He's so perfect, words can't describe his awesomeness."
-reply["?fChanX"] = "One young, vibrant and perfect llama. <3"
-reply["?GPenguin"] = "Being from Germany, he enjoys meeting all kinds of people on IRC"
-reply["?help"] = "You're on your own."
-reply["?Kremator"] = "Booo!"
-reply["?letty"] = "All hail letty, our llama queen. She's leet af."
-reply["?list"] = "?song ?wiki ?ud ?/old/new ?help"
-reply["?mikez"] = "My daddy! :)"
-reply["?more"] = "No! No more!"
-reply["?mwaaa"] = "That's llama speak."
-reply["?Nawab"] = "The cool and sometimes mischievious guy next door who likes C++ and tea."
-reply["?[n0mad]"] = "[n0mwaaad]"
-reply["?pebble"] = "o"
-reply["?pronk"] = "Who me? llamabot by mikellama, https://github.com/mikellama/ircbot-llama/"
-reply["?radio"] = "http://letty.tk"
-reply["?Roserin"] = "?Hm yes."
-reply["?shantaram3013"] = "The cliche Asian whiz kid/emotional teenager. Loves electrical engineering and hanging out on ##llamas."
-reply["?Taco"] = "Im yummy! Gobble me up in a hurry and go to taco heaven!"
-reply["?Time-Warp"] = "OH NOZ!"
-reply["?website"] = "http://llamas.haxed.net"
-reply["?welcome"] = "[Welcome to ##llamas] - \"Keep calm and be a llama!\" We generally talk about anything here, as long as we respect the wishes of the owner of this channel."
-reply["?wodencafe"] = "The Java master!"
-reply["?WSPR"] = "Weak Signal Propagation Reporter"
-reply["?Zerock"] = "Henlo. Please remember, Zerock is the leetest llama."