[Python-checkins] python/dist/src/Lib/logging handlers.py, 1.15, 1.16

[vsajip at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib/logging
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10143

Modified Files:
	handlers.py 
Log Message:
Removed debugging print statements from TimedRotatingFileHandler, and sorted list returned by glob.glob() (SF #987166)

Index: handlers.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/logging/handlers.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** handlers.py	8 Jul 2004 10:24:04 -0000	1.15
--- handlers.py	12 Jul 2004 09:21:41 -0000	1.16
***************
*** 225,229 ****
                      self.rolloverAt += (daysToWait * (60 * 60 * 24))
  
!         print "Will rollover at %d, %d seconds from now" % (self.rolloverAt, self.rolloverAt - currentTime)
  
      def shouldRollover(self, record):
--- 225,229 ----
                      self.rolloverAt += (daysToWait * (60 * 60 * 24))
  
!         #print "Will rollover at %d, %d seconds from now" % (self.rolloverAt, self.rolloverAt - currentTime)
  
      def shouldRollover(self, record):
***************
*** 237,241 ****
          if t >= self.rolloverAt:
              return 1
!         print "No need to rollover: %d, %d" % (t, self.rolloverAt)
          return 0
  
--- 237,241 ----
          if t >= self.rolloverAt:
              return 1
!         #print "No need to rollover: %d, %d" % (t, self.rolloverAt)
          return 0
  
***************
*** 260,265 ****
              s = glob.glob(self.baseFilename + ".20*")
              if len(s) > self.backupCount:
                  os.remove(s[0])
!         print "%s -> %s" % (self.baseFilename, dfn)
          self.stream = open(self.baseFilename, "w")
          self.rolloverAt = int(time.time()) + self.interval
--- 260,266 ----
              s = glob.glob(self.baseFilename + ".20*")
              if len(s) > self.backupCount:
+                 s.sort()
                  os.remove(s[0])
!         #print "%s -> %s" % (self.baseFilename, dfn)
          self.stream = open(self.baseFilename, "w")
          self.rolloverAt = int(time.time()) + self.interval