Mailman 3 March 2005 - Python-checkins

python/dist/src/Lib/logging handlers.py, 1.19, 1.19.2.1
by vsajip＠users.sourceforge.net 31 Mar '05

31 Mar '05

Update of /cvsroot/python/python/dist/src/Lib/logging In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19200 Modified Files: Tag: release24-maint handlers.py Log Message: Added optional encoding argument to File based handlers and improved error handling for SysLogHandler Index: handlers.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/logging/handlers.py,v retrieving revision 1.19 retrieving revision 1.19.2.1 diff -u -d -r1.19 -r1.19.2.1 --- handlers.py 3 Oct 2004 19:12:07 -0000 1.19 +++ handlers.py 31 Mar 2005 20:12:55 -0000 1.19.2.1 @@ -1,4 +1,4 @@ -# Copyright 2001-2004 by Vinay Sajip. All Rights Reserved. +# Copyright 2001-2005 by Vinay Sajip. All Rights Reserved. # # Permission to use, copy, modify, and distribute this software and its # documentation for any purpose and without fee is hereby granted, @@ -29,6 +29,11 @@ import sys, logging, socket, types, os, string, cPickle, struct, time, glob +try: + import codecs +except ImportError: + codecs = None + # # Some constants... # @@ -45,11 +50,15 @@ Not meant to be instantiated directly. Instead, use RotatingFileHandler or TimedRotatingFileHandler. """ - def __init__(self, filename, mode): + def __init__(self, filename, mode, encoding=None): """ Use the specified filename for streamed logging """ - logging.FileHandler.__init__(self, filename, mode) + if codecs is None: + encoding = None + logging.FileHandler.__init__(self, filename, mode, encoding) + self.mode = mode + self.encoding = encoding def emit(self, record): """ @@ -70,7 +79,7 @@ Handler for logging to a set of files, which switches from one file to the next when the current file reaches a certain size. """ - def __init__(self, filename, mode="a", maxBytes=0, backupCount=0): + def __init__(self, filename, mode='a', maxBytes=0, backupCount=0, encoding=None): """ Open the specified file and use it as the stream for logging. @@ -91,10 +100,9 @@ If maxBytes is zero, rollover never occurs. """ - self.mode = mode if maxBytes > 0: - self.mode = "a" # doesn't make sense otherwise! - BaseRotatingHandler.__init__(self, filename, self.mode) + mode = 'a' # doesn't make sense otherwise! + BaseRotatingHandler.__init__(self, filename, mode, encoding) self.maxBytes = maxBytes self.backupCount = backupCount @@ -118,7 +126,10 @@ os.remove(dfn) os.rename(self.baseFilename, dfn) #print "%s -> %s" % (self.baseFilename, dfn) - self.stream = open(self.baseFilename, "w") + if self.encoding: + self.stream = codecs.open(self.baseFilename, 'w', self.encoding) + else: + self.stream = open(self.baseFilename, 'w') def shouldRollover(self, record): """ @@ -142,8 +153,8 @@ If backupCount is > 0, when rollover is done, no more than backupCount files are kept - the oldest ones are deleted. """ - def __init__(self, filename, when='h', interval=1, backupCount=0): - BaseRotatingHandler.__init__(self, filename, 'a') + def __init__(self, filename, when='h', interval=1, backupCount=0, encoding=None): + BaseRotatingHandler.__init__(self, filename, 'a', encoding) self.when = string.upper(when) self.backupCount = backupCount # Calculate the real rollover interval, which is just the number of @@ -262,7 +273,10 @@ s.sort() os.remove(s[0]) #print "%s -> %s" % (self.baseFilename, dfn) - self.stream = open(self.baseFilename, "w") + if self.encoding: + self.stream = codecs.open(self.baseFilename, 'w', self.encoding) + else: + self.stream = open(self.baseFilename, 'w') self.rolloverAt = int(time.time()) + self.interval class SocketHandler(logging.Handler): @@ -555,14 +569,7 @@ self.address = address self.facility = facility if type(address) == types.StringType: - self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM) - # syslog may require either DGRAM or STREAM sockets - try: - self.socket.connect(address) - except socket.error: - self.socket.close() - self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) - self.socket.connect(address) + self._connect_unixsocket(address) self.unixsocket = 1 else: self.socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) @@ -570,6 +577,16 @@ self.formatter = None + def _connect_unixsocket(self, address): + self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM) + # syslog may require either DGRAM or STREAM sockets + try: + self.socket.connect(address) + except socket.error: + self.socket.close() + self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + self.socket.connect(address) + # curious: when talking to the unix-domain '/dev/log' socket, a # zero-terminator seems to be required. this string is placed # into a class variable so that it can be overridden if @@ -615,7 +632,11 @@ msg) try: if self.unixsocket: - self.socket.send(msg) + try: + self.socket.send(msg) + except socket.error: + self._connect_unixsocket(self.address) + self.socket.send(msg) else: self.socket.sendto(msg, self.address) except:

