From: W. Trevor King <wking@tremily.us>
Date: Fri, 7 Mar 2014 04:21:02 +0000 (-0800)
Subject: irkerd: Store less state in IRCServerConnection.connect()
X-Git-Tag: 2.7~30
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9a53ff42a920e015b819f762d916604289f15502;p=irker.git

irkerd: Store less state in IRCServerConnection.connect()

We will never need the connection-time port, server_address, username,
ircname, or password again, so don't store them.  We *do* need server
and real_server_name for Event handling, so keep them around.
---

diff --git a/irkerd b/irkerd
index a71c841..65828a6 100755
--- a/irkerd
+++ b/irkerd
@@ -214,23 +214,18 @@ class IRCServerConnection():
         self.event_handlers = {}
         self.real_server_name = ""
         self.server = server
-        self.port = port
-        self.server_address = (server, port)
         self.nickname = nickname
-        self.username = username or nickname
-        self.ircname = ircname or nickname
-        self.password = password
         try:
             self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
             self.socket.bind(('', 0))
-            self.socket.connect(self.server_address)
+            self.socket.connect((server, port))
         except socket.error as err:
             raise IRCServerConnectionError("Couldn't connect to socket: %s" % err)
 
-        if self.password:
-            self.ship("PASS " + self.password)
+        if password:
+            self.ship("PASS " + password)
         self.nick(self.nickname)
-        self.user(self.username, self.ircname)
+        self.user(username=username or ircname, realname=ircname or nickname)
         return self
 
     def close(self):