[minion-cvs] Make pychecker happy; remove another pinger traceback

[nickm@xxxxxxxx (Nick Mathewson)]

Update of /home/minion/cvsroot/src/minion/lib/mixminion/server
In directory moria:/tmp/cvs-serv12462/lib/mixminion/server

Modified Files:
	Pinger.py 
Log Message:
Make pychecker happy; remove another pinger traceback

Index: Pinger.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/Pinger.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- Pinger.py	3 Nov 2005 21:12:20 -0000	1.28
+++ Pinger.py	4 Nov 2005 16:24:16 -0000	1.29
@@ -27,7 +27,6 @@
 import bisect
 import calendar
 import cPickle
-import operator
 import os
 import struct
 import sys
@@ -507,7 +506,7 @@
         """Add the names 'descriptorSource' to the database, if they
            aren't there already.
         """
-        for s in descriptorInfo.getServerList():
+        for s in descriptorSource.getServerList():
             self._getServerID(s.getIdentityDigest())
         self._db.getConnection().commit()
 
@@ -685,7 +684,6 @@
         cur.execute("SELECT startup, stillup, shutdown FROM myLifespan WHERE "
                     "startup <= %s AND stillup >= %s",
                     self._db.time(endTime), self._db.time(startTime))
-        myUptime = 0
         myIntervals = IntervalSet([ (start, max(end,shutdown))
                                     for start,end,shutdown in cur ])
         myIntervals *= timespan
@@ -1384,7 +1382,7 @@
             identities[s.getIdentityDigest()]=1
         for id1,id2 in self.nextPingTime.keys():
             if not (identities.has_key(id1) and identities.has_key(id2)):
-                LOG.trace("Unscheduling 2-hop ping for %s,%s",n1,n2)
+                LOG.trace("Unscheduling 2-hop ping for %s,%s",id1,id2)
                 del self.nextPingTime[(id1,id2)]
         for id1 in identities.keys():
             for id2 in identities.keys():