3 2

python/dist/src/Doc/lib liblogging.tex, 1.33.2.1, 1.33.2.2
by vsajip＠users.sourceforge.net 31 Mar '05

31 Mar '05

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24216 Modified Files: Tag: release24-maint liblogging.tex Log Message: Corrected SMTPHandler docs and added info about threadName attribute of LogRecord Index: liblogging.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/liblogging.tex,v retrieving revision 1.33.2.1 retrieving revision 1.33.2.2 diff -u -d -r1.33.2.1 -r1.33.2.2 --- liblogging.tex 3 Dec 2004 08:23:36 -0000 1.33.2.1 +++ liblogging.tex 31 Mar 2005 20:23:04 -0000 1.33.2.2 @@ -1133,8 +1133,7 @@ \begin{classdesc}{SMTPHandler}{mailhost, fromaddr, toaddrs, subject} Returns a new instance of the \class{SMTPHandler} class. The instance is initialized with the from and to addresses and subject -line of the email. The \var{toaddrs} should be a list of strings without -domain names (That's what the \var{mailhost} is for). To specify a +line of the email. The \var{toaddrs} should be a list of strings. To specify a non-standard SMTP port, use the (host, port) tuple format for the \var{mailhost} argument. If you use a string, the standard SMTP port is used. @@ -1269,6 +1268,7 @@ \lineii{\%(msecs)d} {Millisecond portion of the time when the \class{LogRecord} was created.} \lineii{\%(thread)d} {Thread ID (if available).} +\lineii{\%(threadName)s} {Thread name (if available).} \lineii{\%(process)d} {Process ID (if available).} \lineii{\%(message)s} {The logged message, computed as \code{msg \% args}.} \end{tableii}

1 0

python/dist/src/Doc/lib liblogging.tex,1.35,1.36
by vsajip＠users.sourceforge.net 31 Mar '05

31 Mar '05

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20919 Modified Files: liblogging.tex Log Message: Added threadName to LogRecord Index: liblogging.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/liblogging.tex,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- liblogging.tex 18 Feb 2005 11:50:11 -0000 1.35 +++ liblogging.tex 31 Mar 2005 20:18:06 -0000 1.36 @@ -1268,6 +1268,7 @@ \lineii{\%(msecs)d} {Millisecond portion of the time when the \class{LogRecord} was created.} \lineii{\%(thread)d} {Thread ID (if available).} +\lineii{\%(threadName)s} {Thread name (if available).} \lineii{\%(process)d} {Process ID (if available).} \lineii{\%(message)s} {The logged message, computed as \code{msg \% args}.} \end{tableii}

1 0

python/dist/src/Lib/logging __init__.py, 1.26, 1.27
by vsajip＠users.sourceforge.net 31 Mar '05

31 Mar '05

Update of /cvsroot/python/python/dist/src/Lib/logging In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20593 Modified Files: __init__.py Log Message: Added threadName and now using re-entrant lock Index: __init__.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/logging/__init__.py,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- __init__.py 13 Mar 2005 09:54:31 -0000 1.26 +++ __init__.py 31 Mar 2005 20:16:55 -0000 1.27 @@ -42,7 +42,7 @@ __author__ = "Vinay Sajip <vinay_sajip(a)red-dove.com>" __status__ = "beta" __version__ = "0.4.9.6" -__date__ = "12 March 2005" +__date__ = "27 March 2005" #--------------------------------------------------------------------------- # Miscellaneous module data @@ -241,8 +241,10 @@ self.relativeCreated = (self.created - _startTime) * 1000 if thread: self.thread = thread.get_ident() + self.threadName = threading.currentThread().getName() else: self.thread = None + self.threadName = None if hasattr(os, 'getpid'): self.process = os.getpid() else: @@ -320,6 +322,7 @@ relative to the time the logging module was loaded (typically at application startup time) %(thread)d Thread ID (if available) + %(threadName)s Thread name (if available) %(process)d Process ID (if available) %(message)s The result of record.getMessage(), computed just as the record is emitted @@ -570,7 +573,7 @@ Acquire a thread lock for serializing access to the underlying I/O. """ if thread: - self.lock = thread.allocate_lock() + self.lock = threading.RLock() else: self.lock = None

1 0

python/dist/src/Lib/logging config.py, 1.10, 1.10.2.1
by vsajip＠users.sourceforge.net 31 Mar '05

31 Mar '05

Update of /cvsroot/python/python/dist/src/Lib/logging In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18372 Modified Files: Tag: release24-maint config.py Log Message: Minor changes to imports Index: config.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/logging/config.py,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -u -d -r1.10 -r1.10.2.1 --- config.py 24 Sep 2004 11:45:13 -0000 1.10 +++ config.py 31 Mar 2005 20:11:45 -0000 1.10.2.1 @@ -1,4 +1,4 @@ -# Copyright 2001-2004 by Vinay Sajip. All Rights Reserved. +# Copyright 2001-2005 by Vinay Sajip. All Rights Reserved. # # Permission to use, copy, modify, and distribute this software and its # documentation for any purpose and without fee is hereby granted, @@ -27,7 +27,13 @@ To use, simply 'import logging' and log away! """ -import sys, logging, logging.handlers, string, thread, threading, socket, struct, os +import sys, logging, logging.handlers, string, socket, struct, os, traceback + +try: + import thread + import threading +except ImportError: + thread = None from SocketServer import ThreadingTCPServer, StreamRequestHandler @@ -189,7 +195,6 @@ for log in existing: root.manager.loggerDict[log].disabled = 1 except: - import traceback ei = sys.exc_info() traceback.print_exception(ei[0], ei[1], ei[2], None, sys.stderr) del ei

1 0

python/dist/src/Lib/logging __init__.py, 1.24, 1.24.2.1
by vsajip＠users.sourceforge.net 31 Mar '05

31 Mar '05

Update of /cvsroot/python/python/dist/src/Lib/logging In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17920 Modified Files: Tag: release24-maint __init__.py Log Message: Misc. changes Index: __init__.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/logging/__init__.py,v retrieving revision 1.24 retrieving revision 1.24.2.1 diff -u -d -r1.24 -r1.24.2.1 --- __init__.py 21 Oct 2004 21:24:27 -0000 1.24 +++ __init__.py 31 Mar 2005 20:10:38 -0000 1.24.2.1 @@ -1,4 +1,4 @@ -# Copyright 2001-2004 by Vinay Sajip. All Rights Reserved. +# Copyright 2001-2005 by Vinay Sajip. All Rights Reserved. # # Permission to use, copy, modify, and distribute this software and its # documentation for any purpose and without fee is hereby granted, @@ -26,7 +26,12 @@ To use, simply 'import logging' and log away! """ -import sys, os, types, time, string, cStringIO +import sys, os, types, time, string, cStringIO, traceback + +try: + import codecs +except ImportError: + codecs = None try: import thread @@ -37,14 +42,14 @@ __author__ = "Vinay Sajip <vinay_sajip(a)red-dove.com>" __status__ = "beta" __version__ = "0.4.9.6" -__date__ = "20 October 2004" +__date__ = "27 March 2005" #--------------------------------------------------------------------------- # Miscellaneous module data #--------------------------------------------------------------------------- # -#_srcfile is used when walking the stack to check when we've got the first +# _srcfile is used when walking the stack to check when we've got the first # caller stack frame. # if string.lower(__file__[-4:]) in ['.pyc', '.pyo']: @@ -53,12 +58,23 @@ _srcfile = __file__ _srcfile = os.path.normcase(_srcfile) +# next bit filched from 1.5.2's inspect.py +def currentframe(): + """Return the frame object for the caller's stack frame.""" + try: + raise 'catch me' + except: + return sys.exc_traceback.tb_frame.f_back + +if hasattr(sys, '_getframe'): currentframe = sys._getframe +# done filching + # _srcfile is only used in conjunction with sys._getframe(). # To provide compatibility with older versions of Python, set _srcfile # to None if _getframe() is not available; this value will prevent # findCaller() from being called. -if not hasattr(sys, "_getframe"): - _srcfile = None +#if not hasattr(sys, "_getframe"): +# _srcfile = None # #_startTime is used as the base when calculating the relative time of events @@ -81,6 +97,7 @@ # loggers are initialized with NOTSET so that they will log all messages, even # at user-defined levels. # + CRITICAL = 50 FATAL = CRITICAL ERROR = 40 @@ -224,8 +241,10 @@ self.relativeCreated = (self.created - _startTime) * 1000 if thread: self.thread = thread.get_ident() + self.threadName = threading.currentThread().getName() else: self.thread = None + self.threadName = None if hasattr(os, 'getpid'): self.process = os.getpid() else: @@ -303,6 +322,7 @@ relative to the time the logging module was loaded (typically at application startup time) %(thread)d Thread ID (if available) + %(threadName)s Thread name (if available) %(process)d Process ID (if available) %(message)s The result of record.getMessage(), computed just as the record is emitted @@ -357,7 +377,6 @@ This default implementation just uses traceback.print_exception() """ - import traceback sio = cStringIO.StringIO() traceback.print_exception(ei[0], ei[1], ei[2], None, sio) s = sio.getvalue() @@ -554,7 +573,7 @@ Acquire a thread lock for serializing access to the underlying I/O. """ if thread: - self.lock = thread.allocate_lock() + self.lock = threading.RLock() else: self.lock = None @@ -663,7 +682,6 @@ The record which was being processed is passed in to this method. """ if raiseExceptions: - import traceback ei = sys.exc_info() traceback.print_exception(ei[0], ei[1], ei[2], None, sys.stderr) del ei @@ -720,11 +738,17 @@ """ A handler class which writes formatted logging records to disk files. """ - def __init__(self, filename, mode="a"): + def __init__(self, filename, mode='a', encoding=None): """ Open the specified file and use it as the stream for logging. """ - StreamHandler.__init__(self, open(filename, mode)) + if codecs is None: + encoding = None + if encoding is None: + stream = open(filename, mode) + else: + stream = codecs.open(filename, mode, encoding) + StreamHandler.__init__(self, stream) #keep the absolute path, otherwise derived classes which use this #may come a cropper when the current directory changes self.baseFilename = os.path.abspath(filename) @@ -1005,16 +1029,16 @@ def findCaller(self): """ Find the stack frame of the caller so that we can note the source - file name and line number. + file name, line number and function name. """ - f = sys._getframe(1) + f = currentframe().f_back while 1: co = f.f_code filename = os.path.normcase(co.co_filename) if filename == _srcfile: f = f.f_back continue - return filename, f.f_lineno + return filename, f.f_lineno, co.co_name def makeRecord(self, name, level, fn, lno, msg, args, exc_info): """ @@ -1029,9 +1053,9 @@ all the handlers of this logger to handle the record. """ if _srcfile: - fn, lno = self.findCaller() + fn, lno, func = self.findCaller() else: - fn, lno = "<unknown file>", 0 + fn, lno, func = "(unknown file)", 0, "(unknown function)" if exc_info: if type(exc_info) != types.TupleType: exc_info = sys.exc_info() @@ -1153,7 +1177,7 @@ filename Specifies that a FileHandler be created, using the specified filename, rather than a StreamHandler. filemode Specifies the mode to open the file, if filename is specified - (if filemode is unspecified, it defaults to "a"). + (if filemode is unspecified, it defaults to 'a'). format Use the specified format string for the handler. datefmt Use the specified date/time format. level Set the root logger level to the specified level. @@ -1170,7 +1194,7 @@ if len(root.handlers) == 0: filename = kwargs.get("filename") if filename: - mode = kwargs.get("filemode", "a") + mode = kwargs.get("filemode", 'a') hdlr = FileHandler(filename, mode) else: stream = kwargs.get("stream")

1 0

[Python-checkins] python/dist/src/Mac/OSX/Dist/resources postflight, 1.7, 1.7.8.1
by etrepum＠users.sourceforge.net 31 Mar '05

31 Mar '05

Update of /cvsroot/python/python/dist/src/Mac/OSX/Dist/resources In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25906/resources Modified Files: Tag: release24-maint postflight Log Message: (This is only relevant to the MacPython binary release process) Set the Python version to 2.4 in the postflight script used when building Mac OS X installer distributions. Previously it was set to 2.3, so it wouldn't build a working installer. Index: postflight =================================================================== RCS file: /cvsroot/python/python/dist/src/Mac/OSX/Dist/resources/postflight,v retrieving revision 1.7 retrieving revision 1.7.8.1 diff -u -d -r1.7 -r1.7.8.1 --- postflight 23 Jul 2003 10:49:17 -0000 1.7 +++ postflight 31 Mar 2005 17:38:00 -0000 1.7.8.1 @@ -4,7 +4,7 @@ # installed. #---------------------------------------------------------------------- -PYVER=2.3 +PYVER=2.4 PKG=$1 DEST=$2

1 0

python/dist/src/Misc NEWS, 1.1193.2.46, 1.1193.2.47
by doerwalter＠users.sourceforge.net 31 Mar '05

31 Mar '05

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6022/Misc Modified Files: Tag: release24-maint NEWS Log Message: Backport checkin: Since PyPI only accepts UTF-8 encoded data now, make sure that the data is properly encoded and include the encoding in the Content-Type header. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1193.2.46 retrieving revision 1.1193.2.47 diff -u -d -r1.1193.2.46 -r1.1193.2.47 --- NEWS 31 Mar 2005 10:28:30 -0000 1.1193.2.46 +++ NEWS 31 Mar 2005 14:16:26 -0000 1.1193.2.47 @@ -23,6 +23,12 @@ - weakref proxy has incorrect __nonzero__ behavior. SF bug #1770766. +Library +------- + +- distutils.commands.register now encodes the data as UTF-8 before posting + them to PyPI. + What's New in Python 2.4.1 final? =================================

1 0

[Python-checkins] python/dist/src/Lib/distutils/command register.py, 1.7, 1.7.4.1
by doerwalter＠users.sourceforge.net 31 Mar '05

31 Mar '05

Update of /cvsroot/python/python/dist/src/Lib/distutils/command In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6022/Lib/distutils/command Modified Files: Tag: release24-maint register.py Log Message: Backport checkin: Since PyPI only accepts UTF-8 encoded data now, make sure that the data is properly encoded and include the encoding in the Content-Type header. Index: register.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/register.py,v retrieving revision 1.7 retrieving revision 1.7.4.1 diff -u -d -r1.7 -r1.7.4.1 --- register.py 18 Jul 2004 06:14:43 -0000 1.7 +++ register.py 31 Mar 2005 14:16:30 -0000 1.7.4.1 @@ -248,7 +248,7 @@ if type(value) != type([]): value = [value] for value in value: - value = str(value) + value = unicode(value).encode("utf-8") body.write(sep_boundary) body.write('\nContent-Disposition: form-data; name="%s"'%key) body.write("\n\n") @@ -261,7 +261,7 @@ # build the Request headers = { - 'Content-type': 'multipart/form-data; boundary=%s'%boundary, + 'Content-type': 'multipart/form-data; boundary=%s; charset=utf-8'%boundary, 'Content-length': str(len(body)) } req = urllib2.Request(self.repository, body, headers)

1 0

[Python-checkins] python/dist/src/Lib/distutils/command register.py, 1.8, 1.9
by doerwalter＠users.sourceforge.net 31 Mar '05

31 Mar '05

Update of /cvsroot/python/python/dist/src/Lib/distutils/command In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27988/Lib/distutils/command Modified Files: register.py Log Message: Since PyPI only accepts UTF-8 encoded data now, make sure that the data is properly encoded and include the encoding in the Content-Type header. Index: register.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/register.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- register.py 20 Mar 2005 22:19:47 -0000 1.8 +++ register.py 31 Mar 2005 13:57:38 -0000 1.9 @@ -254,7 +254,7 @@ if type(value) != type([]): value = [value] for value in value: - value = str(value) + value = unicode(value).encode("utf-8") body.write(sep_boundary) body.write('\nContent-Disposition: form-data; name="%s"'%key) body.write("\n\n") @@ -267,7 +267,7 @@ # build the Request headers = { - 'Content-type': 'multipart/form-data; boundary=%s'%boundary, + 'Content-type': 'multipart/form-data; boundary=%s; charset=utf-8'%boundary, 'Content-length': str(len(body)) } req = urllib2.Request(self.repository, body, headers)

1 0