X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/b2a896c852df233548af2c772bac07c76f184e3d..d1ea29460cb89ae52cad1c26f5f95b82d9b21320:/erebus.py

diff --git a/erebus.py b/erebus.py
index 68d6bc7..f8c7143 100644
--- a/erebus.py
+++ b/erebus.py
@@ -20,7 +20,6 @@ class Erebus(object):
 		chans = []
 
 		def __init__(self, nick, auth=None):
-			print "parent.User(self, %r, %r)" % (nick, auth)
 			self.nick = nick
 			self.auth = auth
 			self.checklevel()
@@ -35,19 +34,19 @@ class Erebus(object):
 
 		def checklevel(self):
 			if self.auth is None:
-				self.level = -1
+				self.glevel = -1
 			else:
 				c = main.db.cursor()
 				c.execute("SELECT level FROM users WHERE auth = %s", (self.auth,))
 				row = c.fetchone()
 				if row is not None:
-					self.level = row['level']
+					self.glevel = row['level']
 				else:
-					self.level = 0
-			return self.level
+					self.glevel = 0
+			return self.glevel
 
 		def __str__(self): return self.nick
-		def __repr__(self): return "<User %r (%d)>" % (self.nick,self.level)
+		def __repr__(self): return "<User %r (%d)>" % (self.nick,self.glevel)
 
 	class Channel(object):
 		users = []
@@ -143,7 +142,6 @@ def setup():
 	main = Erebus(cfg.trigger)
 
 	autoloads = [mod for mod, yes in cfg.items('autoloads') if int(yes) == 1]
-	print autoloads
 	for mod in autoloads:
 		ctlmod.load(main, mod)
 
@@ -163,7 +161,8 @@ def setup():
 def loop():
 	poready = main.poll()
 	for fileno in poready:
-		main.fd(fileno).getdata()
+		for line in main.fd(fileno).getdata():
+			main.fd(fileno).parse(line)
 
 if __name__ == '__main__':
 	setup()