From 78d5cad8193d344ec32cd29596e50044c018fbf5 Mon Sep 17 00:00:00 2001 From: neersighted Date: Wed, 9 May 2012 12:51:44 -0700 Subject: [PATCH 1/2] Fixed derpcode (import IN a command) --- plugins/factoids.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/plugins/factoids.py b/plugins/factoids.py index bf3bee2..6aa2e1a 100755 --- a/plugins/factoids.py +++ b/plugins/factoids.py @@ -1,7 +1,4 @@ -""" -remember.py: written by Scaevolus 20101 -""" - +# Written by Scaevolus 2010 from util import hook import string import re From 742fc505dd306a8ca2e870c0b48dd4c3b547bb19 Mon Sep 17 00:00:00 2001 From: neersighted Date: Wed, 9 May 2012 12:58:28 -0700 Subject: [PATCH 2/2] Updated code in feelings.py to match violence.py --- plugins/feelings.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/plugins/feelings.py b/plugins/feelings.py index 4561c5b..41fbfee 100755 --- a/plugins/feelings.py +++ b/plugins/feelings.py @@ -8,16 +8,12 @@ insults = [] flirts = [] with open("plugins/data/insults.txt") as f: - for line in f.readlines(): - if line.startswith("//"): - continue - insults.append(line.strip()) + insults = [line.strip() for line in f.readlines() + if not line.startswith("//")] with open("plugins/data/flirts.txt") as f: - for line in f.readlines(): - if line.startswith("//"): - continue - flirts.append(line.strip()) + flirts = [line.strip() for line in f.readlines() + if not line.startswith("//")] @hook.command