Changeset 714

Timestamp:

11/04/07 20:39:28 (14 months ago)

Author:

root

Message:

fix config parsing.
Thanks thePiet for spotting my typo

Files:

• tools/nsa/nsa.py (modified) (6 diffs)

tools/nsa/nsa.py

@@ -136 +136 @@
                 tickets = self.db_query("SELECT status, type, resolution, id, priority, summary, reporter FROM ticket WHERE id = %s", params=(ticketnum,))
                 if tickets:
-                        return [(row[0], row[1], row[2], row[3], row[4], row[5], row[6], row[3]) for row in tickets]
+                        return [(row[0], row[1], row[2], row[3], row[4], row[5], row[6]) for row in tickets]
 
         def do_revision(self, revision):
@@ -202 +202 @@
 
 class NSABot(SingleServerIRCBot):
-        global tracenv
-        trac = tracinfo(tracenv)
-
-        def __init__(self, channel, nickname, server, port=6667):
+
+        def __init__(self, channel, nickname, server, port=6667, tracenv=None):
                 SingleServerIRCBot.__init__(self, [(server, port)], nickname, nickname)
                 self.channel = channel
+                self.trac = tracinfo(tracenv)
 
         def on_nicknameinuse(self, c, e):
@@ -233 +232 @@
                         ticket = self.trac.do_ticket(params)
                         if ticket:
-                                output = "[%s %s: %s] #%s [%s] %s reported by %s %sticket/%s" % (ticket[0], tracurl)
+                                output = "[%s %s: %s] #%s [%s] %s reported by %s" % (ticket[0])
                         else:
                                 output = "No such ticket"
@@ -252 +251 @@
                         tracversion = self.trac.do_version()
                         c.privmsg(e.target(), "trac version: "+tracversion)
+                else:
+                        c.privmsg(e.target(), "Command not implemented")
 
         def say_it(self, text):
@@ -299 +300 @@
 
         # Read configfile
-        config = ConfigParser.ConfigParser()
-        config.read('nsa.ini')
-        server   = config.get('irc', 'server')
-        port     = config.getint('irc', 'port')
-        nickname = config.get('irc', 'nickname')
-        channel  = config.get('irc', 'channel')
-        tracenv  = config.get('trac' 'env')
-        tracurl  = config.get('trac', 'url')
-        pidfile  = config.get('global', 'pid')
+        cfg = ConfigParser.ConfigParser()
+        cfg.read('nsa.ini')
+        server   = cfg.get('irc', 'server')
+        port     = cfg.getint('irc', 'port')
+        nickname = cfg.get('irc', 'nickname')
+        channel  = cfg.get('irc', 'channel')
+        tracenv  = cfg.get('trac', 'env')
+        tracurl  = cfg.get('trac', 'url')
+        pidfile  = cfg.get('global', 'pid')
 
         # daemonize
@@ -316 +317 @@
                 signal.signal(s, handler)
 
-        bot = NSABot(channel, nickname, server, port)
+        bot = NSABot(channel, nickname, server, port, tracenv)
         bot.start()