mirror of
https://github.com/python/cpython.git
synced 2025-09-01 14:38:00 +00:00

svn+ssh://pythondev@svn.python.org/python/trunk ........ r53954 | jeremy.hylton | 2007-02-26 10:41:18 -0800 (Mon, 26 Feb 2007) | 10 lines Do not copy free variables to locals in class namespaces. Fixes bug 1569356, but at the cost of a minor incompatibility in locals(). Add test that verifies that the class namespace is not polluted. Also clarify the behavior in the library docs. Along the way, cleaned up the dict_to_map and map_to_dict implementations and added some comments that explain what they do. ........ r53955 | jeremy.hylton | 2007-02-26 11:00:20 -0800 (Mon, 26 Feb 2007) | 2 lines Fix assertion. ........ r53969 | neal.norwitz | 2007-02-26 14:41:45 -0800 (Mon, 26 Feb 2007) | 3 lines When printing an unraisable error, don't print exceptions. before the name. This duplicates the behavior whening normally printing exceptions. ........ r53970 | andrew.kuchling | 2007-02-26 15:02:47 -0800 (Mon, 26 Feb 2007) | 1 line Markup fix ........ r53975 | neal.norwitz | 2007-02-26 15:48:27 -0800 (Mon, 26 Feb 2007) | 3 lines SF #1669182, 2.5 was already fixed. Just assert in 2.6 since string exceptions are gone. ........ r53976 | andrew.kuchling | 2007-02-26 15:54:17 -0800 (Mon, 26 Feb 2007) | 1 line Add some items ........ r53981 | jeremy.hylton | 2007-02-26 17:01:59 -0800 (Mon, 26 Feb 2007) | 4 lines Fix long-standing bug in name mangling for package imports Reported by Mike Verdone. ........ r53993 | jeremy.hylton | 2007-02-27 08:00:06 -0800 (Tue, 27 Feb 2007) | 2 lines tabify ........ r53994 | jeremy.hylton | 2007-02-27 08:13:23 -0800 (Tue, 27 Feb 2007) | 5 lines tabify Note that ast.c still has a mix of tabs and spaces, because it attempts to use four-space indents for more of the new code. ........ r53996 | jeremy.hylton | 2007-02-27 09:24:48 -0800 (Tue, 27 Feb 2007) | 2 lines whitespace normalization ........ r53997 | jeremy.hylton | 2007-02-27 10:29:45 -0800 (Tue, 27 Feb 2007) | 24 lines Add checking for a number of metaclass error conditions. We add some new rules that are required for preserving internal invariants of types. 1. If type (or a subclass of type) appears in bases, it must appear before any non-type bases. If a non-type base (like a regular new-style class) occurred first, it could trick type into allocating the new class an __dict__ which must be impossible. 2. There are several checks that are made of bases when creating a type. Those checks are now repeated when assigning to __bases__. We also add the restriction that assignment to __bases__ may not change the metaclass of the type. Add new tests for these cases and for a few other oddball errors that were no previously tested. Remove a crasher test that was fixed. Also some internal refactoring: Extract the code to find the most derived metaclass of a type and its bases. It is now needed in two places. Rewrite the TypeError checks in test_descr to use doctest. The tests now clearly show what exception they expect to see. ........ r53998 | jeremy.hylton | 2007-02-27 10:33:31 -0800 (Tue, 27 Feb 2007) | 2 lines Add news about changes to metaclasses and __bases__ error checking. ........ r54016 | armin.rigo | 2007-02-28 01:25:29 -0800 (Wed, 28 Feb 2007) | 3 lines Modify the segfaulting example to show why r53997 is not a solution to it. ........ r54022 | brett.cannon | 2007-02-28 10:15:00 -0800 (Wed, 28 Feb 2007) | 2 lines Add a test for instantiating SyntaxError with no arguments. ........ r54026 | raymond.hettinger | 2007-02-28 10:27:41 -0800 (Wed, 28 Feb 2007) | 1 line Docstring nit. ........ r54033 | raymond.hettinger | 2007-02-28 10:37:52 -0800 (Wed, 28 Feb 2007) | 1 line Prepare collections module for pure python code entries. ........ r54053 | raymond.hettinger | 2007-02-28 22:16:43 -0800 (Wed, 28 Feb 2007) | 1 line Add collections.NamedTuple ........ r54054 | neal.norwitz | 2007-02-28 23:04:41 -0800 (Wed, 28 Feb 2007) | 1 line Add Pat and Eric for work on PEP 3101 in the sandbox ........ r54061 | andrew.kuchling | 2007-03-01 06:36:12 -0800 (Thu, 01 Mar 2007) | 1 line Add NamedTuple ........ r54080 | georg.brandl | 2007-03-02 06:37:12 -0800 (Fri, 02 Mar 2007) | 2 lines Bug #1628895: some better tries to find HTML documentation in pydoc. ........ r54086 | raymond.hettinger | 2007-03-02 11:20:46 -0800 (Fri, 02 Mar 2007) | 1 line Fix embarrassing typo and fix constantification of None ........ r54088 | georg.brandl | 2007-03-02 12:30:14 -0800 (Fri, 02 Mar 2007) | 2 lines Bugs #1668032, #1668036, #1669304: clarify behavior of PyMem_Realloc and _Resize. ........ r54114 | georg.brandl | 2007-03-04 09:18:54 -0800 (Sun, 04 Mar 2007) | 2 lines Fix a bug in test_dict and test_userdict, found at the PyPy sprint. ........ r54124 | skip.montanaro | 2007-03-04 12:52:28 -0800 (Sun, 04 Mar 2007) | 2 lines Teach setup.py how to find Berkeley DB on Macs using MacPorts. ........ r54125 | skip.montanaro | 2007-03-04 12:54:12 -0800 (Sun, 04 Mar 2007) | 1 line note MacPorts/BerkDB change in setup.py ........ r54136 | neal.norwitz | 2007-03-04 23:52:01 -0800 (Sun, 04 Mar 2007) | 1 line Added Pete for 3101 too ........ r54138 | facundo.batista | 2007-03-05 08:31:54 -0800 (Mon, 05 Mar 2007) | 1 line Minor corrections to docs, and an explanation comentary ........ r54139 | georg.brandl | 2007-03-05 14:28:08 -0800 (Mon, 05 Mar 2007) | 3 lines Patch #1674228: when assigning a slice (old-style), check for the sq_ass_slice instead of the sq_slice slot. ........ r54149 | georg.brandl | 2007-03-06 01:33:01 -0800 (Tue, 06 Mar 2007) | 3 lines Nit: a struct field is set to GenericAlloc, not GenericAlloc(). ........ r54150 | georg.brandl | 2007-03-06 02:02:47 -0800 (Tue, 06 Mar 2007) | 3 lines Patch #1671450: add a section about subclassing builtin types to the "extending and embedding" tutorial. ........ r54152 | martin.v.loewis | 2007-03-06 02:41:24 -0800 (Tue, 06 Mar 2007) | 2 lines Patch #1121142: Implement ZipFile.open. ........ r54154 | georg.brandl | 2007-03-06 03:51:14 -0800 (Tue, 06 Mar 2007) | 2 lines A test case for the fix in #1674228. ........ r54156 | georg.brandl | 2007-03-06 03:52:24 -0800 (Tue, 06 Mar 2007) | 2 lines Patch #1672481: fix bug in idlelib.MultiCall. ........ r54159 | georg.brandl | 2007-03-06 04:17:50 -0800 (Tue, 06 Mar 2007) | 1 line Bug #1674503: close the file opened by execfile() in an error condition. ........ r54160 | georg.brandl | 2007-03-06 05:32:52 -0800 (Tue, 06 Mar 2007) | 3 lines Fix another reincarnation of bug #1576657 in defaultdict. ........ r54162 | georg.brandl | 2007-03-06 05:35:00 -0800 (Tue, 06 Mar 2007) | 2 lines A test case for the defaultdict KeyError bug. ........ r54164 | georg.brandl | 2007-03-06 05:37:45 -0800 (Tue, 06 Mar 2007) | 3 lines Patch #1663234: you can now run doctest on test files and modules using "python -m doctest [-v] filename ...". ........ r54165 | martin.v.loewis | 2007-03-06 06:43:00 -0800 (Tue, 06 Mar 2007) | 3 lines Patch #912410: Replace HTML entity references for attribute values in HTMLParser. ........ r54166 | skip.montanaro | 2007-03-06 07:41:38 -0800 (Tue, 06 Mar 2007) | 1 line patch 1673619 - identify extension modules which cannot be built ........ r54167 | guido.van.rossum | 2007-03-06 07:50:01 -0800 (Tue, 06 Mar 2007) | 5 lines Patch #1646728: datetime.fromtimestamp fails with negative fractional times. With unittest. Somebody please backport to 2.5. ........ r54169 | georg.brandl | 2007-03-06 09:49:14 -0800 (Tue, 06 Mar 2007) | 2 lines Fix cmp vs. key argument for list.sort. ........ r54170 | georg.brandl | 2007-03-06 10:21:32 -0800 (Tue, 06 Mar 2007) | 2 lines Small nit, found by Neal. ........ r54171 | georg.brandl | 2007-03-06 10:29:58 -0800 (Tue, 06 Mar 2007) | 3 lines Patch #1602128: clarify that richcmp methods can return NotImplemented and should return True or False otherwise. ........ r54173 | georg.brandl | 2007-03-06 10:41:12 -0800 (Tue, 06 Mar 2007) | 2 lines Patch #1638879: don't accept strings with embedded NUL bytes in long(). ........ r54175 | georg.brandl | 2007-03-06 10:47:31 -0800 (Tue, 06 Mar 2007) | 2 lines Patch #1673121: update README wrt. OSX default shell. ........ r54177 | georg.brandl | 2007-03-06 10:59:11 -0800 (Tue, 06 Mar 2007) | 3 lines Patch #1654417: make operator.{get,set,del}slice use the full range of Py_ssize_t. ........ r54180 | walter.doerwald | 2007-03-06 12:38:57 -0800 (Tue, 06 Mar 2007) | 4 lines Patch for bug #1633621: if curses.resizeterm() or curses.resize_term() is called, update _curses.LINES, _curses.COLS, curses.LINES and curses.COLS. ........ r54182 | walter.doerwald | 2007-03-06 13:15:24 -0800 (Tue, 06 Mar 2007) | 2 lines Document change to curses. ........ r54188 | georg.brandl | 2007-03-06 16:34:46 -0800 (Tue, 06 Mar 2007) | 5 lines Variant of patch #697613: don't exit the interpreter on a SystemExit exception if the -i command line option or PYTHONINSPECT environment variable is given, but break into the interactive interpreter just like on other exceptions or normal program exit. (backport) ........ r54189 | georg.brandl | 2007-03-06 16:40:28 -0800 (Tue, 06 Mar 2007) | 4 lines Patch #703779: unset __file__ in __main__ after running a file. This makes the filenames the warning module prints much more sensible when a PYTHONSTARTUP file is used. ........ r54192 | george.yoshida | 2007-03-06 20:21:18 -0800 (Tue, 06 Mar 2007) | 2 lines add versionadded info ........ r54195 | georg.brandl | 2007-03-06 23:39:06 -0800 (Tue, 06 Mar 2007) | 2 lines Patch #812285: allow multiple auth schemes in AbstractBasicAuthHandler. ........ r54197 | georg.brandl | 2007-03-07 00:31:51 -0800 (Wed, 07 Mar 2007) | 3 lines Patch #1001604: glob.glob() now returns unicode filenames if it was given a unicode argument and os.listdir() returns unicode filenames. ........ r54199 | georg.brandl | 2007-03-07 01:09:40 -0800 (Wed, 07 Mar 2007) | 3 lines Patches #1550273, #1550272: fix a few bugs in unittest and add a comprehensive test suite for the module. ........ r54201 | georg.brandl | 2007-03-07 01:21:06 -0800 (Wed, 07 Mar 2007) | 3 lines Patch #787789: allow to pass custom TestRunner instances to unittest's main() function. ........ r54202 | georg.brandl | 2007-03-07 01:34:45 -0800 (Wed, 07 Mar 2007) | 2 lines Patch #1669331: clarify shutil.copyfileobj() behavior wrt. file position. ........ r54204 | martin.v.loewis | 2007-03-07 03:04:33 -0800 (Wed, 07 Mar 2007) | 2 lines Bug #1115886: os.path.splitext('.cshrc') gives now ('.cshrc', ''). ........ r54206 | georg.brandl | 2007-03-07 03:37:42 -0800 (Wed, 07 Mar 2007) | 2 lines Patch #1675471: convert test_pty to unittest. ........ r54207 | georg.brandl | 2007-03-07 03:54:49 -0800 (Wed, 07 Mar 2007) | 4 lines Add some sanity checks to unittest.TestSuite's addTest(s) methods. Fixes #878275. ........ r54209 | guido.van.rossum | 2007-03-07 07:16:29 -0800 (Wed, 07 Mar 2007) | 3 lines Windows doesn't support negative timestamps. Skip the tests involving them if os.name == "nt". ........ r54219 | martin.v.loewis | 2007-03-08 05:42:43 -0800 (Thu, 08 Mar 2007) | 2 lines Add missing ) in parenthical remark. ........ r54220 | georg.brandl | 2007-03-08 09:49:06 -0800 (Thu, 08 Mar 2007) | 2 lines Fix #1676656: \em is different from \emph... ........ r54222 | georg.brandl | 2007-03-08 10:37:31 -0800 (Thu, 08 Mar 2007) | 2 lines Add a NEWS entry for rev. 54207,8. ........ r54225 | raymond.hettinger | 2007-03-08 11:24:27 -0800 (Thu, 08 Mar 2007) | 1 line SF 1676321: empty() returned wrong result ........ r54227 | collin.winter | 2007-03-08 11:58:14 -0800 (Thu, 08 Mar 2007) | 1 line Backported r54226 from p3yk: Move test_unittest, test_doctest and test_doctest2 higher up in the testing order. ........ r54230 | raymond.hettinger | 2007-03-08 13:33:47 -0800 (Thu, 08 Mar 2007) | 1 line SF #1637850: make_table in difflib did not work with unicode ........ r54232 | collin.winter | 2007-03-08 14:16:25 -0800 (Thu, 08 Mar 2007) | 1 line Patch #1668482: don't use '-' in mkstemp ........ r54233 | brett.cannon | 2007-03-08 15:58:11 -0800 (Thu, 08 Mar 2007) | 10 lines Introduce test.test_support.TransientResource. It's a context manager to surround calls to resources that may or may not be available. Specifying the expected exception and attributes to be raised if the resource is not available prevents overly broad catching of exceptions. This is meant to help suppress spurious failures by raising test.test_support.ResourceDenied if the exception matches. It would probably be good to go through the various network tests and surround the calls to catch connection timeouts (as done with test_socket_ssl in this commit). ........ r54234 | collin.winter | 2007-03-08 19:15:56 -0800 (Thu, 08 Mar 2007) | 1 line Patch #1481079: Support of HTTP_REFERER in CGIHTTPServer.py ........ r54235 | collin.winter | 2007-03-08 19:26:32 -0800 (Thu, 08 Mar 2007) | 1 line Add NEWS item for patch #1481079 (r54234). ........ r54237 | neal.norwitz | 2007-03-08 21:59:01 -0800 (Thu, 08 Mar 2007) | 1 line Fix SF #1676971, Complex OverflowError has a typo ........ r54239 | georg.brandl | 2007-03-09 04:58:41 -0800 (Fri, 09 Mar 2007) | 2 lines Typo. ........ r54240 | martin.v.loewis | 2007-03-09 07:35:55 -0800 (Fri, 09 Mar 2007) | 2 lines Patch #957003: Implement smtplib.LMTP. ........ r54243 | collin.winter | 2007-03-09 10:09:10 -0800 (Fri, 09 Mar 2007) | 2 lines Bug #1629566: clarify the docs on the return values of parsedate() and parsedate_tz() in email.utils and rfc822. ........ r54244 | thomas.heller | 2007-03-09 11:21:28 -0800 (Fri, 09 Mar 2007) | 3 lines Fix bug #1646630: ctypes.string_at(buf, 0) and ctypes.wstring_at(buf, 0) returned string up to the first NUL character. ........ r54245 | martin.v.loewis | 2007-03-09 11:36:01 -0800 (Fri, 09 Mar 2007) | 2 lines Add Ziga Seilnacht. ........ r54247 | collin.winter | 2007-03-09 12:33:07 -0800 (Fri, 09 Mar 2007) | 2 lines Patch #1491866: change the complex() constructor to allow parthensized forms. This means complex(repr(x)) now works instead of raising a ValueError. ........ r54248 | thomas.heller | 2007-03-09 12:39:22 -0800 (Fri, 09 Mar 2007) | 7 lines Bug #1651235: When a tuple was passed to a ctypes function call, Python would crash instead of raising an error. The crash was caused by a section of code that should have been removed long ago, at that time ctypes had other ways to pass parameters to function calls. ........ r54250 | collin.winter | 2007-03-09 15:30:39 -0800 (Fri, 09 Mar 2007) | 1 line Hashing simplification pointed out by Thomas Wouters. ........ r54252 | collin.winter | 2007-03-09 18:23:40 -0800 (Fri, 09 Mar 2007) | 5 lines * Unlink test files before and after each test; hopefully this will cut down on recent buildbot failures in test_islink. * Drop safe_remove() in favor of test_support.unlink(). * Fix the indentation of test_samefile so that it runs. ........ r54253 | collin.winter | 2007-03-09 18:51:26 -0800 (Fri, 09 Mar 2007) | 3 lines Bug #1531963: Make SocketServer.TCPServer's server_address always be equal to calling getsockname() on the server's socket. Will backport. ........ r54254 | neal.norwitz | 2007-03-09 19:19:18 -0800 (Fri, 09 Mar 2007) | 4 lines Simplify a little by handling the TCP case first. Update to use predominant style of spaces around = in args list and print to stderr if debugging. ........ r54256 | collin.winter | 2007-03-09 19:35:34 -0800 (Fri, 09 Mar 2007) | 1 line Add proper attribution for a bug fix. ........ r54257 | georg.brandl | 2007-03-09 23:38:14 -0800 (Fri, 09 Mar 2007) | 2 lines Typos. ........ r54260 | collin.winter | 2007-03-10 06:33:32 -0800 (Sat, 10 Mar 2007) | 1 line Convert an assert to a raise so it works even in the presence of -O. ........ r54262 | collin.winter | 2007-03-10 06:41:48 -0800 (Sat, 10 Mar 2007) | 2 lines Patch #1599845: Add an option to disable the implicit calls to server_bind() and server_activate() in the constructors for TCPServer, SimpleXMLRPCServer and DocXMLRPCServer. ........ r54268 | georg.brandl | 2007-03-11 00:28:46 -0800 (Sun, 11 Mar 2007) | 2 lines Add missing "return" statements in exception handler. ........ r54270 | ziga.seilnacht | 2007-03-11 08:54:54 -0700 (Sun, 11 Mar 2007) | 3 lines Patch #1675981: remove unreachable code from type.__new__() method. __dict__ and __weakref__ are removed from the slots tuple earlier in the code, in the loop that mangles slot names. Will backport. ........ r54271 | collin.winter | 2007-03-11 09:00:20 -0700 (Sun, 11 Mar 2007) | 3 lines Patch #1192590: Fix pdb's "ignore" and "condition" commands so they trap the IndexError caused by passing in an invalid breakpoint number. Will backport. ........ r54274 | vinay.sajip | 2007-03-11 11:32:07 -0700 (Sun, 11 Mar 2007) | 1 line Fix resource leak reported in SF #1516995. ........ r54278 | collin.winter | 2007-03-11 18:55:54 -0700 (Sun, 11 Mar 2007) | 4 lines Patch #1678662: ftp.python.org does not exist. So the testcode in urllib.py must use a more stable FTP. Will backport. ........ r54280 | barry.warsaw | 2007-03-11 20:20:01 -0700 (Sun, 11 Mar 2007) | 8 lines Tokio Kikuchi's fix for SF bug #1629369; folding whitespace allowed in the display name of an email address, e.g. Foo \tBar <foo@example.com> Test case added by Barry. ........ r54282 | skip.montanaro | 2007-03-11 20:30:50 -0700 (Sun, 11 Mar 2007) | 4 lines Sane humans would call these invalid tests, but Andrew McNamara pointed out that given the inputs in these tests Excel does indeed produce the output these tests expect. Document that for future confused folks. ........ r54283 | martin.v.loewis | 2007-03-12 03:50:39 -0700 (Mon, 12 Mar 2007) | 2 lines Bug #1675511: Use -Kpic instead of -xcode=pic32 on Solaris/x86. ........ r54285 | martin.v.loewis | 2007-03-12 04:01:10 -0700 (Mon, 12 Mar 2007) | 2 lines Patch #1677862: Require a space or tab after import in .pth files. ........ r54287 | georg.brandl | 2007-03-12 06:17:36 -0700 (Mon, 12 Mar 2007) | 8 lines Backport from Py3k branch: Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Had to change a few bits of the patch because classobjs and __methods__ are still in Py2.6. ........ r54288 | georg.brandl | 2007-03-12 07:30:05 -0700 (Mon, 12 Mar 2007) | 3 lines Bug #1678647: write a newline after printing an exception in any case, even when converting the value to a string failed. ........ r54290 | collin.winter | 2007-03-12 08:57:19 -0700 (Mon, 12 Mar 2007) | 1 line Patch #1678088: convert test_operations to use unittest, fold the result into test_dict. ........ r54291 | collin.winter | 2007-03-12 09:11:39 -0700 (Mon, 12 Mar 2007) | 3 lines Bug #742342: make Python stop segfaulting on infinitely-recursive reload()s. Fixed by patch #922167. Will backport. ........ r54292 | georg.brandl | 2007-03-12 09:15:09 -0700 (Mon, 12 Mar 2007) | 2 lines Typo fix. ........ r54295 | collin.winter | 2007-03-12 10:24:07 -0700 (Mon, 12 Mar 2007) | 1 line Patch #1670993: Refactor test_threadedtempfile.py to use unittest. ........ r54296 | tim.peters | 2007-03-12 11:07:52 -0700 (Mon, 12 Mar 2007) | 2 lines Whitespace normalization. ........ r54297 | tim.peters | 2007-03-12 11:09:22 -0700 (Mon, 12 Mar 2007) | 2 lines Set missing svn:eol-style property on text files. ........ r54315 | brett.cannon | 2007-03-12 19:34:09 -0700 (Mon, 12 Mar 2007) | 8 lines Add test.test_support.transient_internet . Returns a context manager that nests test.test_support.TransientResource context managers that capture exceptions raised when the Internet connection is flaky. Initially using in test_socket_ssl but should probably be expanded to cover any test that should not raise the captured exceptions if the Internet connection works. ........ r54316 | brett.cannon | 2007-03-12 20:05:40 -0700 (Mon, 12 Mar 2007) | 2 lines Fix a typo where the variable name was not updated. ........ r54318 | neal.norwitz | 2007-03-12 21:59:58 -0700 (Mon, 12 Mar 2007) | 1 line Add Jerry Seutter for a bunch of his recent patches refactoring tests ........ r54319 | neal.norwitz | 2007-03-12 22:07:14 -0700 (Mon, 12 Mar 2007) | 7 lines Add some other acks for recent checkins: Brian Leair - 922167 Tomer Filiba - 1591665 Jeremy Jones - 1192590 ........ r54321 | neal.norwitz | 2007-03-12 22:31:38 -0700 (Mon, 12 Mar 2007) | 9 lines Fix some style nits: * lines too long * wrong indentation * space after a function name * wrong function name in error string * simplifying some logic Also add an error check to PyDict_SetItemString. ........ r54322 | georg.brandl | 2007-03-13 00:23:16 -0700 (Tue, 13 Mar 2007) | 2 lines Typo and grammar fixes. ........ r54323 | georg.brandl | 2007-03-13 00:50:57 -0700 (Tue, 13 Mar 2007) | 2 lines Patch #1679379: add documentation for fnmatch.translate(). ........ r54325 | georg.brandl | 2007-03-13 00:57:51 -0700 (Tue, 13 Mar 2007) | 2 lines Patch #1642844: comments to clarify the complexobject constructor. ........ r54326 | georg.brandl | 2007-03-13 01:14:27 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1668100: urllib2 now correctly raises URLError instead of OSError if accessing a local file via the file:// protocol fails. ........ r54327 | georg.brandl | 2007-03-13 02:32:11 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1635454: the csv.DictWriter class now includes the offending field names in its exception message if you try to write a record with a dictionary containing fields not in the CSV field names list. ........ r54328 | georg.brandl | 2007-03-13 02:41:31 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1555098: use str.join() instead of repeated string concatenation in robotparser. ........ r54329 | georg.brandl | 2007-03-13 03:06:48 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1542681: add entries for "with", "as" and "CONTEXTMANAGERS" to pydoc's help keywords. ........ r54331 | georg.brandl | 2007-03-13 03:19:22 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1569798: fix a bug in distutils when building Python from a directory within sys.exec_prefix. ........ r54333 | martin.v.loewis | 2007-03-13 03:24:00 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1449244: Support Unicode strings in email.message.Message.{set_charset,get_content_charset}. Will backport. ........ r54335 | lars.gustaebel | 2007-03-13 03:47:19 -0700 (Tue, 13 Mar 2007) | 34 lines This is the implementation of POSIX.1-2001 (pax) format read/write support. The TarInfo class now contains all necessary logic to process and create tar header data which has been moved there from the TarFile class. The fromtarfile() method was added. The new path and linkpath properties are aliases for the name and linkname attributes in correspondence to the pax naming scheme. The TarFile constructor and classmethods now accept a number of keyword arguments which could only be set as attributes before (e.g. dereference, ignore_zeros). The encoding and pax_headers arguments were added for pax support. There is a new tarinfo keyword argument that allows using subclassed TarInfo objects in TarFile. The boolean TarFile.posix attribute is deprecated, because now three tar formats are supported. Instead, the desired format for writing is specified using the constants USTAR_FORMAT, GNU_FORMAT and PAX_FORMAT as the format keyword argument. This change affects TarInfo.tobuf() as well. The test suite has been heavily reorganized and partially rewritten. A new testtar.tar was added that contains sample data in many formats from 4 different tar programs. Some bugs and quirks that also have been fixed: Directory names do no longer have a trailing slash in TarInfo.name or TarFile.getnames(). Adding the same file twice does not create a hardlink file member. The TarFile constructor does no longer need a name argument. The TarFile._mode attribute was renamed to mode and contains either 'r', 'w' or 'a'. ........ r54336 | georg.brandl | 2007-03-13 05:34:25 -0700 (Tue, 13 Mar 2007) | 3 lines Bug #1622896: fix a rare corner case where the bz2 module raised an error in spite of a succesful compression. ........ r54338 | lars.gustaebel | 2007-03-13 08:47:07 -0700 (Tue, 13 Mar 2007) | 3 lines Quick fix for tests that fail on systems with an encoding other than 'iso8859-1'. ........ r54339 | georg.brandl | 2007-03-13 10:43:32 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1603688: ConfigParser.SafeConfigParser now checks values that are set for invalid interpolation sequences that would lead to errors on reading back those values. ........ r54341 | georg.brandl | 2007-03-13 11:15:41 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1581073: add a flag to textwrap that prevents the dropping of whitespace while wrapping. ........ r54343 | georg.brandl | 2007-03-13 11:24:40 -0700 (Tue, 13 Mar 2007) | 2 lines Patch #1605192: list allowed states in error messages for imaplib. ........ r54344 | georg.brandl | 2007-03-13 11:31:49 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1537850: tempfile.NamedTemporaryFile now has a "delete" parameter which can be set to False to prevent the default delete-on-close behavior. ........ r54345 | collin.winter | 2007-03-13 11:53:04 -0700 (Tue, 13 Mar 2007) | 9 lines Add acks for recent patch checkins: Arvin Schnell - 1668482 S?\195?\169bastien Martini - 1481079 Heiko Wundram - 1491866 Damon Kohler - 1545011 Peter Parente - 1599845 Bjorn Lindqvist - 1678662 ........ r54346 | georg.brandl | 2007-03-13 12:00:36 -0700 (Tue, 13 Mar 2007) | 2 lines Acks for recent patches. ........ r54347 | georg.brandl | 2007-03-13 12:18:18 -0700 (Tue, 13 Mar 2007) | 3 lines Fix a tab. ........ r54348 | georg.brandl | 2007-03-13 12:32:21 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1533909: the timeit module now accepts callables in addition to strings for the code to time and the setup code. Also added two convenience functions for instantiating a Timer and calling its methods. ........ r54352 | georg.brandl | 2007-03-13 13:02:57 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1530482: add pydoc.render_doc() which returns the documentation for a thing instead of paging it to stdout, which pydoc.doc() does. ........ r54357 | thomas.heller | 2007-03-13 13:42:52 -0700 (Tue, 13 Mar 2007) | 1 line Patch #1649190: Adding support for _Bool to ctypes as c_bool, by David Remahl. ........ r54358 | georg.brandl | 2007-03-13 13:46:32 -0700 (Tue, 13 Mar 2007) | 2 lines Patch #1444529: the builtin compile() now accepts keyword arguments. (backport) ........ r54359 | thomas.heller | 2007-03-13 14:01:39 -0700 (Tue, 13 Mar 2007) | 1 line Add versionadded marker for ctypes.c_bool. ........ r54360 | georg.brandl | 2007-03-13 14:08:15 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1393667: pdb now has a "run" command which restarts the debugged Python program, optionally with different arguments. ........ r54361 | georg.brandl | 2007-03-13 14:32:01 -0700 (Tue, 13 Mar 2007) | 3 lines Deprecate commands.getstatus(). ........ r54362 | georg.brandl | 2007-03-13 14:32:56 -0700 (Tue, 13 Mar 2007) | 2 lines NEWS entry for getstatus() deprecation. ........ r54363 | georg.brandl | 2007-03-13 14:58:44 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1429539: pdb now correctly initializes the __main__ module for the debugged script, which means that imports from __main__ work correctly now. ........ r54364 | georg.brandl | 2007-03-13 15:07:36 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #957650: "%var%" environment variable references are now properly expanded in ntpath.expandvars(), also "~user" home directory references are recognized and handled on Windows. ........ r54365 | georg.brandl | 2007-03-13 15:16:30 -0700 (Tue, 13 Mar 2007) | 2 lines Patch #1194449: correctly detect unbound methods in pydoc. ........ r54367 | georg.brandl | 2007-03-13 15:49:43 -0700 (Tue, 13 Mar 2007) | 5 lines Patch #1185447: binascii.b2a_qp() now correctly quotes binary characters with ASCII value less than 32. Also, it correctly quotes dots only if they occur on a single line, as opposed to the previous behavior of quoting dots if they are the second character of any line. ........ r54368 | collin.winter | 2007-03-13 16:02:15 -0700 (Tue, 13 Mar 2007) | 1 line Inline PyImport_GetModulesReloading(). ........ r54371 | barry.warsaw | 2007-03-13 21:59:50 -0700 (Tue, 13 Mar 2007) | 6 lines SF bug #1582282; decode_header() incorrectly splits not-conformant RFC 2047-like headers where there is no whitespace between encoded words. This fix changes the matching regexp to include a trailing lookahead assertion that the closing ?= must be followed by whitespace, newline, or end-of-string. This also changes the regexp to add the MULTILINE flag. ........ r54372 | gregory.p.smith | 2007-03-14 00:17:40 -0700 (Wed, 14 Mar 2007) | 2 lines correct order and names of the less often used keyword parameters. ........ r54373 | gregory.p.smith | 2007-03-14 00:19:50 -0700 (Wed, 14 Mar 2007) | 5 lines Its time to stop listing (Unix, Windows) when we really mean "everything but Mac OS 9" now that nobody is likely to use Python on Mac OS 9 and most of the (Mac) platform items are all OS X special API specific since OS X is unixy enough for these modules to be available out of the box. ........ r54376 | georg.brandl | 2007-03-14 01:27:52 -0700 (Wed, 14 Mar 2007) | 4 lines Bug #767111: fix long-standing bug in urllib which caused an AttributeError instead of an IOError when the server's response didn't contain a valid HTTP status line. ........ r54378 | ziga.seilnacht | 2007-03-14 05:24:09 -0700 (Wed, 14 Mar 2007) | 4 lines Patch #1680015: Don't modify __slots__ tuple if it contains an unicode name. Remove a reference leak that happened if the name could not be converted to string. Will backport. ........ r54386 | martin.v.loewis | 2007-03-14 13:02:31 -0700 (Wed, 14 Mar 2007) | 3 lines Patch #1559413: Fix test_cmd_line if sys.executable contains a space. Will backport. ........ r54389 | brett.cannon | 2007-03-14 14:40:13 -0700 (Wed, 14 Mar 2007) | 3 lines Note how test_socket_ssl has various exceptions that deal with a flaky Net connection are silenced. ........ r54390 | brett.cannon | 2007-03-14 14:44:15 -0700 (Wed, 14 Mar 2007) | 2 lines Raise ResourceDenied in test_urllib2net when the Net connection goes bad. ........ r54391 | neal.norwitz | 2007-03-14 21:41:20 -0700 (Wed, 14 Mar 2007) | 1 line Wrap a long line and fix a typo (is -> if) ........ r54392 | georg.brandl | 2007-03-15 00:38:14 -0700 (Thu, 15 Mar 2007) | 3 lines Patch #1680978: consistently use "alive" instead of "active" in the thread lib doc. ........ r54394 | georg.brandl | 2007-03-15 00:41:30 -0700 (Thu, 15 Mar 2007) | 3 lines Patch #1681153: the wave module now closes a file object it opened if initialization failed. ........ r54397 | ziga.seilnacht | 2007-03-15 04:44:55 -0700 (Thu, 15 Mar 2007) | 3 lines Patch #1462488: prevent a segfault in object_reduce_ex() by splitting the implementation for __reduce__ and __reduce_ex__ into two separate functions. Fixes bug #931877. Will backport. ........ r54404 | collin.winter | 2007-03-15 21:11:30 -0700 (Thu, 15 Mar 2007) | 3 lines Patch #1642547: Fix an error/crash when encountering syntax errors in complex if statements. Will backport. ........ r54406 | georg.brandl | 2007-03-16 00:55:09 -0700 (Fri, 16 Mar 2007) | 5 lines Bug #1681228: the webbrowser module now correctly uses the default GNOME or KDE browser, depending on whether there is a session of one of those present. Also, it tries the Windows default browser before trying Mozilla variants. (backport) ........ r54407 | georg.brandl | 2007-03-16 01:22:40 -0700 (Fri, 16 Mar 2007) | 4 lines Patch #1273829: os.walk() now has a "followlinks" parameter. If set to True (which is not the default), it visits symlinks pointing to directories. ........ r54408 | georg.brandl | 2007-03-16 01:24:21 -0700 (Fri, 16 Mar 2007) | 2 lines Add \versionadded tag. ........ r54409 | georg.brandl | 2007-03-16 01:33:47 -0700 (Fri, 16 Mar 2007) | 2 lines RFE #1670167: fix in isinstance() docs. ........ r54412 | ziga.seilnacht | 2007-03-16 04:59:38 -0700 (Fri, 16 Mar 2007) | 3 lines Patch #1623563: allow __class__ assignment for classes with __slots__. The old and the new class are still required to have the same slot names, but the order in which they are specified is not relevant. ........ r54413 | ziga.seilnacht | 2007-03-16 05:11:11 -0700 (Fri, 16 Mar 2007) | 2 lines Whitespace cleanup. Also remove the empty lines from the previous check in. ........ r54414 | jeremy.hylton | 2007-03-16 07:49:11 -0700 (Fri, 16 Mar 2007) | 2 lines Remove warning: funcion declaration isn't a prototype ........ r54415 | jeremy.hylton | 2007-03-16 08:59:47 -0700 (Fri, 16 Mar 2007) | 11 lines Clean up formatting of this file. The file should now follow PEP 7, except that it uses 4 space indents (in the style of Py3k). This particular code would be really hard to read with the regular tab idents. Other changes: - reflow long lines - change multi-line conditionals to have test at end of line ........ r54417 | collin.winter | 2007-03-16 14:13:35 -0700 (Fri, 16 Mar 2007) | 1 line Patch #1676994: Refactor test_popen2 to use unittest. ........ r54418 | collin.winter | 2007-03-16 14:15:35 -0700 (Fri, 16 Mar 2007) | 1 line Remove test/output/test_popen2 (missed in r54417). ........ r54419 | collin.winter | 2007-03-16 15:16:08 -0700 (Fri, 16 Mar 2007) | 1 line Patch 1339796: add a relpath() function to os.path. ........ r54421 | georg.brandl | 2007-03-17 09:08:45 -0700 (Sat, 17 Mar 2007) | 5 lines Patch #1675423: PyComplex_AsCComplex() now tries to convert an object to complex using its __complex__() method before falling back to the __float__() method. Therefore, the functions in the cmath module now can operate on objects that define a __complex__() method. (backport) ........ r54423 | gregory.p.smith | 2007-03-17 15:33:35 -0700 (Sat, 17 Mar 2007) | 2 lines move note to the correct section ........ r54426 | georg.brandl | 2007-03-18 01:25:00 -0700 (Sun, 18 Mar 2007) | 2 lines Patch #1682878: the new socket methods are recv_into and recvfrom_into, not *_buf. ........ r54432 | georg.brandl | 2007-03-18 11:28:25 -0700 (Sun, 18 Mar 2007) | 2 lines Patch #1678339: test case for bug in difflib. ........ r54439 | collin.winter | 2007-03-19 11:52:08 -0700 (Mon, 19 Mar 2007) | 1 line Patch #1630118: add a SpooledTemporaryFile class to tempfile. ........ r54441 | georg.brandl | 2007-03-19 12:02:48 -0700 (Mon, 19 Mar 2007) | 2 lines Patch #1683328: fixes and enhancements for "unparse" demo. ........ r54456 | neal.norwitz | 2007-03-19 22:07:28 -0700 (Mon, 19 Mar 2007) | 1 line Add some doc that was left out from some change to platform.py ........ r54457 | neal.norwitz | 2007-03-19 22:08:23 -0700 (Mon, 19 Mar 2007) | 1 line Add a comment about 3k migration ........ r54458 | neal.norwitz | 2007-03-19 22:21:21 -0700 (Mon, 19 Mar 2007) | 1 line Get rid of deprecation warning when testing commands.getstatus() ........ r54459 | neal.norwitz | 2007-03-19 22:23:09 -0700 (Mon, 19 Mar 2007) | 4 lines Try backing out 54407 to see if it corrects the problems on the Windows buildbots. This rev was backported, so we will need to keep both branches in sync, pending the outcome of the test after this checkin. ........ r54460 | neal.norwitz | 2007-03-19 23:13:25 -0700 (Mon, 19 Mar 2007) | 1 line Try to make this test more resistant to dropping from previous runs (ie, files that may exist but cause the test to fail). Should be backported (assuming it works :-) ........ r54461 | neal.norwitz | 2007-03-19 23:16:26 -0700 (Mon, 19 Mar 2007) | 1 line Try to make this test more resistant to dropping from previous runs (ie, files that may exist but cause the test to fail). Should be backported (assuming it works :-) ........ r54462 | neal.norwitz | 2007-03-19 23:53:17 -0700 (Mon, 19 Mar 2007) | 5 lines Try to be a little more resilient to errors. This might help the test pass, but my guess is that it won't. I'm guessing that some other test is leaving this file open which means it can't be removed under Windows AFAIK. ........ r54463 | neal.norwitz | 2007-03-20 01:14:57 -0700 (Tue, 20 Mar 2007) | 8 lines Try to get test_urllib to pass on Windows by closing the file. I'm guessing that's the problem. h.getfile() must be called *after* h.getreply() and the fp can be None. I'm not entirely convinced this is the best fix (or even correct). The buildbots will tell us if things improve or not. I don't know if this needs to be backported (assuming it actually works). ........ r54465 | raymond.hettinger | 2007-03-20 14:27:24 -0700 (Tue, 20 Mar 2007) | 1 line Extend work on rev 52962 and 53829 eliminating redundant PyObject_Hash() calls and fixing set/dict interoperability. ........ r54468 | georg.brandl | 2007-03-20 16:05:14 -0700 (Tue, 20 Mar 2007) | 2 lines Fix for glob.py if filesystem encoding is None. ........ r54479 | neal.norwitz | 2007-03-20 23:39:48 -0700 (Tue, 20 Mar 2007) | 1 line Remove unused file spotted by Paul Hankin ........ r54480 | georg.brandl | 2007-03-21 02:00:39 -0700 (Wed, 21 Mar 2007) | 3 lines Patch #1682205: a TypeError while unpacking an iterable is no longer masked by a generic one with the message "unpack non-sequence". ........ r54482 | georg.brandl | 2007-03-21 02:10:29 -0700 (Wed, 21 Mar 2007) | 2 lines New test for rev. 54407 which only uses directories under TESTFN. ........ r54483 | georg.brandl | 2007-03-21 02:16:53 -0700 (Wed, 21 Mar 2007) | 2 lines Patch #1684834: document some utility C API functions. ........ r54485 | georg.brandl | 2007-03-21 04:51:25 -0700 (Wed, 21 Mar 2007) | 2 lines Fix #1684254: split BROWSER contents with shlex to avoid displaying 'URL'. ........ r54487 | andrew.kuchling | 2007-03-21 07:32:43 -0700 (Wed, 21 Mar 2007) | 1 line Add comments on maintenance of this file ........ r54489 | andrew.kuchling | 2007-03-21 09:57:32 -0700 (Wed, 21 Mar 2007) | 1 line Fix sentence, and fix typo in example ........ r54490 | andrew.kuchling | 2007-03-21 09:59:20 -0700 (Wed, 21 Mar 2007) | 1 line Put code examples at left margin instead of indenting them ........ r54491 | facundo.batista | 2007-03-21 12:41:24 -0700 (Wed, 21 Mar 2007) | 1 line Minor clarification, saying that blocking means no timeout (from bug #882297) ........ r54492 | ziga.seilnacht | 2007-03-21 13:07:56 -0700 (Wed, 21 Mar 2007) | 2 lines Bug #1675967: re patterns pickled with older Python versions can now be unpickled. Will backport. ........ r54495 | raymond.hettinger | 2007-03-21 13:33:57 -0700 (Wed, 21 Mar 2007) | 1 line Add test and fix for fromkeys() optional argument. ........ r54524 | georg.brandl | 2007-03-22 01:05:45 -0700 (Thu, 22 Mar 2007) | 2 lines Bug #1685704: use -m switch in timeit docs. ........ r54533 | thomas.heller | 2007-03-22 12:44:31 -0700 (Thu, 22 Mar 2007) | 5 lines Back out "Patch #1643874: memory leak in ctypes fixed." The code in this patch leaves no way to give up the ownership of a BSTR instance. ........ r54538 | thomas.heller | 2007-03-22 13:34:37 -0700 (Thu, 22 Mar 2007) | 2 lines Explain the purpose of the b_needsfree flag (forward ported from release25-maint). ........ r54539 | guido.van.rossum | 2007-03-22 21:58:42 -0700 (Thu, 22 Mar 2007) | 12 lines - Bug #1683368: The object.__init__() and object.__new__() methods are now stricter in rejecting excess arguments. The only time when either allows excess arguments is when it is not overridden and the other one is. For backwards compatibility, when both are overridden, it is a deprecation warning (for now; maybe a Py3k warning later). When merging this into 3.0, the warnings should become errors. Note: without the change to string.py, lots of spurious warnings happen. What's going on there? ........ r54540 | neal.norwitz | 2007-03-22 22:17:23 -0700 (Thu, 22 Mar 2007) | 1 line Add Mark Dickinson for SF # 1675423. ........ r54541 | martin.v.loewis | 2007-03-23 03:35:49 -0700 (Fri, 23 Mar 2007) | 3 lines Patch #1686451: Fix return type for PySequence_{Count,Index,Fast_GET_SIZE}. Will backport. ........ r54543 | martin.v.loewis | 2007-03-23 06:27:15 -0700 (Fri, 23 Mar 2007) | 3 lines Bug #978833: Revert r50844, as it broke _socketobject.dup. Will backport. ........ r54545 | guido.van.rossum | 2007-03-23 11:53:03 -0700 (Fri, 23 Mar 2007) | 8 lines Add a type.__init__() method that enforces the same signature as type.__new__(), and then calls object.__init__(cls), just to be anal. This allows us to restore the code in string.py's _TemplateMetaclass that called super(...).__init__(name, bases, dct), which I commented out yesterday since it broke due to the stricter argument checking added to object.__init__(). ........ r54546 | facundo.batista | 2007-03-23 11:54:07 -0700 (Fri, 23 Mar 2007) | 4 lines Added a 'create_connect()' function to socket.py, which creates a connection with an optional timeout, and modified httplib.py to use this function in HTTPConnection. Applies patch 1676823. ........ r54547 | guido.van.rossum | 2007-03-23 12:39:01 -0700 (Fri, 23 Mar 2007) | 2 lines Add note about type.__init__(). ........ r54553 | thomas.heller | 2007-03-23 12:55:27 -0700 (Fri, 23 Mar 2007) | 5 lines Prevent creation (followed by a segfault) of array types when the size overflows the valid Py_ssize_t range. Check return values of PyMem_Malloc. Will backport to release25-maint. ........ r54555 | facundo.batista | 2007-03-23 13:23:08 -0700 (Fri, 23 Mar 2007) | 6 lines Surrounded with try/finally to socket's default timeout setting changes in the tests, so failing one test won't produce strange results in others. Also relaxed the timeout settings in the test (where actually the value didn't mean anything). ........ r54556 | collin.winter | 2007-03-23 15:24:39 -0700 (Fri, 23 Mar 2007) | 1 line Make test_relpath() pass on Windows. ........ r54559 | ziga.seilnacht | 2007-03-24 07:24:26 -0700 (Sat, 24 Mar 2007) | 6 lines Patch #1489771: update syntax rules in Python Reference Manual. Python 2.5 added support for explicit relative import statements and yield expressions, which were missing in the manual. Also fix grammar productions that used the names from the Grammar file, markup that broke the generated grammar.txt, and wrap some lines that broke the pdf output. Will backport. ........ r54565 | georg.brandl | 2007-03-24 15:20:34 -0700 (Sat, 24 Mar 2007) | 2 lines Remove typo accent. ........ r54566 | georg.brandl | 2007-03-24 15:27:56 -0700 (Sat, 24 Mar 2007) | 2 lines Revert accidental change. ........ r54567 | brett.cannon | 2007-03-24 18:32:36 -0700 (Sat, 24 Mar 2007) | 3 lines Change the docs to no longer claim that unittest is preferred over doctest for regression tests. ........ r54568 | facundo.batista | 2007-03-24 18:53:21 -0700 (Sat, 24 Mar 2007) | 4 lines Redone the tests, using the infrastructure already present for threading and socket serving. ........ r54570 | facundo.batista | 2007-03-24 20:20:05 -0700 (Sat, 24 Mar 2007) | 3 lines Closing the HTTP connection after each test, and listening more. ........ r54572 | georg.brandl | 2007-03-25 11:44:35 -0700 (Sun, 25 Mar 2007) | 2 lines Markup fix. ........ r54573 | georg.brandl | 2007-03-25 12:04:55 -0700 (Sun, 25 Mar 2007) | 2 lines Markup fix. ........ r54580 | facundo.batista | 2007-03-26 13:18:31 -0700 (Mon, 26 Mar 2007) | 5 lines Added an optional timeout to FTP class. Also I started a test_ftplib.py file to test the ftp lib (right now I included a basic test, the timeout one, and nothing else). ........ r54581 | georg.brandl | 2007-03-26 13:28:28 -0700 (Mon, 26 Mar 2007) | 2 lines Some nits. ........ r54582 | facundo.batista | 2007-03-26 13:56:09 -0700 (Mon, 26 Mar 2007) | 4 lines Forgot to add the file before the previous commit, here go the ftplib tests. ........ r54585 | facundo.batista | 2007-03-27 11:23:21 -0700 (Tue, 27 Mar 2007) | 5 lines Added an optional timeout to poplib.POP3. Also created a test_poplib.py file with a basic test and the timeout ones. Docs are also updated. ........ r54586 | facundo.batista | 2007-03-27 11:50:29 -0700 (Tue, 27 Mar 2007) | 3 lines The basic test cases of poplib.py. ........ r54594 | facundo.batista | 2007-03-27 20:45:20 -0700 (Tue, 27 Mar 2007) | 4 lines Bug 1688393. Adds a control of negative values in socket.recvfrom, which caused an ugly crash. ........ r54599 | facundo.batista | 2007-03-28 11:25:54 -0700 (Wed, 28 Mar 2007) | 5 lines Added timeout to smtplib (to SMTP and SMTP_SSL). Also created the test_smtplib.py file, with a basic test and the timeout ones. Docs are updated too. ........ r54603 | collin.winter | 2007-03-28 16:34:06 -0700 (Wed, 28 Mar 2007) | 3 lines Consolidate patches #1690164, 1683397, and 1690169, all of which refactor XML-related test suites. The patches are applied together because they use a common output/xmltests file. Thanks to Jerry Seutter for all three patches. ........ r54604 | collin.winter | 2007-03-28 19:28:16 -0700 (Wed, 28 Mar 2007) | 1 line Make test_zipfile clean up its temporary files properly. ........ r54605 | georg.brandl | 2007-03-29 00:41:32 -0700 (Thu, 29 Mar 2007) | 2 lines These are actually methods. ........ r54606 | georg.brandl | 2007-03-29 05:42:07 -0700 (Thu, 29 Mar 2007) | 4 lines In Windows' time.clock(), when QueryPerformanceFrequency() fails, the C lib's clock() is used, but it must be divided by CLOCKS_PER_SEC as for the POSIX implementation (thanks to #pypy). ........ r54608 | facundo.batista | 2007-03-29 11:22:35 -0700 (Thu, 29 Mar 2007) | 5 lines Added timout parameter to telnetlib.Telnet. Also created test_telnetlib.py with a basic test and timeout ones. Docs are also updated. ........ r54613 | facundo.batista | 2007-03-30 06:00:35 -0700 (Fri, 30 Mar 2007) | 4 lines Added the posibility to pass the timeout to FTP.connect, not only when instantiating the class. Docs and tests are updated. ........ r54614 | collin.winter | 2007-03-30 07:01:25 -0700 (Fri, 30 Mar 2007) | 1 line Bug #1688274: add documentation for C-level class objects. ........ r54615 | marc-andre.lemburg | 2007-03-30 08:01:42 -0700 (Fri, 30 Mar 2007) | 4 lines Bump the patch level version of distutils since there were a few bug fixes since the 2.5.0 release. ........ r54617 | georg.brandl | 2007-03-30 08:49:05 -0700 (Fri, 30 Mar 2007) | 2 lines Markup fix. ........ r54618 | georg.brandl | 2007-03-30 10:39:39 -0700 (Fri, 30 Mar 2007) | 2 lines Label name fix. ........ r54619 | georg.brandl | 2007-03-30 10:47:21 -0700 (Fri, 30 Mar 2007) | 2 lines Duplicate label fix. ........ r54620 | georg.brandl | 2007-03-30 10:48:39 -0700 (Fri, 30 Mar 2007) | 2 lines Markup fix. ........ r54623 | andrew.kuchling | 2007-03-30 11:00:15 -0700 (Fri, 30 Mar 2007) | 1 line Add item. (Oops, accidentally checked this in on my branch) ........ r54624 | georg.brandl | 2007-03-30 12:01:38 -0700 (Fri, 30 Mar 2007) | 2 lines Duplicate label fix. ........ r54625 | georg.brandl | 2007-03-30 12:14:02 -0700 (Fri, 30 Mar 2007) | 2 lines Markup fix. ........ r54629 | georg.brandl | 2007-03-31 03:17:31 -0700 (Sat, 31 Mar 2007) | 2 lines repair string literal. ........ r54630 | georg.brandl | 2007-03-31 04:54:58 -0700 (Sat, 31 Mar 2007) | 2 lines Markup fix. ........ r54631 | georg.brandl | 2007-03-31 04:58:36 -0700 (Sat, 31 Mar 2007) | 2 lines Duplicate label fix. ........ r54632 | georg.brandl | 2007-03-31 04:59:54 -0700 (Sat, 31 Mar 2007) | 2 lines Typo fix. ........ r54633 | neal.norwitz | 2007-03-31 11:54:18 -0700 (Sat, 31 Mar 2007) | 1 line Fix method names. Will backport. ........ r54634 | georg.brandl | 2007-03-31 11:56:11 -0700 (Sat, 31 Mar 2007) | 4 lines Bug #1655392: don't add -L/usr/lib/pythonX.Y/config to the LDFLAGS returned by python-config if Python was built with --enable-shared because that prevented the shared library from being used. ........ r54637 | collin.winter | 2007-03-31 12:31:34 -0700 (Sat, 31 Mar 2007) | 1 line Shut up an occaisonal buildbot error due to test files being left around. ........ r54644 | neal.norwitz | 2007-04-01 11:24:22 -0700 (Sun, 01 Apr 2007) | 11 lines SF #1685563, MSVCCompiler creates redundant and long PATH strings If MSVCCompiler.initialize() was called multiple times, the path would get duplicated. On Windows, this is a problem because the path is limited to 4k. There's no benefit in adding a path multiple times, so prevent that from occuring. We also normalize the path before checking for duplicates so things like /a and /a/ won't both be stored. Will backport. ........ r54646 | brett.cannon | 2007-04-01 11:47:27 -0700 (Sun, 01 Apr 2007) | 8 lines time.strptime's caching of its locale object was being recreated when the locale changed but not used during the function call it was recreated during. The test in this checkin is untested (OS X does not have the proper locale support for me to test), although the fix for the bug this deals with was tested by the OP (#1290505). Once the buildbots verify the test at least doesn't fail it becomes a backport candidate. ........ r54647 | brett.cannon | 2007-04-01 12:46:19 -0700 (Sun, 01 Apr 2007) | 3 lines Fix the test for recreating the locale cache object by not worrying about if one of the test locales cannot be set. ........ r54649 | georg.brandl | 2007-04-01 14:29:15 -0700 (Sun, 01 Apr 2007) | 2 lines Fix a lot of markup and meta-information glitches. ........ r54650 | georg.brandl | 2007-04-01 14:39:52 -0700 (Sun, 01 Apr 2007) | 2 lines Another fix. ........ r54651 | georg.brandl | 2007-04-01 15:39:10 -0700 (Sun, 01 Apr 2007) | 2 lines Lots of explicit class names for method and member descs. ........ r54652 | georg.brandl | 2007-04-01 15:40:12 -0700 (Sun, 01 Apr 2007) | 2 lines Explicit class names. ........ r54653 | georg.brandl | 2007-04-01 15:47:31 -0700 (Sun, 01 Apr 2007) | 2 lines Some semantic fixes. ........ r54654 | georg.brandl | 2007-04-01 16:29:10 -0700 (Sun, 01 Apr 2007) | 2 lines Remove bogus entry. ........ r54655 | georg.brandl | 2007-04-01 16:31:30 -0700 (Sun, 01 Apr 2007) | 2 lines Fix the class name of strings. ........ r54658 | raymond.hettinger | 2007-04-02 10:29:30 -0700 (Mon, 02 Apr 2007) | 1 line SF #1693079: Cannot save empty array in shelve ........ r54663 | raymond.hettinger | 2007-04-02 15:54:21 -0700 (Mon, 02 Apr 2007) | 3 lines Array module's buffer interface can now handle empty arrays. ........ r54664 | guido.van.rossum | 2007-04-02 16:55:37 -0700 (Mon, 02 Apr 2007) | 5 lines Fix warnings about object.__init__() signature. Two (test_array and test_descr) were bug IMO; the third (copy_reg) is a work-around which recognizes that object.__init__() doesn't do anything. ........ r54666 | raymond.hettinger | 2007-04-02 17:02:11 -0700 (Mon, 02 Apr 2007) | 1 line SF 1602378 Clarify docstrings for bisect ........ r54668 | raymond.hettinger | 2007-04-02 18:39:43 -0700 (Mon, 02 Apr 2007) | 3 lines SF #1382213: Tutorial section 9.5.1 ignores MRO for new-style classes ........ r54669 | matthias.klose | 2007-04-02 21:35:59 -0700 (Mon, 02 Apr 2007) | 4 lines - Fix an off-by-one bug in locale.strxfrm(). patch taken from http://bugs.debian.org/416934. ........ r54671 | georg.brandl | 2007-04-03 00:04:27 -0700 (Tue, 03 Apr 2007) | 9 lines Fix the strange case of \begin{methoddesc}[NNTP]{...} where \ifx#1\@undefined ended up comparing N and N, therefore executing the true part of the conditional, blowing up at \@undefined. ........ r54672 | facundo.batista | 2007-04-03 07:05:08 -0700 (Tue, 03 Apr 2007) | 4 lines Now using unittest for the tests infraestructure. Also split the tests in those who need the network, and that who doesn't. ........ r54673 | walter.doerwald | 2007-04-03 09:08:10 -0700 (Tue, 03 Apr 2007) | 4 lines Move the functionality for catching warnings in test_warnings.py into a separate class to that reusing the functionality in test_structmembers.py doesn't rerun the tests from test_warnings.py. ........ r54674 | walter.doerwald | 2007-04-03 09:16:24 -0700 (Tue, 03 Apr 2007) | 2 lines Document that CatchWarningTests is reused by test_structmembers.py. ........ r54675 | walter.doerwald | 2007-04-03 09:53:43 -0700 (Tue, 03 Apr 2007) | 4 lines Add tests for the filename. Test that the stacklevel is handled correctly. ........ r54676 | facundo.batista | 2007-04-03 10:29:48 -0700 (Tue, 03 Apr 2007) | 6 lines Added a SSL server to test_socket_ssl.py to be able to test locally. Now, it checks if have openssl available and run those specific tests (it starts openssl at the beggining of all the tests and then kills it at the end). ........ r54677 | walter.doerwald | 2007-04-03 11:33:29 -0700 (Tue, 03 Apr 2007) | 6 lines Implement a contextmanager test.test_support.catch_warning that can be used to catch the last warning issued by the warning framework. Change test_warnings.py and test_structmembers.py to use this new contextmanager. ........ r54678 | facundo.batista | 2007-04-03 14:15:34 -0700 (Tue, 03 Apr 2007) | 4 lines Changed the whole structure of startup and checking if the server is available. Hope to not get more false alarms. ........ r54681 | facundo.batista | 2007-04-04 07:10:40 -0700 (Wed, 04 Apr 2007) | 4 lines Fixed the way that the .pem files are looked for, and changed how to kill the process in win32 to use the _handle attribute. ........ r54682 | guido.van.rossum | 2007-04-04 10:43:02 -0700 (Wed, 04 Apr 2007) | 4 lines Fix a race condition in this test -- instead of assuming that it will take the test server thread at most 0.5 seconds to get ready, use an event variable. ........ r54683 | collin.winter | 2007-04-04 11:14:17 -0700 (Wed, 04 Apr 2007) | 1 line Clean up imports. ........ r54684 | collin.winter | 2007-04-04 11:16:24 -0700 (Wed, 04 Apr 2007) | 1 line Stop using test_support.verify(). ........ r54685 | martin.v.loewis | 2007-04-04 11:30:36 -0700 (Wed, 04 Apr 2007) | 2 lines Bug #1686475: Support stat'ing open files on Windows again. Will backport to 2.5. ........ r54687 | collin.winter | 2007-04-04 11:33:40 -0700 (Wed, 04 Apr 2007) | 1 line Make test_getopt use unittest. ........ r54688 | collin.winter | 2007-04-04 11:36:30 -0700 (Wed, 04 Apr 2007) | 1 line Make test_softspace use unittest. ........ r54689 | ziga.seilnacht | 2007-04-04 11:38:47 -0700 (Wed, 04 Apr 2007) | 2 lines Fix WalkTests.test_traversal() on Windows. The cleanup in MakedirTests.setUp() can now be removed. ........ r54695 | raymond.hettinger | 2007-04-05 11:00:03 -0700 (Thu, 05 Apr 2007) | 3 lines Bug #1563759: struct.unpack doens't support buffer protocol objects ........ r54697 | collin.winter | 2007-04-05 13:05:07 -0700 (Thu, 05 Apr 2007) | 1 line Convert test_long_future to use unittest. ........ r54698 | collin.winter | 2007-04-05 13:08:56 -0700 (Thu, 05 Apr 2007) | 1 line Convert test_normalization to use unittest. ........ r54699 | andrew.kuchling | 2007-04-05 18:11:58 -0700 (Thu, 05 Apr 2007) | 1 line Some grammar fixes ........ r54704 | collin.winter | 2007-04-06 12:27:40 -0700 (Fri, 06 Apr 2007) | 1 line Convert test_stringprep to use unittest. ........ r54705 | collin.winter | 2007-04-06 12:32:32 -0700 (Fri, 06 Apr 2007) | 1 line Import cleanup in test_crypt. ........ r54706 | collin.winter | 2007-04-06 13:00:05 -0700 (Fri, 06 Apr 2007) | 1 line Convert test_gc to use unittest. ........ r54707 | collin.winter | 2007-04-06 13:03:11 -0700 (Fri, 06 Apr 2007) | 1 line Convert test_module to use unittest. ........ r54711 | collin.winter | 2007-04-06 21:40:43 -0700 (Fri, 06 Apr 2007) | 1 line Convert test_fileinput to use unittest. ........ r54712 | brett.cannon | 2007-04-07 21:29:32 -0700 (Sat, 07 Apr 2007) | 5 lines Doc that file.next() has undefined behaviour when called on a file opened with 'w'. Closes bug #1569057. To be backported once 2.5 branch is unfrozen. ........ r54726 | vinay.sajip | 2007-04-09 09:16:10 -0700 (Mon, 09 Apr 2007) | 1 line Added optional timeout to SocketHandler.makeSocket (SF #1695948) ........ r54727 | ziga.seilnacht | 2007-04-09 12:10:29 -0700 (Mon, 09 Apr 2007) | 3 lines Patch #1695862: remove old test directory that causes test_urllib failures on Windows buildbots. The change is a one time fix and will be removed after a successful buildbot run. ........ r54729 | facundo.batista | 2007-04-09 20:00:37 -0700 (Mon, 09 Apr 2007) | 3 lines Minor fix to the tests pass ok even with -O. ........ r54730 | collin.winter | 2007-04-09 21:44:49 -0700 (Mon, 09 Apr 2007) | 1 line Typo fix. ........ r54732 | facundo.batista | 2007-04-10 05:58:45 -0700 (Tue, 10 Apr 2007) | 5 lines General clean-up. Lot of margin corrections, comments, some typos. Exceptions now are raised in the new style. And a mockup class is now also new style. Thanks Santiago Pereson. ........ r54741 | georg.brandl | 2007-04-10 14:39:38 -0700 (Tue, 10 Apr 2007) | 2 lines Repair a duplicate label and some obsolete uses of \setindexsubitem. ........ r54746 | andrew.kuchling | 2007-04-11 06:39:00 -0700 (Wed, 11 Apr 2007) | 1 line Add window.chgat() method, submitted via e-mail by Fabian Kreutz ........ r54747 | andrew.kuchling | 2007-04-11 06:42:25 -0700 (Wed, 11 Apr 2007) | 1 line Point readers at the patch submission instructions ........ r54748 | andrew.kuchling | 2007-04-11 06:47:13 -0700 (Wed, 11 Apr 2007) | 1 line Describe undocumented third argument to touchline() ........ r54757 | georg.brandl | 2007-04-11 10:16:24 -0700 (Wed, 11 Apr 2007) | 3 lines Add some missing NULL checks which trigger crashes on low-memory conditions. Found by Victor Stinner. Will backport when 2.5 branch is unfrozen. ........ r54760 | raymond.hettinger | 2007-04-11 11:40:58 -0700 (Wed, 11 Apr 2007) | 1 line SF 1191699: Make slices picklable ........ r54762 | georg.brandl | 2007-04-11 12:25:11 -0700 (Wed, 11 Apr 2007) | 2 lines Exceptions are no longer old-style instances. Fix accordingly. ........ r54763 | georg.brandl | 2007-04-11 16:28:44 -0700 (Wed, 11 Apr 2007) | 2 lines Repair missing spaces after \UNIX. ........ r54772 | raymond.hettinger | 2007-04-11 21:10:00 -0700 (Wed, 11 Apr 2007) | 1 line SF 1193128: Let str.translate(None) be an identity transformation ........ r54784 | georg.brandl | 2007-04-12 00:01:19 -0700 (Thu, 12 Apr 2007) | 2 lines Patch #1698951: clarify deprecation message in rexec and Bastion ........ r54785 | ziga.seilnacht | 2007-04-12 01:46:51 -0700 (Thu, 12 Apr 2007) | 2 lines Patch #1695862: remove the cleanup code, now that Windows buildbots are green again. ........ r54786 | walter.doerwald | 2007-04-12 03:35:00 -0700 (Thu, 12 Apr 2007) | 3 lines Fix utf-8-sig incremental decoder, which didn't recognise a BOM when the first chunk fed to the decoder started with a BOM, but was longer than 3 bytes. ........ r54807 | barry.warsaw | 2007-04-13 11:47:14 -0700 (Fri, 13 Apr 2007) | 8 lines Port r54805 from python25-maint branch: Add code to read from master_fd in the parent, breaking when we get an OSError (EIO can occur on Linux) or there's no more data to read. Without this, test_pty.py can hang on the waitpid() because the child is blocking on the stdout write. This will definitely happen on Mac OS X and could potentially happen on other platforms. See the comment for details. ........ r54812 | kristjan.jonsson | 2007-04-13 15:07:33 -0700 (Fri, 13 Apr 2007) | 1 line Fix a bug when using the __lltrace__ opcode tracer, and a problem sith signed chars in frameobject.c which can occur with opcodes > 127 ........ r54814 | kristjan.jonsson | 2007-04-13 15:20:13 -0700 (Fri, 13 Apr 2007) | 1 line Fix potential crash in path manipulation on windows ........ r54816 | trent.mick | 2007-04-13 16:22:05 -0700 (Fri, 13 Apr 2007) | 4 lines Add the necessary dependency for the Windows VC6 build to ensure 'pythoncore' is built before '_ctypes' is attempted. Will backport to 2.5 once it is unfrozen for 2.5.1. ........ r54825 | neal.norwitz | 2007-04-13 22:25:50 -0700 (Fri, 13 Apr 2007) | 3 lines When __slots__ are set to a unicode string, make it work the same as setting a plain string, ie don't expand to single letter identifiers. ........ r54841 | neal.norwitz | 2007-04-16 00:37:55 -0700 (Mon, 16 Apr 2007) | 1 line SF #1701207, Fix bogus assertion (and test it!) ........ r54844 | collin.winter | 2007-04-16 15:10:32 -0700 (Mon, 16 Apr 2007) | 1 line Check the availability of the urlfetch resource earlier than before. ........ r54849 | martin.v.loewis | 2007-04-16 22:02:01 -0700 (Mon, 16 Apr 2007) | 2 lines Add Travis Oliphant. ........ r54873 | brett.cannon | 2007-04-18 20:44:17 -0700 (Wed, 18 Apr 2007) | 2 lines Silence a compiler warning about incompatible pointer types. ........ r54874 | neal.norwitz | 2007-04-18 22:52:37 -0700 (Wed, 18 Apr 2007) | 2 lines SF #1703270, add missing declaration in readline.c to avoid compiler warning. ........ r54875 | armin.rigo | 2007-04-19 07:44:48 -0700 (Thu, 19 Apr 2007) | 8 lines Revert r53997 as per http://mail.python.org/pipermail/python-dev/2007-March/071796.html . I've kept a couple of still-valid extra tests in test_descr, but didn't bother to sort through the new comments and refactorings added in r53997 to see if some of them could be kept. If so, they could go in a follow-up check-in. ........ r54876 | armin.rigo | 2007-04-19 07:56:48 -0700 (Thu, 19 Apr 2007) | 2 lines Fix a usage of the dangerous pattern decref - modify field - incref. ........ r54884 | neal.norwitz | 2007-04-19 22:20:38 -0700 (Thu, 19 Apr 2007) | 9 lines Add an optional address to copy the failure mails to. Detect a conflict in the only file that should have outstanding changes when this script is run. This doesn't matter on the trunk, but does when run on a branch. Trunk always has the date set to today in boilerplate.tex. Each time a release is cut with a different date, a conflict occurs. (We could copy a known good version, but then we would lose changes to this file.) ........ r54918 | georg.brandl | 2007-04-21 13:35:38 -0700 (Sat, 21 Apr 2007) | 3 lines Bug #1704790: bind name "sys" locally in __del__ method so that it is not cleared before __del__ is run. ........ r54920 | facundo.batista | 2007-04-21 18:18:56 -0700 (Sat, 21 Apr 2007) | 5 lines Added tests for other methods of SSL object. Now we cover all the object methods. This is the final step to close the #451607 bug. ........ r54927 | facundo.batista | 2007-04-23 10:08:31 -0700 (Mon, 23 Apr 2007) | 5 lines As specified in RFC 2616, 2xx code indicates that the client's request was successfully received, understood, and accepted. Now in these cases no error is raised. Also fixed tests. ........ r54929 | collin.winter | 2007-04-23 20:43:46 -0700 (Mon, 23 Apr 2007) | 1 line Convert PyUnit -> unittest. ........ r54931 | collin.winter | 2007-04-23 21:09:52 -0700 (Mon, 23 Apr 2007) | 1 line Remove code that hasn't been called in years. ........ r54932 | neal.norwitz | 2007-04-23 21:53:12 -0700 (Mon, 23 Apr 2007) | 1 line Fix SF #1703110, Incorrect example for add_password() (use uri, not host) ........ r54934 | georg.brandl | 2007-04-24 03:36:42 -0700 (Tue, 24 Apr 2007) | 2 lines Some new year updates. ........ r54938 | facundo.batista | 2007-04-24 06:54:38 -0700 (Tue, 24 Apr 2007) | 4 lines Added a comment about last change in urllib2.py (all 2xx responses are ok now). ........ r54939 | georg.brandl | 2007-04-24 08:10:09 -0700 (Tue, 24 Apr 2007) | 2 lines Bug #1705717: error in sys.argv docs. ........ r54941 | georg.brandl | 2007-04-24 08:27:13 -0700 (Tue, 24 Apr 2007) | 4 lines Bug #1706381: Specifying the SWIG option "-c++" in the setup.py file (as opposed to the command line) will now write file names ending in ".cpp" too. ........ r54944 | raymond.hettinger | 2007-04-24 15:13:43 -0700 (Tue, 24 Apr 2007) | 1 line Fix markup ........ r54945 | kristjan.jonsson | 2007-04-24 17:10:50 -0700 (Tue, 24 Apr 2007) | 1 line Merge change 54909 from release25-maint: Fix several minor issues discovered using code analysis in VisualStudio 2005 Team Edition ........ r54947 | kristjan.jonsson | 2007-04-24 17:17:39 -0700 (Tue, 24 Apr 2007) | 1 line Make pythoncore compile cleanly with VisualStudio 2005. Used an explicit typecast to get a 64 bit integer, and undefined the Yield macro that conflicts with winbase.h ........ r54948 | kristjan.jonsson | 2007-04-24 17:19:26 -0700 (Tue, 24 Apr 2007) | 1 line Remove obsolete comment. Importing of .dll files has been discontinued, only .pyd files supported on windows now. ........ r54949 | georg.brandl | 2007-04-24 23:24:59 -0700 (Tue, 24 Apr 2007) | 2 lines Patch #1698768: updated the "using Python on the Mac" intro. ........ r54951 | georg.brandl | 2007-04-24 23:25:55 -0700 (Tue, 24 Apr 2007) | 2 lines Markup fix. ........ r54953 | neal.norwitz | 2007-04-24 23:30:05 -0700 (Tue, 24 Apr 2007) | 3 lines Whitespace normalization. Ugh, we really need to do this more often. You might want to review this change as it's my first time. Be gentle. :-) ........ r54956 | collin.winter | 2007-04-25 10:29:52 -0700 (Wed, 25 Apr 2007) | 1 line Standardize on test.test_support.run_unittest() (as opposed to a mix of run_unittest() and run_suite()). Also, add functionality to run_unittest() that admits usage of unittest.TestLoader.loadTestsFromModule(). ........ r54957 | collin.winter | 2007-04-25 10:37:35 -0700 (Wed, 25 Apr 2007) | 1 line Remove functionality from test_datetime.test_main() that does reference count checking; 'regrtest.py -R' is the way to do this kind of testing. ........ r54958 | collin.winter | 2007-04-25 10:57:53 -0700 (Wed, 25 Apr 2007) | 1 line Change test_support.have_unicode to use True/False instead of 1/0. ........ r54959 | tim.peters | 2007-04-25 11:47:18 -0700 (Wed, 25 Apr 2007) | 2 lines Whitespace normalization. ........ r54960 | tim.peters | 2007-04-25 11:48:35 -0700 (Wed, 25 Apr 2007) | 2 lines Set missing svn:eol-style property on text files. ........ r54961 | collin.winter | 2007-04-25 11:54:36 -0700 (Wed, 25 Apr 2007) | 1 line Import and raise statement cleanup. ........ r54969 | collin.winter | 2007-04-25 13:41:34 -0700 (Wed, 25 Apr 2007) | 1 line Convert test_ossaudiodev to use unittest. ........ r54974 | collin.winter | 2007-04-25 14:50:25 -0700 (Wed, 25 Apr 2007) | 1 line Fix an issue related to the unittest conversion. ........ r54979 | fred.drake | 2007-04-25 21:42:19 -0700 (Wed, 25 Apr 2007) | 1 line fix some markup errors ........ r54982 | kristjan.jonsson | 2007-04-26 02:15:08 -0700 (Thu, 26 Apr 2007) | 1 line Export function sanitize_the_mode from fileobject.c as _PyFile_SanitizeMode(). Use this function in posixmodule.c when implementing fdopen(). This fixes test_subprocess.py for a VisualStudio 2005 compile. ........ r54983 | kristjan.jonsson | 2007-04-26 06:44:16 -0700 (Thu, 26 Apr 2007) | 1 line The locale "En" appears not to be valid on windows underi VisualStudio.2005. Added "English" to the test_locale.py to make the testsuite pass for that build ........ r54984 | steve.holden | 2007-04-26 07:23:12 -0700 (Thu, 26 Apr 2007) | 1 line Minor wording change on slicing aide-memoire. ........ r54985 | kristjan.jonsson | 2007-04-26 08:24:54 -0700 (Thu, 26 Apr 2007) | 1 line Accomodate 64 bit time_t in the _bsddb module. ........
1762 lines
71 KiB
TeX
1762 lines
71 KiB
TeX
\section{\module{logging} ---
|
|
Logging facility for Python}
|
|
|
|
\declaremodule{standard}{logging}
|
|
|
|
% These apply to all modules, and may be given more than once:
|
|
|
|
\moduleauthor{Vinay Sajip}{vinay_sajip@red-dove.com}
|
|
\sectionauthor{Vinay Sajip}{vinay_sajip@red-dove.com}
|
|
|
|
\modulesynopsis{Logging module for Python based on \pep{282}.}
|
|
|
|
\indexii{Errors}{logging}
|
|
|
|
\versionadded{2.3}
|
|
This module defines functions and classes which implement a flexible
|
|
error logging system for applications.
|
|
|
|
Logging is performed by calling methods on instances of the
|
|
\class{Logger} class (hereafter called \dfn{loggers}). Each instance has a
|
|
name, and they are conceptually arranged in a name space hierarchy
|
|
using dots (periods) as separators. For example, a logger named
|
|
"scan" is the parent of loggers "scan.text", "scan.html" and "scan.pdf".
|
|
Logger names can be anything you want, and indicate the area of an
|
|
application in which a logged message originates.
|
|
|
|
Logged messages also have levels of importance associated with them.
|
|
The default levels provided are \constant{DEBUG}, \constant{INFO},
|
|
\constant{WARNING}, \constant{ERROR} and \constant{CRITICAL}. As a
|
|
convenience, you indicate the importance of a logged message by calling
|
|
an appropriate method of \class{Logger}. The methods are
|
|
\method{debug()}, \method{info()}, \method{warning()}, \method{error()} and
|
|
\method{critical()}, which mirror the default levels. You are not
|
|
constrained to use these levels: you can specify your own and use a
|
|
more general \class{Logger} method, \method{log()}, which takes an
|
|
explicit level argument.
|
|
|
|
The numeric values of logging levels are given in the following table. These
|
|
are primarily of interest if you want to define your own levels, and need
|
|
them to have specific values relative to the predefined levels. If you
|
|
define a level with the same numeric value, it overwrites the predefined
|
|
value; the predefined name is lost.
|
|
|
|
\begin{tableii}{l|l}{code}{Level}{Numeric value}
|
|
\lineii{CRITICAL}{50}
|
|
\lineii{ERROR}{40}
|
|
\lineii{WARNING}{30}
|
|
\lineii{INFO}{20}
|
|
\lineii{DEBUG}{10}
|
|
\lineii{NOTSET}{0}
|
|
\end{tableii}
|
|
|
|
Levels can also be associated with loggers, being set either by the
|
|
developer or through loading a saved logging configuration. When a
|
|
logging method is called on a logger, the logger compares its own
|
|
level with the level associated with the method call. If the logger's
|
|
level is higher than the method call's, no logging message is actually
|
|
generated. This is the basic mechanism controlling the verbosity of
|
|
logging output.
|
|
|
|
Logging messages are encoded as instances of the \class{LogRecord} class.
|
|
When a logger decides to actually log an event, a \class{LogRecord}
|
|
instance is created from the logging message.
|
|
|
|
Logging messages are subjected to a dispatch mechanism through the
|
|
use of \dfn{handlers}, which are instances of subclasses of the
|
|
\class{Handler} class. Handlers are responsible for ensuring that a logged
|
|
message (in the form of a \class{LogRecord}) ends up in a particular
|
|
location (or set of locations) which is useful for the target audience for
|
|
that message (such as end users, support desk staff, system administrators,
|
|
developers). Handlers are passed \class{LogRecord} instances intended for
|
|
particular destinations. Each logger can have zero, one or more handlers
|
|
associated with it (via the \method{addHandler()} method of \class{Logger}).
|
|
In addition to any handlers directly associated with a logger,
|
|
\emph{all handlers associated with all ancestors of the logger} are
|
|
called to dispatch the message.
|
|
|
|
Just as for loggers, handlers can have levels associated with them.
|
|
A handler's level acts as a filter in the same way as a logger's level does.
|
|
If a handler decides to actually dispatch an event, the \method{emit()} method
|
|
is used to send the message to its destination. Most user-defined subclasses
|
|
of \class{Handler} will need to override this \method{emit()}.
|
|
|
|
In addition to the base \class{Handler} class, many useful subclasses
|
|
are provided:
|
|
|
|
\begin{enumerate}
|
|
|
|
\item \class{StreamHandler} instances send error messages to
|
|
streams (file-like objects).
|
|
|
|
\item \class{FileHandler} instances send error messages to disk
|
|
files.
|
|
|
|
\item \class{BaseRotatingHandler} is the base class for handlers that
|
|
rotate log files at a certain point. It is not meant to be instantiated
|
|
directly. Instead, use \class{RotatingFileHandler} or
|
|
\class{TimedRotatingFileHandler}.
|
|
|
|
\item \class{RotatingFileHandler} instances send error messages to disk
|
|
files, with support for maximum log file sizes and log file rotation.
|
|
|
|
\item \class{TimedRotatingFileHandler} instances send error messages to
|
|
disk files rotating the log file at certain timed intervals.
|
|
|
|
\item \class{SocketHandler} instances send error messages to
|
|
TCP/IP sockets.
|
|
|
|
\item \class{DatagramHandler} instances send error messages to UDP
|
|
sockets.
|
|
|
|
\item \class{SMTPHandler} instances send error messages to a
|
|
designated email address.
|
|
|
|
\item \class{SysLogHandler} instances send error messages to a
|
|
\UNIX{} syslog daemon, possibly on a remote machine.
|
|
|
|
\item \class{NTEventLogHandler} instances send error messages to a
|
|
Windows NT/2000/XP event log.
|
|
|
|
\item \class{MemoryHandler} instances send error messages to a
|
|
buffer in memory, which is flushed whenever specific criteria are
|
|
met.
|
|
|
|
\item \class{HTTPHandler} instances send error messages to an
|
|
HTTP server using either \samp{GET} or \samp{POST} semantics.
|
|
|
|
\end{enumerate}
|
|
|
|
The \class{StreamHandler} and \class{FileHandler} classes are defined
|
|
in the core logging package. The other handlers are defined in a sub-
|
|
module, \module{logging.handlers}. (There is also another sub-module,
|
|
\module{logging.config}, for configuration functionality.)
|
|
|
|
Logged messages are formatted for presentation through instances of the
|
|
\class{Formatter} class. They are initialized with a format string
|
|
suitable for use with the \% operator and a dictionary.
|
|
|
|
For formatting multiple messages in a batch, instances of
|
|
\class{BufferingFormatter} can be used. In addition to the format string
|
|
(which is applied to each message in the batch), there is provision for
|
|
header and trailer format strings.
|
|
|
|
When filtering based on logger level and/or handler level is not enough,
|
|
instances of \class{Filter} can be added to both \class{Logger} and
|
|
\class{Handler} instances (through their \method{addFilter()} method).
|
|
Before deciding to process a message further, both loggers and handlers
|
|
consult all their filters for permission. If any filter returns a false
|
|
value, the message is not processed further.
|
|
|
|
The basic \class{Filter} functionality allows filtering by specific logger
|
|
name. If this feature is used, messages sent to the named logger and its
|
|
children are allowed through the filter, and all others dropped.
|
|
|
|
In addition to the classes described above, there are a number of module-
|
|
level functions.
|
|
|
|
\begin{funcdesc}{getLogger}{\optional{name}}
|
|
Return a logger with the specified name or, if no name is specified, return
|
|
a logger which is the root logger of the hierarchy. If specified, the name
|
|
is typically a dot-separated hierarchical name like \var{"a"}, \var{"a.b"}
|
|
or \var{"a.b.c.d"}. Choice of these names is entirely up to the developer
|
|
who is using logging.
|
|
|
|
All calls to this function with a given name return the same logger instance.
|
|
This means that logger instances never need to be passed between different
|
|
parts of an application.
|
|
\end{funcdesc}
|
|
|
|
\begin{funcdesc}{getLoggerClass}{}
|
|
Return either the standard \class{Logger} class, or the last class passed to
|
|
\function{setLoggerClass()}. This function may be called from within a new
|
|
class definition, to ensure that installing a customised \class{Logger} class
|
|
will not undo customisations already applied by other code. For example:
|
|
|
|
\begin{verbatim}
|
|
class MyLogger(logging.getLoggerClass()):
|
|
# ... override behaviour here
|
|
\end{verbatim}
|
|
|
|
\end{funcdesc}
|
|
|
|
\begin{funcdesc}{debug}{msg\optional{, *args\optional{, **kwargs}}}
|
|
Logs a message with level \constant{DEBUG} on the root logger.
|
|
The \var{msg} is the message format string, and the \var{args} are the
|
|
arguments which are merged into \var{msg} using the string formatting
|
|
operator. (Note that this means that you can use keywords in the
|
|
format string, together with a single dictionary argument.)
|
|
|
|
There are two keyword arguments in \var{kwargs} which are inspected:
|
|
\var{exc_info} which, if it does not evaluate as false, causes exception
|
|
information to be added to the logging message. If an exception tuple (in the
|
|
format returned by \function{sys.exc_info()}) is provided, it is used;
|
|
otherwise, \function{sys.exc_info()} is called to get the exception
|
|
information.
|
|
|
|
The other optional keyword argument is \var{extra} which can be used to pass
|
|
a dictionary which is used to populate the __dict__ of the LogRecord created
|
|
for the logging event with user-defined attributes. These custom attributes
|
|
can then be used as you like. For example, they could be incorporated into
|
|
logged messages. For example:
|
|
|
|
\begin{verbatim}
|
|
FORMAT = "%(asctime)-15s %(clientip)s %(user)-8s %(message)s"
|
|
logging.basicConfig(format=FORMAT)
|
|
dict = { 'clientip' : '192.168.0.1', 'user' : 'fbloggs' }
|
|
logging.warning("Protocol problem: %s", "connection reset", extra=d)
|
|
\end{verbatim}
|
|
|
|
would print something like
|
|
\begin{verbatim}
|
|
2006-02-08 22:20:02,165 192.168.0.1 fbloggs Protocol problem: connection reset
|
|
\end{verbatim}
|
|
|
|
The keys in the dictionary passed in \var{extra} should not clash with the keys
|
|
used by the logging system. (See the \class{Formatter} documentation for more
|
|
information on which keys are used by the logging system.)
|
|
|
|
If you choose to use these attributes in logged messages, you need to exercise
|
|
some care. In the above example, for instance, the \class{Formatter} has been
|
|
set up with a format string which expects 'clientip' and 'user' in the
|
|
attribute dictionary of the LogRecord. If these are missing, the message will
|
|
not be logged because a string formatting exception will occur. So in this
|
|
case, you always need to pass the \var{extra} dictionary with these keys.
|
|
|
|
While this might be annoying, this feature is intended for use in specialized
|
|
circumstances, such as multi-threaded servers where the same code executes
|
|
in many contexts, and interesting conditions which arise are dependent on this
|
|
context (such as remote client IP address and authenticated user name, in the
|
|
above example). In such circumstances, it is likely that specialized
|
|
\class{Formatter}s would be used with particular \class{Handler}s.
|
|
|
|
\versionchanged[\var{extra} was added]{2.5}
|
|
|
|
\end{funcdesc}
|
|
|
|
\begin{funcdesc}{info}{msg\optional{, *args\optional{, **kwargs}}}
|
|
Logs a message with level \constant{INFO} on the root logger.
|
|
The arguments are interpreted as for \function{debug()}.
|
|
\end{funcdesc}
|
|
|
|
\begin{funcdesc}{warning}{msg\optional{, *args\optional{, **kwargs}}}
|
|
Logs a message with level \constant{WARNING} on the root logger.
|
|
The arguments are interpreted as for \function{debug()}.
|
|
\end{funcdesc}
|
|
|
|
\begin{funcdesc}{error}{msg\optional{, *args\optional{, **kwargs}}}
|
|
Logs a message with level \constant{ERROR} on the root logger.
|
|
The arguments are interpreted as for \function{debug()}.
|
|
\end{funcdesc}
|
|
|
|
\begin{funcdesc}{critical}{msg\optional{, *args\optional{, **kwargs}}}
|
|
Logs a message with level \constant{CRITICAL} on the root logger.
|
|
The arguments are interpreted as for \function{debug()}.
|
|
\end{funcdesc}
|
|
|
|
\begin{funcdesc}{exception}{msg\optional{, *args}}
|
|
Logs a message with level \constant{ERROR} on the root logger.
|
|
The arguments are interpreted as for \function{debug()}. Exception info
|
|
is added to the logging message. This function should only be called
|
|
from an exception handler.
|
|
\end{funcdesc}
|
|
|
|
\begin{funcdesc}{log}{level, msg\optional{, *args\optional{, **kwargs}}}
|
|
Logs a message with level \var{level} on the root logger.
|
|
The other arguments are interpreted as for \function{debug()}.
|
|
\end{funcdesc}
|
|
|
|
\begin{funcdesc}{disable}{lvl}
|
|
Provides an overriding level \var{lvl} for all loggers which takes
|
|
precedence over the logger's own level. When the need arises to
|
|
temporarily throttle logging output down across the whole application,
|
|
this function can be useful.
|
|
\end{funcdesc}
|
|
|
|
\begin{funcdesc}{addLevelName}{lvl, levelName}
|
|
Associates level \var{lvl} with text \var{levelName} in an internal
|
|
dictionary, which is used to map numeric levels to a textual
|
|
representation, for example when a \class{Formatter} formats a message.
|
|
This function can also be used to define your own levels. The only
|
|
constraints are that all levels used must be registered using this
|
|
function, levels should be positive integers and they should increase
|
|
in increasing order of severity.
|
|
\end{funcdesc}
|
|
|
|
\begin{funcdesc}{getLevelName}{lvl}
|
|
Returns the textual representation of logging level \var{lvl}. If the
|
|
level is one of the predefined levels \constant{CRITICAL},
|
|
\constant{ERROR}, \constant{WARNING}, \constant{INFO} or \constant{DEBUG}
|
|
then you get the corresponding string. If you have associated levels
|
|
with names using \function{addLevelName()} then the name you have associated
|
|
with \var{lvl} is returned. If a numeric value corresponding to one of the
|
|
defined levels is passed in, the corresponding string representation is
|
|
returned. Otherwise, the string "Level \%s" \% lvl is returned.
|
|
\end{funcdesc}
|
|
|
|
\begin{funcdesc}{makeLogRecord}{attrdict}
|
|
Creates and returns a new \class{LogRecord} instance whose attributes are
|
|
defined by \var{attrdict}. This function is useful for taking a pickled
|
|
\class{LogRecord} attribute dictionary, sent over a socket, and reconstituting
|
|
it as a \class{LogRecord} instance at the receiving end.
|
|
\end{funcdesc}
|
|
|
|
\begin{funcdesc}{basicConfig}{\optional{**kwargs}}
|
|
Does basic configuration for the logging system by creating a
|
|
\class{StreamHandler} with a default \class{Formatter} and adding it to
|
|
the root logger. The functions \function{debug()}, \function{info()},
|
|
\function{warning()}, \function{error()} and \function{critical()} will call
|
|
\function{basicConfig()} automatically if no handlers are defined for the
|
|
root logger.
|
|
|
|
\versionchanged[Formerly, \function{basicConfig} did not take any keyword
|
|
arguments]{2.4}
|
|
|
|
The following keyword arguments are supported.
|
|
|
|
\begin{tableii}{l|l}{code}{Format}{Description}
|
|
\lineii{filename}{Specifies that a FileHandler be created, using the
|
|
specified filename, rather than a StreamHandler.}
|
|
\lineii{filemode}{Specifies the mode to open the file, if filename is
|
|
specified (if filemode is unspecified, it defaults to 'a').}
|
|
\lineii{format}{Use the specified format string for the handler.}
|
|
\lineii{datefmt}{Use the specified date/time format.}
|
|
\lineii{level}{Set the root logger level to the specified level.}
|
|
\lineii{stream}{Use the specified stream to initialize the StreamHandler.
|
|
Note that this argument is incompatible with 'filename' - if both
|
|
are present, 'stream' is ignored.}
|
|
\end{tableii}
|
|
|
|
\end{funcdesc}
|
|
|
|
\begin{funcdesc}{shutdown}{}
|
|
Informs the logging system to perform an orderly shutdown by flushing and
|
|
closing all handlers.
|
|
\end{funcdesc}
|
|
|
|
\begin{funcdesc}{setLoggerClass}{klass}
|
|
Tells the logging system to use the class \var{klass} when instantiating a
|
|
logger. The class should define \method{__init__()} such that only a name
|
|
argument is required, and the \method{__init__()} should call
|
|
\method{Logger.__init__()}. This function is typically called before any
|
|
loggers are instantiated by applications which need to use custom logger
|
|
behavior.
|
|
\end{funcdesc}
|
|
|
|
|
|
\begin{seealso}
|
|
\seepep{282}{A Logging System}
|
|
{The proposal which described this feature for inclusion in
|
|
the Python standard library.}
|
|
\seelink{http://www.red-dove.com/python_logging.html}
|
|
{Original Python \module{logging} package}
|
|
{This is the original source for the \module{logging}
|
|
package. The version of the package available from this
|
|
site is suitable for use with Python 1.5.2, 2.1.x and 2.2.x,
|
|
which do not include the \module{logging} package in the standard
|
|
library.}
|
|
\end{seealso}
|
|
|
|
|
|
\subsection{Logger Objects}
|
|
|
|
Loggers have the following attributes and methods. Note that Loggers are
|
|
never instantiated directly, but always through the module-level function
|
|
\function{logging.getLogger(name)}.
|
|
|
|
\begin{memberdesc}[Logger]{propagate}
|
|
If this evaluates to false, logging messages are not passed by this
|
|
logger or by child loggers to higher level (ancestor) loggers. The
|
|
constructor sets this attribute to 1.
|
|
\end{memberdesc}
|
|
|
|
\begin{methoddesc}[Logger]{setLevel}{lvl}
|
|
Sets the threshold for this logger to \var{lvl}. Logging messages
|
|
which are less severe than \var{lvl} will be ignored. When a logger is
|
|
created, the level is set to \constant{NOTSET} (which causes all messages
|
|
to be processed when the logger is the root logger, or delegation to the
|
|
parent when the logger is a non-root logger). Note that the root logger
|
|
is created with level \constant{WARNING}.
|
|
|
|
The term "delegation to the parent" means that if a logger has a level
|
|
of NOTSET, its chain of ancestor loggers is traversed until either an
|
|
ancestor with a level other than NOTSET is found, or the root is
|
|
reached.
|
|
|
|
If an ancestor is found with a level other than NOTSET, then that
|
|
ancestor's level is treated as the effective level of the logger where
|
|
the ancestor search began, and is used to determine how a logging
|
|
event is handled.
|
|
|
|
If the root is reached, and it has a level of NOTSET, then all
|
|
messages will be processed. Otherwise, the root's level will be used
|
|
as the effective level.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}[Logger]{isEnabledFor}{lvl}
|
|
Indicates if a message of severity \var{lvl} would be processed by
|
|
this logger. This method checks first the module-level level set by
|
|
\function{logging.disable(lvl)} and then the logger's effective level as
|
|
determined by \method{getEffectiveLevel()}.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}[Logger]{getEffectiveLevel}{}
|
|
Indicates the effective level for this logger. If a value other than
|
|
\constant{NOTSET} has been set using \method{setLevel()}, it is returned.
|
|
Otherwise, the hierarchy is traversed towards the root until a value
|
|
other than \constant{NOTSET} is found, and that value is returned.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}[Logger]{debug}{msg\optional{, *args\optional{, **kwargs}}}
|
|
Logs a message with level \constant{DEBUG} on this logger.
|
|
The \var{msg} is the message format string, and the \var{args} are the
|
|
arguments which are merged into \var{msg} using the string formatting
|
|
operator. (Note that this means that you can use keywords in the
|
|
format string, together with a single dictionary argument.)
|
|
|
|
There are two keyword arguments in \var{kwargs} which are inspected:
|
|
\var{exc_info} which, if it does not evaluate as false, causes exception
|
|
information to be added to the logging message. If an exception tuple (in the
|
|
format returned by \function{sys.exc_info()}) is provided, it is used;
|
|
otherwise, \function{sys.exc_info()} is called to get the exception
|
|
information.
|
|
|
|
The other optional keyword argument is \var{extra} which can be used to pass
|
|
a dictionary which is used to populate the __dict__ of the LogRecord created
|
|
for the logging event with user-defined attributes. These custom attributes
|
|
can then be used as you like. For example, they could be incorporated into
|
|
logged messages. For example:
|
|
|
|
\begin{verbatim}
|
|
FORMAT = "%(asctime)-15s %(clientip)s %(user)-8s %(message)s"
|
|
logging.basicConfig(format=FORMAT)
|
|
dict = { 'clientip' : '192.168.0.1', 'user' : 'fbloggs' }
|
|
logger = logging.getLogger("tcpserver")
|
|
logger.warning("Protocol problem: %s", "connection reset", extra=d)
|
|
\end{verbatim}
|
|
|
|
would print something like
|
|
\begin{verbatim}
|
|
2006-02-08 22:20:02,165 192.168.0.1 fbloggs Protocol problem: connection reset
|
|
\end{verbatim}
|
|
|
|
The keys in the dictionary passed in \var{extra} should not clash with the keys
|
|
used by the logging system. (See the \class{Formatter} documentation for more
|
|
information on which keys are used by the logging system.)
|
|
|
|
If you choose to use these attributes in logged messages, you need to exercise
|
|
some care. In the above example, for instance, the \class{Formatter} has been
|
|
set up with a format string which expects 'clientip' and 'user' in the
|
|
attribute dictionary of the LogRecord. If these are missing, the message will
|
|
not be logged because a string formatting exception will occur. So in this
|
|
case, you always need to pass the \var{extra} dictionary with these keys.
|
|
|
|
While this might be annoying, this feature is intended for use in specialized
|
|
circumstances, such as multi-threaded servers where the same code executes
|
|
in many contexts, and interesting conditions which arise are dependent on this
|
|
context (such as remote client IP address and authenticated user name, in the
|
|
above example). In such circumstances, it is likely that specialized
|
|
\class{Formatter}s would be used with particular \class{Handler}s.
|
|
|
|
\versionchanged[\var{extra} was added]{2.5}
|
|
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}[Logger]{info}{msg\optional{, *args\optional{, **kwargs}}}
|
|
Logs a message with level \constant{INFO} on this logger.
|
|
The arguments are interpreted as for \method{debug()}.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}[Logger]{warning}{msg\optional{, *args\optional{, **kwargs}}}
|
|
Logs a message with level \constant{WARNING} on this logger.
|
|
The arguments are interpreted as for \method{debug()}.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}[Logger]{error}{msg\optional{, *args\optional{, **kwargs}}}
|
|
Logs a message with level \constant{ERROR} on this logger.
|
|
The arguments are interpreted as for \method{debug()}.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}[Logger]{critical}{msg\optional{, *args\optional{, **kwargs}}}
|
|
Logs a message with level \constant{CRITICAL} on this logger.
|
|
The arguments are interpreted as for \method{debug()}.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}[Logger]{log}{lvl, msg\optional{, *args\optional{, **kwargs}}}
|
|
Logs a message with integer level \var{lvl} on this logger.
|
|
The other arguments are interpreted as for \method{debug()}.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}[Logger]{exception}{msg\optional{, *args}}
|
|
Logs a message with level \constant{ERROR} on this logger.
|
|
The arguments are interpreted as for \method{debug()}. Exception info
|
|
is added to the logging message. This method should only be called
|
|
from an exception handler.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}[Logger]{addFilter}{filt}
|
|
Adds the specified filter \var{filt} to this logger.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}[Logger]{removeFilter}{filt}
|
|
Removes the specified filter \var{filt} from this logger.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}[Logger]{filter}{record}
|
|
Applies this logger's filters to the record and returns a true value if
|
|
the record is to be processed.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}[Logger]{addHandler}{hdlr}
|
|
Adds the specified handler \var{hdlr} to this logger.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}[Logger]{removeHandler}{hdlr}
|
|
Removes the specified handler \var{hdlr} from this logger.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}[Logger]{findCaller}{}
|
|
Finds the caller's source filename and line number. Returns the filename,
|
|
line number and function name as a 3-element tuple.
|
|
\versionchanged[The function name was added. In earlier versions, the
|
|
filename and line number were returned as a 2-element tuple.]{2.5}
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}[Logger]{handle}{record}
|
|
Handles a record by passing it to all handlers associated with this logger
|
|
and its ancestors (until a false value of \var{propagate} is found).
|
|
This method is used for unpickled records received from a socket, as well
|
|
as those created locally. Logger-level filtering is applied using
|
|
\method{filter()}.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}[Logger]{makeRecord}{name, lvl, fn, lno, msg, args, exc_info
|
|
\optional{, func, extra}}
|
|
This is a factory method which can be overridden in subclasses to create
|
|
specialized \class{LogRecord} instances.
|
|
\versionchanged[\var{func} and \var{extra} were added]{2.5}
|
|
\end{methoddesc}
|
|
|
|
\subsection{Basic example \label{minimal-example}}
|
|
|
|
\versionchanged[formerly \function{basicConfig} did not take any keyword
|
|
arguments]{2.4}
|
|
|
|
The \module{logging} package provides a lot of flexibility, and its
|
|
configuration can appear daunting. This section demonstrates that simple
|
|
use of the logging package is possible.
|
|
|
|
The simplest example shows logging to the console:
|
|
|
|
\begin{verbatim}
|
|
import logging
|
|
|
|
logging.debug('A debug message')
|
|
logging.info('Some information')
|
|
logging.warning('A shot across the bows')
|
|
\end{verbatim}
|
|
|
|
If you run the above script, you'll see this:
|
|
\begin{verbatim}
|
|
WARNING:root:A shot across the bows
|
|
\end{verbatim}
|
|
|
|
Because no particular logger was specified, the system used the root logger.
|
|
The debug and info messages didn't appear because by default, the root
|
|
logger is configured to only handle messages with a severity of WARNING
|
|
or above. The message format is also a configuration default, as is the output
|
|
destination of the messages - \code{sys.stderr}. The severity level,
|
|
the message format and destination can be easily changed, as shown in
|
|
the example below:
|
|
|
|
\begin{verbatim}
|
|
import logging
|
|
|
|
logging.basicConfig(level=logging.DEBUG,
|
|
format='%(asctime)s %(levelname)s %(message)s',
|
|
filename='/tmp/myapp.log',
|
|
filemode='w')
|
|
logging.debug('A debug message')
|
|
logging.info('Some information')
|
|
logging.warning('A shot across the bows')
|
|
\end{verbatim}
|
|
|
|
The \method{basicConfig()} method is used to change the configuration
|
|
defaults, which results in output (written to \code{/tmp/myapp.log})
|
|
which should look something like the following:
|
|
|
|
\begin{verbatim}
|
|
2004-07-02 13:00:08,743 DEBUG A debug message
|
|
2004-07-02 13:00:08,743 INFO Some information
|
|
2004-07-02 13:00:08,743 WARNING A shot across the bows
|
|
\end{verbatim}
|
|
|
|
This time, all messages with a severity of DEBUG or above were handled,
|
|
and the format of the messages was also changed, and output went to the
|
|
specified file rather than the console.
|
|
|
|
Formatting uses standard Python string formatting - see section
|
|
\ref{typesseq-strings}. The format string takes the following
|
|
common specifiers. For a complete list of specifiers, consult the
|
|
\class{Formatter} documentation.
|
|
|
|
\begin{tableii}{l|l}{code}{Format}{Description}
|
|
\lineii{\%(name)s} {Name of the logger (logging channel).}
|
|
\lineii{\%(levelname)s}{Text logging level for the message
|
|
(\code{'DEBUG'}, \code{'INFO'},
|
|
\code{'WARNING'}, \code{'ERROR'},
|
|
\code{'CRITICAL'}).}
|
|
\lineii{\%(asctime)s} {Human-readable time when the \class{LogRecord}
|
|
was created. By default this is of the form
|
|
``2003-07-08 16:49:45,896'' (the numbers after the
|
|
comma are millisecond portion of the time).}
|
|
\lineii{\%(message)s} {The logged message.}
|
|
\end{tableii}
|
|
|
|
To change the date/time format, you can pass an additional keyword parameter,
|
|
\var{datefmt}, as in the following:
|
|
|
|
\begin{verbatim}
|
|
import logging
|
|
|
|
logging.basicConfig(level=logging.DEBUG,
|
|
format='%(asctime)s %(levelname)-8s %(message)s',
|
|
datefmt='%a, %d %b %Y %H:%M:%S',
|
|
filename='/temp/myapp.log',
|
|
filemode='w')
|
|
logging.debug('A debug message')
|
|
logging.info('Some information')
|
|
logging.warning('A shot across the bows')
|
|
\end{verbatim}
|
|
|
|
which would result in output like
|
|
|
|
\begin{verbatim}
|
|
Fri, 02 Jul 2004 13:06:18 DEBUG A debug message
|
|
Fri, 02 Jul 2004 13:06:18 INFO Some information
|
|
Fri, 02 Jul 2004 13:06:18 WARNING A shot across the bows
|
|
\end{verbatim}
|
|
|
|
The date format string follows the requirements of \function{strftime()} -
|
|
see the documentation for the \refmodule{time} module.
|
|
|
|
If, instead of sending logging output to the console or a file, you'd rather
|
|
use a file-like object which you have created separately, you can pass it
|
|
to \function{basicConfig()} using the \var{stream} keyword argument. Note
|
|
that if both \var{stream} and \var{filename} keyword arguments are passed,
|
|
the \var{stream} argument is ignored.
|
|
|
|
Of course, you can put variable information in your output. To do this,
|
|
simply have the message be a format string and pass in additional arguments
|
|
containing the variable information, as in the following example:
|
|
|
|
\begin{verbatim}
|
|
import logging
|
|
|
|
logging.basicConfig(level=logging.DEBUG,
|
|
format='%(asctime)s %(levelname)-8s %(message)s',
|
|
datefmt='%a, %d %b %Y %H:%M:%S',
|
|
filename='/temp/myapp.log',
|
|
filemode='w')
|
|
logging.error('Pack my box with %d dozen %s', 5, 'liquor jugs')
|
|
\end{verbatim}
|
|
|
|
which would result in
|
|
|
|
\begin{verbatim}
|
|
Wed, 21 Jul 2004 15:35:16 ERROR Pack my box with 5 dozen liquor jugs
|
|
\end{verbatim}
|
|
|
|
\subsection{Logging to multiple destinations \label{multiple-destinations}}
|
|
|
|
Let's say you want to log to console and file with different message formats
|
|
and in differing circumstances. Say you want to log messages with levels
|
|
of DEBUG and higher to file, and those messages at level INFO and higher to
|
|
the console. Let's also assume that the file should contain timestamps, but
|
|
the console messages should not. Here's how you can achieve this:
|
|
|
|
\begin{verbatim}
|
|
import logging
|
|
|
|
# set up logging to file - see previous section for more details
|
|
logging.basicConfig(level=logging.DEBUG,
|
|
format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
|
|
datefmt='%m-%d %H:%M',
|
|
filename='/temp/myapp.log',
|
|
filemode='w')
|
|
# define a Handler which writes INFO messages or higher to the sys.stderr
|
|
console = logging.StreamHandler()
|
|
console.setLevel(logging.INFO)
|
|
# set a format which is simpler for console use
|
|
formatter = logging.Formatter('%(name)-12s: %(levelname)-8s %(message)s')
|
|
# tell the handler to use this format
|
|
console.setFormatter(formatter)
|
|
# add the handler to the root logger
|
|
logging.getLogger('').addHandler(console)
|
|
|
|
# Now, we can log to the root logger, or any other logger. First the root...
|
|
logging.info('Jackdaws love my big sphinx of quartz.')
|
|
|
|
# Now, define a couple of other loggers which might represent areas in your
|
|
# application:
|
|
|
|
logger1 = logging.getLogger('myapp.area1')
|
|
logger2 = logging.getLogger('myapp.area2')
|
|
|
|
logger1.debug('Quick zephyrs blow, vexing daft Jim.')
|
|
logger1.info('How quickly daft jumping zebras vex.')
|
|
logger2.warning('Jail zesty vixen who grabbed pay from quack.')
|
|
logger2.error('The five boxing wizards jump quickly.')
|
|
\end{verbatim}
|
|
|
|
When you run this, on the console you will see
|
|
|
|
\begin{verbatim}
|
|
root : INFO Jackdaws love my big sphinx of quartz.
|
|
myapp.area1 : INFO How quickly daft jumping zebras vex.
|
|
myapp.area2 : WARNING Jail zesty vixen who grabbed pay from quack.
|
|
myapp.area2 : ERROR The five boxing wizards jump quickly.
|
|
\end{verbatim}
|
|
|
|
and in the file you will see something like
|
|
|
|
\begin{verbatim}
|
|
10-22 22:19 root INFO Jackdaws love my big sphinx of quartz.
|
|
10-22 22:19 myapp.area1 DEBUG Quick zephyrs blow, vexing daft Jim.
|
|
10-22 22:19 myapp.area1 INFO How quickly daft jumping zebras vex.
|
|
10-22 22:19 myapp.area2 WARNING Jail zesty vixen who grabbed pay from quack.
|
|
10-22 22:19 myapp.area2 ERROR The five boxing wizards jump quickly.
|
|
\end{verbatim}
|
|
|
|
As you can see, the DEBUG message only shows up in the file. The other
|
|
messages are sent to both destinations.
|
|
|
|
This example uses console and file handlers, but you can use any number and
|
|
combination of handlers you choose.
|
|
|
|
\subsection{Sending and receiving logging events across a network
|
|
\label{network-logging}}
|
|
|
|
Let's say you want to send logging events across a network, and handle them
|
|
at the receiving end. A simple way of doing this is attaching a
|
|
\class{SocketHandler} instance to the root logger at the sending end:
|
|
|
|
\begin{verbatim}
|
|
import logging, logging.handlers
|
|
|
|
rootLogger = logging.getLogger('')
|
|
rootLogger.setLevel(logging.DEBUG)
|
|
socketHandler = logging.handlers.SocketHandler('localhost',
|
|
logging.handlers.DEFAULT_TCP_LOGGING_PORT)
|
|
# don't bother with a formatter, since a socket handler sends the event as
|
|
# an unformatted pickle
|
|
rootLogger.addHandler(socketHandler)
|
|
|
|
# Now, we can log to the root logger, or any other logger. First the root...
|
|
logging.info('Jackdaws love my big sphinx of quartz.')
|
|
|
|
# Now, define a couple of other loggers which might represent areas in your
|
|
# application:
|
|
|
|
logger1 = logging.getLogger('myapp.area1')
|
|
logger2 = logging.getLogger('myapp.area2')
|
|
|
|
logger1.debug('Quick zephyrs blow, vexing daft Jim.')
|
|
logger1.info('How quickly daft jumping zebras vex.')
|
|
logger2.warning('Jail zesty vixen who grabbed pay from quack.')
|
|
logger2.error('The five boxing wizards jump quickly.')
|
|
\end{verbatim}
|
|
|
|
At the receiving end, you can set up a receiver using the
|
|
\module{SocketServer} module. Here is a basic working example:
|
|
|
|
\begin{verbatim}
|
|
import cPickle
|
|
import logging
|
|
import logging.handlers
|
|
import SocketServer
|
|
import struct
|
|
|
|
|
|
class LogRecordStreamHandler(SocketServer.StreamRequestHandler):
|
|
"""Handler for a streaming logging request.
|
|
|
|
This basically logs the record using whatever logging policy is
|
|
configured locally.
|
|
"""
|
|
|
|
def handle(self):
|
|
"""
|
|
Handle multiple requests - each expected to be a 4-byte length,
|
|
followed by the LogRecord in pickle format. Logs the record
|
|
according to whatever policy is configured locally.
|
|
"""
|
|
while 1:
|
|
chunk = self.connection.recv(4)
|
|
if len(chunk) < 4:
|
|
break
|
|
slen = struct.unpack(">L", chunk)[0]
|
|
chunk = self.connection.recv(slen)
|
|
while len(chunk) < slen:
|
|
chunk = chunk + self.connection.recv(slen - len(chunk))
|
|
obj = self.unPickle(chunk)
|
|
record = logging.makeLogRecord(obj)
|
|
self.handleLogRecord(record)
|
|
|
|
def unPickle(self, data):
|
|
return cPickle.loads(data)
|
|
|
|
def handleLogRecord(self, record):
|
|
# if a name is specified, we use the named logger rather than the one
|
|
# implied by the record.
|
|
if self.server.logname is not None:
|
|
name = self.server.logname
|
|
else:
|
|
name = record.name
|
|
logger = logging.getLogger(name)
|
|
# N.B. EVERY record gets logged. This is because Logger.handle
|
|
# is normally called AFTER logger-level filtering. If you want
|
|
# to do filtering, do it at the client end to save wasting
|
|
# cycles and network bandwidth!
|
|
logger.handle(record)
|
|
|
|
class LogRecordSocketReceiver(SocketServer.ThreadingTCPServer):
|
|
"""simple TCP socket-based logging receiver suitable for testing.
|
|
"""
|
|
|
|
allow_reuse_address = 1
|
|
|
|
def __init__(self, host='localhost',
|
|
port=logging.handlers.DEFAULT_TCP_LOGGING_PORT,
|
|
handler=LogRecordStreamHandler):
|
|
SocketServer.ThreadingTCPServer.__init__(self, (host, port), handler)
|
|
self.abort = 0
|
|
self.timeout = 1
|
|
self.logname = None
|
|
|
|
def serve_until_stopped(self):
|
|
import select
|
|
abort = 0
|
|
while not abort:
|
|
rd, wr, ex = select.select([self.socket.fileno()],
|
|
[], [],
|
|
self.timeout)
|
|
if rd:
|
|
self.handle_request()
|
|
abort = self.abort
|
|
|
|
def main():
|
|
logging.basicConfig(
|
|
format="%(relativeCreated)5d %(name)-15s %(levelname)-8s %(message)s")
|
|
tcpserver = LogRecordSocketReceiver()
|
|
print "About to start TCP server..."
|
|
tcpserver.serve_until_stopped()
|
|
|
|
if __name__ == "__main__":
|
|
main()
|
|
\end{verbatim}
|
|
|
|
First run the server, and then the client. On the client side, nothing is
|
|
printed on the console; on the server side, you should see something like:
|
|
|
|
\begin{verbatim}
|
|
About to start TCP server...
|
|
59 root INFO Jackdaws love my big sphinx of quartz.
|
|
59 myapp.area1 DEBUG Quick zephyrs blow, vexing daft Jim.
|
|
69 myapp.area1 INFO How quickly daft jumping zebras vex.
|
|
69 myapp.area2 WARNING Jail zesty vixen who grabbed pay from quack.
|
|
69 myapp.area2 ERROR The five boxing wizards jump quickly.
|
|
\end{verbatim}
|
|
|
|
\subsection{Handler Objects}
|
|
|
|
Handlers have the following attributes and methods. Note that
|
|
\class{Handler} is never instantiated directly; this class acts as a
|
|
base for more useful subclasses. However, the \method{__init__()}
|
|
method in subclasses needs to call \method{Handler.__init__()}.
|
|
|
|
\begin{methoddesc}[Handler]{__init__}{level=\constant{NOTSET}}
|
|
Initializes the \class{Handler} instance by setting its level, setting
|
|
the list of filters to the empty list and creating a lock (using
|
|
\method{createLock()}) for serializing access to an I/O mechanism.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}[Handler]{createLock}{}
|
|
Initializes a thread lock which can be used to serialize access to
|
|
underlying I/O functionality which may not be threadsafe.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}[Handler]{acquire}{}
|
|
Acquires the thread lock created with \method{createLock()}.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}[Handler]{release}{}
|
|
Releases the thread lock acquired with \method{acquire()}.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}[Handler]{setLevel}{lvl}
|
|
Sets the threshold for this handler to \var{lvl}. Logging messages which are
|
|
less severe than \var{lvl} will be ignored. When a handler is created, the
|
|
level is set to \constant{NOTSET} (which causes all messages to be processed).
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}[Handler]{setFormatter}{form}
|
|
Sets the \class{Formatter} for this handler to \var{form}.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}[Handler]{addFilter}{filt}
|
|
Adds the specified filter \var{filt} to this handler.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}[Handler]{removeFilter}{filt}
|
|
Removes the specified filter \var{filt} from this handler.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}[Handler]{filter}{record}
|
|
Applies this handler's filters to the record and returns a true value if
|
|
the record is to be processed.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}[Handler]{flush}{}
|
|
Ensure all logging output has been flushed. This version does
|
|
nothing and is intended to be implemented by subclasses.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}[Handler]{close}{}
|
|
Tidy up any resources used by the handler. This version does
|
|
nothing and is intended to be implemented by subclasses.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}[Handler]{handle}{record}
|
|
Conditionally emits the specified logging record, depending on
|
|
filters which may have been added to the handler. Wraps the actual
|
|
emission of the record with acquisition/release of the I/O thread
|
|
lock.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}[Handler]{handleError}{record}
|
|
This method should be called from handlers when an exception is
|
|
encountered during an \method{emit()} call. By default it does nothing,
|
|
which means that exceptions get silently ignored. This is what is
|
|
mostly wanted for a logging system - most users will not care
|
|
about errors in the logging system, they are more interested in
|
|
application errors. You could, however, replace this with a custom
|
|
handler if you wish. The specified record is the one which was being
|
|
processed when the exception occurred.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}[Handler]{format}{record}
|
|
Do formatting for a record - if a formatter is set, use it.
|
|
Otherwise, use the default formatter for the module.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}[Handler]{emit}{record}
|
|
Do whatever it takes to actually log the specified logging record.
|
|
This version is intended to be implemented by subclasses and so
|
|
raises a \exception{NotImplementedError}.
|
|
\end{methoddesc}
|
|
|
|
\subsubsection{StreamHandler}
|
|
|
|
The \class{StreamHandler} class, located in the core \module{logging}
|
|
package, sends logging output to streams such as \var{sys.stdout},
|
|
\var{sys.stderr} or any file-like object (or, more precisely, any
|
|
object which supports \method{write()} and \method{flush()} methods).
|
|
|
|
\begin{classdesc}{StreamHandler}{\optional{strm}}
|
|
Returns a new instance of the \class{StreamHandler} class. If \var{strm} is
|
|
specified, the instance will use it for logging output; otherwise,
|
|
\var{sys.stderr} will be used.
|
|
\end{classdesc}
|
|
|
|
\begin{methoddesc}{emit}{record}
|
|
If a formatter is specified, it is used to format the record.
|
|
The record is then written to the stream with a trailing newline.
|
|
If exception information is present, it is formatted using
|
|
\function{traceback.print_exception()} and appended to the stream.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{flush}{}
|
|
Flushes the stream by calling its \method{flush()} method. Note that
|
|
the \method{close()} method is inherited from \class{Handler} and
|
|
so does nothing, so an explicit \method{flush()} call may be needed
|
|
at times.
|
|
\end{methoddesc}
|
|
|
|
\subsubsection{FileHandler}
|
|
|
|
The \class{FileHandler} class, located in the core \module{logging}
|
|
package, sends logging output to a disk file. It inherits the output
|
|
functionality from \class{StreamHandler}.
|
|
|
|
\begin{classdesc}{FileHandler}{filename\optional{, mode\optional{, encoding}}}
|
|
Returns a new instance of the \class{FileHandler} class. The specified
|
|
file is opened and used as the stream for logging. If \var{mode} is
|
|
not specified, \constant{'a'} is used. If \var{encoding} is not \var{None},
|
|
it is used to open the file with that encoding. By default, the file grows
|
|
indefinitely.
|
|
\end{classdesc}
|
|
|
|
\begin{methoddesc}{close}{}
|
|
Closes the file.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{emit}{record}
|
|
Outputs the record to the file.
|
|
\end{methoddesc}
|
|
|
|
\subsubsection{WatchedFileHandler}
|
|
|
|
\versionadded{2.6}
|
|
The \class{WatchedFileHandler} class, located in the \module{logging.handlers}
|
|
module, is a \class{FileHandler} which watches the file it is logging to.
|
|
If the file changes, it is closed and reopened using the file name.
|
|
|
|
A file change can happen because of usage of programs such as \var{newsyslog}
|
|
and \var{logrotate} which perform log file rotation. This handler, intended
|
|
for use under Unix/Linux, watches the file to see if it has changed since the
|
|
last emit. (A file is deemed to have changed if its device or inode have
|
|
changed.) If the file has changed, the old file stream is closed, and the file
|
|
opened to get a new stream.
|
|
|
|
This handler is not appropriate for use under Windows, because under Windows
|
|
open log files cannot be moved or renamed - logging opens the files with
|
|
exclusive locks - and so there is no need for such a handler. Furthermore,
|
|
\var{ST_INO} is not supported under Windows; \function{stat()} always returns
|
|
zero for this value.
|
|
|
|
\begin{classdesc}{WatchedFileHandler}{filename\optional{,mode\optional{,
|
|
encoding}}}
|
|
Returns a new instance of the \class{WatchedFileHandler} class. The specified
|
|
file is opened and used as the stream for logging. If \var{mode} is
|
|
not specified, \constant{'a'} is used. If \var{encoding} is not \var{None},
|
|
it is used to open the file with that encoding. By default, the file grows
|
|
indefinitely.
|
|
\end{classdesc}
|
|
|
|
\begin{methoddesc}{emit}{record}
|
|
Outputs the record to the file, but first checks to see if the file has
|
|
changed. If it has, the existing stream is flushed and closed and the file
|
|
opened again, before outputting the record to the file.
|
|
\end{methoddesc}
|
|
|
|
\subsubsection{RotatingFileHandler}
|
|
|
|
The \class{RotatingFileHandler} class, located in the \module{logging.handlers}
|
|
module, supports rotation of disk log files.
|
|
|
|
\begin{classdesc}{RotatingFileHandler}{filename\optional{, mode\optional{,
|
|
maxBytes\optional{, backupCount}}}}
|
|
Returns a new instance of the \class{RotatingFileHandler} class. The
|
|
specified file is opened and used as the stream for logging. If
|
|
\var{mode} is not specified, \code{'a'} is used. By default, the
|
|
file grows indefinitely.
|
|
|
|
You can use the \var{maxBytes} and
|
|
\var{backupCount} values to allow the file to \dfn{rollover} at a
|
|
predetermined size. When the size is about to be exceeded, the file is
|
|
closed and a new file is silently opened for output. Rollover occurs
|
|
whenever the current log file is nearly \var{maxBytes} in length; if
|
|
\var{maxBytes} is zero, rollover never occurs. If \var{backupCount}
|
|
is non-zero, the system will save old log files by appending the
|
|
extensions ".1", ".2" etc., to the filename. For example, with
|
|
a \var{backupCount} of 5 and a base file name of
|
|
\file{app.log}, you would get \file{app.log},
|
|
\file{app.log.1}, \file{app.log.2}, up to \file{app.log.5}. The file being
|
|
written to is always \file{app.log}. When this file is filled, it is
|
|
closed and renamed to \file{app.log.1}, and if files \file{app.log.1},
|
|
\file{app.log.2}, etc. exist, then they are renamed to \file{app.log.2},
|
|
\file{app.log.3} etc. respectively.
|
|
\end{classdesc}
|
|
|
|
\begin{methoddesc}{doRollover}{}
|
|
Does a rollover, as described above.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{emit}{record}
|
|
Outputs the record to the file, catering for rollover as described previously.
|
|
\end{methoddesc}
|
|
|
|
\subsubsection{TimedRotatingFileHandler}
|
|
|
|
The \class{TimedRotatingFileHandler} class, located in the
|
|
\module{logging.handlers} module, supports rotation of disk log files
|
|
at certain timed intervals.
|
|
|
|
\begin{classdesc}{TimedRotatingFileHandler}{filename
|
|
\optional{,when
|
|
\optional{,interval
|
|
\optional{,backupCount}}}}
|
|
|
|
Returns a new instance of the \class{TimedRotatingFileHandler} class. The
|
|
specified file is opened and used as the stream for logging. On rotating
|
|
it also sets the filename suffix. Rotating happens based on the product
|
|
of \var{when} and \var{interval}.
|
|
|
|
You can use the \var{when} to specify the type of \var{interval}. The
|
|
list of possible values is, note that they are not case sensitive:
|
|
|
|
\begin{tableii}{l|l}{}{Value}{Type of interval}
|
|
\lineii{S}{Seconds}
|
|
\lineii{M}{Minutes}
|
|
\lineii{H}{Hours}
|
|
\lineii{D}{Days}
|
|
\lineii{W}{Week day (0=Monday)}
|
|
\lineii{midnight}{Roll over at midnight}
|
|
\end{tableii}
|
|
|
|
If \var{backupCount} is non-zero, the system will save old log files by
|
|
appending extensions to the filename. The extensions are date-and-time
|
|
based, using the strftime format \code{\%Y-\%m-\%d_\%H-\%M-\%S} or a leading
|
|
portion thereof, depending on the rollover interval. At most \var{backupCount}
|
|
files will be kept, and if more would be created when rollover occurs, the
|
|
oldest one is deleted.
|
|
\end{classdesc}
|
|
|
|
\begin{methoddesc}{doRollover}{}
|
|
Does a rollover, as described above.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{emit}{record}
|
|
Outputs the record to the file, catering for rollover as described
|
|
above.
|
|
\end{methoddesc}
|
|
|
|
\subsubsection{SocketHandler}
|
|
|
|
The \class{SocketHandler} class, located in the
|
|
\module{logging.handlers} module, sends logging output to a network
|
|
socket. The base class uses a TCP socket.
|
|
|
|
\begin{classdesc}{SocketHandler}{host, port}
|
|
Returns a new instance of the \class{SocketHandler} class intended to
|
|
communicate with a remote machine whose address is given by \var{host}
|
|
and \var{port}.
|
|
\end{classdesc}
|
|
|
|
\begin{methoddesc}{close}{}
|
|
Closes the socket.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{emit}{}
|
|
Pickles the record's attribute dictionary and writes it to the socket in
|
|
binary format. If there is an error with the socket, silently drops the
|
|
packet. If the connection was previously lost, re-establishes the connection.
|
|
To unpickle the record at the receiving end into a \class{LogRecord}, use the
|
|
\function{makeLogRecord()} function.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{handleError}{}
|
|
Handles an error which has occurred during \method{emit()}. The
|
|
most likely cause is a lost connection. Closes the socket so that
|
|
we can retry on the next event.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{makeSocket}{}
|
|
This is a factory method which allows subclasses to define the precise
|
|
type of socket they want. The default implementation creates a TCP
|
|
socket (\constant{socket.SOCK_STREAM}).
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{makePickle}{record}
|
|
Pickles the record's attribute dictionary in binary format with a length
|
|
prefix, and returns it ready for transmission across the socket.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{send}{packet}
|
|
Send a pickled string \var{packet} to the socket. This function allows
|
|
for partial sends which can happen when the network is busy.
|
|
\end{methoddesc}
|
|
|
|
\subsubsection{DatagramHandler}
|
|
|
|
The \class{DatagramHandler} class, located in the
|
|
\module{logging.handlers} module, inherits from \class{SocketHandler}
|
|
to support sending logging messages over UDP sockets.
|
|
|
|
\begin{classdesc}{DatagramHandler}{host, port}
|
|
Returns a new instance of the \class{DatagramHandler} class intended to
|
|
communicate with a remote machine whose address is given by \var{host}
|
|
and \var{port}.
|
|
\end{classdesc}
|
|
|
|
\begin{methoddesc}{emit}{}
|
|
Pickles the record's attribute dictionary and writes it to the socket in
|
|
binary format. If there is an error with the socket, silently drops the
|
|
packet.
|
|
To unpickle the record at the receiving end into a \class{LogRecord}, use the
|
|
\function{makeLogRecord()} function.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{makeSocket}{}
|
|
The factory method of \class{SocketHandler} is here overridden to create
|
|
a UDP socket (\constant{socket.SOCK_DGRAM}).
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{send}{s}
|
|
Send a pickled string to a socket.
|
|
\end{methoddesc}
|
|
|
|
\subsubsection{SysLogHandler}
|
|
|
|
The \class{SysLogHandler} class, located in the
|
|
\module{logging.handlers} module, supports sending logging messages to
|
|
a remote or local \UNIX{} syslog.
|
|
|
|
\begin{classdesc}{SysLogHandler}{\optional{address\optional{, facility}}}
|
|
Returns a new instance of the \class{SysLogHandler} class intended to
|
|
communicate with a remote \UNIX{} machine whose address is given by
|
|
\var{address} in the form of a \code{(\var{host}, \var{port})}
|
|
tuple. If \var{address} is not specified, \code{('localhost', 514)} is
|
|
used. The address is used to open a UDP socket. If \var{facility} is
|
|
not specified, \constant{LOG_USER} is used.
|
|
\end{classdesc}
|
|
|
|
\begin{methoddesc}{close}{}
|
|
Closes the socket to the remote host.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{emit}{record}
|
|
The record is formatted, and then sent to the syslog server. If
|
|
exception information is present, it is \emph{not} sent to the server.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{encodePriority}{facility, priority}
|
|
Encodes the facility and priority into an integer. You can pass in strings
|
|
or integers - if strings are passed, internal mapping dictionaries are used
|
|
to convert them to integers.
|
|
\end{methoddesc}
|
|
|
|
\subsubsection{NTEventLogHandler}
|
|
|
|
The \class{NTEventLogHandler} class, located in the
|
|
\module{logging.handlers} module, supports sending logging messages to
|
|
a local Windows NT, Windows 2000 or Windows XP event log. Before you
|
|
can use it, you need Mark Hammond's Win32 extensions for Python
|
|
installed.
|
|
|
|
\begin{classdesc}{NTEventLogHandler}{appname\optional{,
|
|
dllname\optional{, logtype}}}
|
|
Returns a new instance of the \class{NTEventLogHandler} class. The
|
|
\var{appname} is used to define the application name as it appears in the
|
|
event log. An appropriate registry entry is created using this name.
|
|
The \var{dllname} should give the fully qualified pathname of a .dll or .exe
|
|
which contains message definitions to hold in the log (if not specified,
|
|
\code{'win32service.pyd'} is used - this is installed with the Win32
|
|
extensions and contains some basic placeholder message definitions.
|
|
Note that use of these placeholders will make your event logs big, as the
|
|
entire message source is held in the log. If you want slimmer logs, you have
|
|
to pass in the name of your own .dll or .exe which contains the message
|
|
definitions you want to use in the event log). The \var{logtype} is one of
|
|
\code{'Application'}, \code{'System'} or \code{'Security'}, and
|
|
defaults to \code{'Application'}.
|
|
\end{classdesc}
|
|
|
|
\begin{methoddesc}{close}{}
|
|
At this point, you can remove the application name from the registry as a
|
|
source of event log entries. However, if you do this, you will not be able
|
|
to see the events as you intended in the Event Log Viewer - it needs to be
|
|
able to access the registry to get the .dll name. The current version does
|
|
not do this (in fact it doesn't do anything).
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{emit}{record}
|
|
Determines the message ID, event category and event type, and then logs the
|
|
message in the NT event log.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{getEventCategory}{record}
|
|
Returns the event category for the record. Override this if you
|
|
want to specify your own categories. This version returns 0.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{getEventType}{record}
|
|
Returns the event type for the record. Override this if you want
|
|
to specify your own types. This version does a mapping using the
|
|
handler's typemap attribute, which is set up in \method{__init__()}
|
|
to a dictionary which contains mappings for \constant{DEBUG},
|
|
\constant{INFO}, \constant{WARNING}, \constant{ERROR} and
|
|
\constant{CRITICAL}. If you are using your own levels, you will either need
|
|
to override this method or place a suitable dictionary in the
|
|
handler's \var{typemap} attribute.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{getMessageID}{record}
|
|
Returns the message ID for the record. If you are using your
|
|
own messages, you could do this by having the \var{msg} passed to the
|
|
logger being an ID rather than a format string. Then, in here,
|
|
you could use a dictionary lookup to get the message ID. This
|
|
version returns 1, which is the base message ID in
|
|
\file{win32service.pyd}.
|
|
\end{methoddesc}
|
|
|
|
\subsubsection{SMTPHandler}
|
|
|
|
The \class{SMTPHandler} class, located in the
|
|
\module{logging.handlers} module, supports sending logging messages to
|
|
an email address via SMTP.
|
|
|
|
\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. 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.
|
|
\end{classdesc}
|
|
|
|
\begin{methoddesc}{emit}{record}
|
|
Formats the record and sends it to the specified addressees.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{getSubject}{record}
|
|
If you want to specify a subject line which is record-dependent,
|
|
override this method.
|
|
\end{methoddesc}
|
|
|
|
\subsubsection{MemoryHandler}
|
|
|
|
The \class{MemoryHandler} class, located in the
|
|
\module{logging.handlers} module, supports buffering of logging
|
|
records in memory, periodically flushing them to a \dfn{target}
|
|
handler. Flushing occurs whenever the buffer is full, or when an event
|
|
of a certain severity or greater is seen.
|
|
|
|
\class{MemoryHandler} is a subclass of the more general
|
|
\class{BufferingHandler}, which is an abstract class. This buffers logging
|
|
records in memory. Whenever each record is added to the buffer, a
|
|
check is made by calling \method{shouldFlush()} to see if the buffer
|
|
should be flushed. If it should, then \method{flush()} is expected to
|
|
do the needful.
|
|
|
|
\begin{classdesc}{BufferingHandler}{capacity}
|
|
Initializes the handler with a buffer of the specified capacity.
|
|
\end{classdesc}
|
|
|
|
\begin{methoddesc}{emit}{record}
|
|
Appends the record to the buffer. If \method{shouldFlush()} returns true,
|
|
calls \method{flush()} to process the buffer.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{flush}{}
|
|
You can override this to implement custom flushing behavior. This version
|
|
just zaps the buffer to empty.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{shouldFlush}{record}
|
|
Returns true if the buffer is up to capacity. This method can be
|
|
overridden to implement custom flushing strategies.
|
|
\end{methoddesc}
|
|
|
|
\begin{classdesc}{MemoryHandler}{capacity\optional{, flushLevel
|
|
\optional{, target}}}
|
|
Returns a new instance of the \class{MemoryHandler} class. The
|
|
instance is initialized with a buffer size of \var{capacity}. If
|
|
\var{flushLevel} is not specified, \constant{ERROR} is used. If no
|
|
\var{target} is specified, the target will need to be set using
|
|
\method{setTarget()} before this handler does anything useful.
|
|
\end{classdesc}
|
|
|
|
\begin{methoddesc}{close}{}
|
|
Calls \method{flush()}, sets the target to \constant{None} and
|
|
clears the buffer.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{flush}{}
|
|
For a \class{MemoryHandler}, flushing means just sending the buffered
|
|
records to the target, if there is one. Override if you want
|
|
different behavior.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{setTarget}{target}
|
|
Sets the target handler for this handler.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{shouldFlush}{record}
|
|
Checks for buffer full or a record at the \var{flushLevel} or higher.
|
|
\end{methoddesc}
|
|
|
|
\subsubsection{HTTPHandler}
|
|
|
|
The \class{HTTPHandler} class, located in the
|
|
\module{logging.handlers} module, supports sending logging messages to
|
|
a Web server, using either \samp{GET} or \samp{POST} semantics.
|
|
|
|
\begin{classdesc}{HTTPHandler}{host, url\optional{, method}}
|
|
Returns a new instance of the \class{HTTPHandler} class. The
|
|
instance is initialized with a host address, url and HTTP method.
|
|
The \var{host} can be of the form \code{host:port}, should you need to
|
|
use a specific port number. If no \var{method} is specified, \samp{GET}
|
|
is used.
|
|
\end{classdesc}
|
|
|
|
\begin{methoddesc}{emit}{record}
|
|
Sends the record to the Web server as an URL-encoded dictionary.
|
|
\end{methoddesc}
|
|
|
|
\subsection{Formatter Objects}
|
|
|
|
\class{Formatter}s have the following attributes and methods. They are
|
|
responsible for converting a \class{LogRecord} to (usually) a string
|
|
which can be interpreted by either a human or an external system. The
|
|
base
|
|
\class{Formatter} allows a formatting string to be specified. If none is
|
|
supplied, the default value of \code{'\%(message)s'} is used.
|
|
|
|
A Formatter can be initialized with a format string which makes use of
|
|
knowledge of the \class{LogRecord} attributes - such as the default value
|
|
mentioned above making use of the fact that the user's message and
|
|
arguments are pre-formatted into a \class{LogRecord}'s \var{message}
|
|
attribute. This format string contains standard python \%-style
|
|
mapping keys. See section \ref{typesseq-strings}, ``String Formatting
|
|
Operations,'' for more information on string formatting.
|
|
|
|
Currently, the useful mapping keys in a \class{LogRecord} are:
|
|
|
|
\begin{tableii}{l|l}{code}{Format}{Description}
|
|
\lineii{\%(name)s} {Name of the logger (logging channel).}
|
|
\lineii{\%(levelno)s} {Numeric logging level for the message
|
|
(\constant{DEBUG}, \constant{INFO},
|
|
\constant{WARNING}, \constant{ERROR},
|
|
\constant{CRITICAL}).}
|
|
\lineii{\%(levelname)s}{Text logging level for the message
|
|
(\code{'DEBUG'}, \code{'INFO'},
|
|
\code{'WARNING'}, \code{'ERROR'},
|
|
\code{'CRITICAL'}).}
|
|
\lineii{\%(pathname)s} {Full pathname of the source file where the logging
|
|
call was issued (if available).}
|
|
\lineii{\%(filename)s} {Filename portion of pathname.}
|
|
\lineii{\%(module)s} {Module (name portion of filename).}
|
|
\lineii{\%(funcName)s} {Name of function containing the logging call.}
|
|
\lineii{\%(lineno)d} {Source line number where the logging call was issued
|
|
(if available).}
|
|
\lineii{\%(created)f} {Time when the \class{LogRecord} was created (as
|
|
returned by \function{time.time()}).}
|
|
\lineii{\%(relativeCreated)d} {Time in milliseconds when the LogRecord was
|
|
created, relative to the time the logging module was
|
|
loaded.}
|
|
\lineii{\%(asctime)s} {Human-readable time when the \class{LogRecord}
|
|
was created. By default this is of the form
|
|
``2003-07-08 16:49:45,896'' (the numbers after the
|
|
comma are millisecond portion of the time).}
|
|
\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}
|
|
|
|
\versionchanged[\var{funcName} was added]{2.5}
|
|
|
|
\begin{classdesc}{Formatter}{\optional{fmt\optional{, datefmt}}}
|
|
Returns a new instance of the \class{Formatter} class. The
|
|
instance is initialized with a format string for the message as a whole,
|
|
as well as a format string for the date/time portion of a message. If
|
|
no \var{fmt} is specified, \code{'\%(message)s'} is used. If no \var{datefmt}
|
|
is specified, the ISO8601 date format is used.
|
|
\end{classdesc}
|
|
|
|
\begin{methoddesc}{format}{record}
|
|
The record's attribute dictionary is used as the operand to a
|
|
string formatting operation. Returns the resulting string.
|
|
Before formatting the dictionary, a couple of preparatory steps
|
|
are carried out. The \var{message} attribute of the record is computed
|
|
using \var{msg} \% \var{args}. If the formatting string contains
|
|
\code{'(asctime)'}, \method{formatTime()} is called to format the
|
|
event time. If there is exception information, it is formatted using
|
|
\method{formatException()} and appended to the message.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{formatTime}{record\optional{, datefmt}}
|
|
This method should be called from \method{format()} by a formatter which
|
|
wants to make use of a formatted time. This method can be overridden
|
|
in formatters to provide for any specific requirement, but the
|
|
basic behavior is as follows: if \var{datefmt} (a string) is specified,
|
|
it is used with \function{time.strftime()} to format the creation time of the
|
|
record. Otherwise, the ISO8601 format is used. The resulting
|
|
string is returned.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{formatException}{exc_info}
|
|
Formats the specified exception information (a standard exception tuple
|
|
as returned by \function{sys.exc_info()}) as a string. This default
|
|
implementation just uses \function{traceback.print_exception()}.
|
|
The resulting string is returned.
|
|
\end{methoddesc}
|
|
|
|
\subsection{Filter Objects}
|
|
|
|
\class{Filter}s can be used by \class{Handler}s and \class{Logger}s for
|
|
more sophisticated filtering than is provided by levels. The base filter
|
|
class only allows events which are below a certain point in the logger
|
|
hierarchy. For example, a filter initialized with "A.B" will allow events
|
|
logged by loggers "A.B", "A.B.C", "A.B.C.D", "A.B.D" etc. but not "A.BB",
|
|
"B.A.B" etc. If initialized with the empty string, all events are passed.
|
|
|
|
\begin{classdesc}{Filter}{\optional{name}}
|
|
Returns an instance of the \class{Filter} class. If \var{name} is specified,
|
|
it names a logger which, together with its children, will have its events
|
|
allowed through the filter. If no name is specified, allows every event.
|
|
\end{classdesc}
|
|
|
|
\begin{methoddesc}{filter}{record}
|
|
Is the specified record to be logged? Returns zero for no, nonzero for
|
|
yes. If deemed appropriate, the record may be modified in-place by this
|
|
method.
|
|
\end{methoddesc}
|
|
|
|
\subsection{LogRecord Objects}
|
|
|
|
\class{LogRecord} instances are created every time something is logged. They
|
|
contain all the information pertinent to the event being logged. The
|
|
main information passed in is in msg and args, which are combined
|
|
using msg \% args to create the message field of the record. The record
|
|
also includes information such as when the record was created, the
|
|
source line where the logging call was made, and any exception
|
|
information to be logged.
|
|
|
|
\begin{classdesc}{LogRecord}{name, lvl, pathname, lineno, msg, args,
|
|
exc_info \optional{, func}}
|
|
Returns an instance of \class{LogRecord} initialized with interesting
|
|
information. The \var{name} is the logger name; \var{lvl} is the
|
|
numeric level; \var{pathname} is the absolute pathname of the source
|
|
file in which the logging call was made; \var{lineno} is the line
|
|
number in that file where the logging call is found; \var{msg} is the
|
|
user-supplied message (a format string); \var{args} is the tuple
|
|
which, together with \var{msg}, makes up the user message; and
|
|
\var{exc_info} is the exception tuple obtained by calling
|
|
\function{sys.exc_info() }(or \constant{None}, if no exception information
|
|
is available). The \var{func} is the name of the function from which the
|
|
logging call was made. If not specified, it defaults to \code{None}.
|
|
\versionchanged[\var{func} was added]{2.5}
|
|
\end{classdesc}
|
|
|
|
\begin{methoddesc}{getMessage}{}
|
|
Returns the message for this \class{LogRecord} instance after merging any
|
|
user-supplied arguments with the message.
|
|
\end{methoddesc}
|
|
|
|
\subsection{Thread Safety}
|
|
|
|
The logging module is intended to be thread-safe without any special work
|
|
needing to be done by its clients. It achieves this though using threading
|
|
locks; there is one lock to serialize access to the module's shared data,
|
|
and each handler also creates a lock to serialize access to its underlying
|
|
I/O.
|
|
|
|
\subsection{Configuration}
|
|
|
|
|
|
\subsubsection{Configuration functions%
|
|
\label{logging-config-api}}
|
|
|
|
The following functions configure the logging module. They are located in the
|
|
\module{logging.config} module. Their use is optional --- you can configure
|
|
the logging module using these functions or by making calls to the
|
|
main API (defined in \module{logging} itself) and defining handlers
|
|
which are declared either in \module{logging} or
|
|
\module{logging.handlers}.
|
|
|
|
\begin{funcdesc}{fileConfig}{fname\optional{, defaults}}
|
|
Reads the logging configuration from a ConfigParser-format file named
|
|
\var{fname}. This function can be called several times from an application,
|
|
allowing an end user the ability to select from various pre-canned
|
|
configurations (if the developer provides a mechanism to present the
|
|
choices and load the chosen configuration). Defaults to be passed to
|
|
ConfigParser can be specified in the \var{defaults} argument.
|
|
\end{funcdesc}
|
|
|
|
\begin{funcdesc}{listen}{\optional{port}}
|
|
Starts up a socket server on the specified port, and listens for new
|
|
configurations. If no port is specified, the module's default
|
|
\constant{DEFAULT_LOGGING_CONFIG_PORT} is used. Logging configurations
|
|
will be sent as a file suitable for processing by \function{fileConfig()}.
|
|
Returns a \class{Thread} instance on which you can call \method{start()}
|
|
to start the server, and which you can \method{join()} when appropriate.
|
|
To stop the server, call \function{stopListening()}. To send a configuration
|
|
to the socket, read in the configuration file and send it to the socket
|
|
as a string of bytes preceded by a four-byte length packed in binary using
|
|
struct.\code{pack('>L', n)}.
|
|
\end{funcdesc}
|
|
|
|
\begin{funcdesc}{stopListening}{}
|
|
Stops the listening server which was created with a call to
|
|
\function{listen()}. This is typically called before calling \method{join()}
|
|
on the return value from \function{listen()}.
|
|
\end{funcdesc}
|
|
|
|
\subsubsection{Configuration file format%
|
|
\label{logging-config-fileformat}}
|
|
|
|
The configuration file format understood by \function{fileConfig()} is
|
|
based on ConfigParser functionality. The file must contain sections
|
|
called \code{[loggers]}, \code{[handlers]} and \code{[formatters]}
|
|
which identify by name the entities of each type which are defined in
|
|
the file. For each such entity, there is a separate section which
|
|
identified how that entity is configured. Thus, for a logger named
|
|
\code{log01} in the \code{[loggers]} section, the relevant
|
|
configuration details are held in a section
|
|
\code{[logger_log01]}. Similarly, a handler called \code{hand01} in
|
|
the \code{[handlers]} section will have its configuration held in a
|
|
section called \code{[handler_hand01]}, while a formatter called
|
|
\code{form01} in the \code{[formatters]} section will have its
|
|
configuration specified in a section called
|
|
\code{[formatter_form01]}. The root logger configuration must be
|
|
specified in a section called \code{[logger_root]}.
|
|
|
|
Examples of these sections in the file are given below.
|
|
|
|
\begin{verbatim}
|
|
[loggers]
|
|
keys=root,log02,log03,log04,log05,log06,log07
|
|
|
|
[handlers]
|
|
keys=hand01,hand02,hand03,hand04,hand05,hand06,hand07,hand08,hand09
|
|
|
|
[formatters]
|
|
keys=form01,form02,form03,form04,form05,form06,form07,form08,form09
|
|
\end{verbatim}
|
|
|
|
The root logger must specify a level and a list of handlers. An
|
|
example of a root logger section is given below.
|
|
|
|
\begin{verbatim}
|
|
[logger_root]
|
|
level=NOTSET
|
|
handlers=hand01
|
|
\end{verbatim}
|
|
|
|
The \code{level} entry can be one of \code{DEBUG, INFO, WARNING,
|
|
ERROR, CRITICAL} or \code{NOTSET}. For the root logger only,
|
|
\code{NOTSET} means that all messages will be logged. Level values are
|
|
\function{eval()}uated in the context of the \code{logging} package's
|
|
namespace.
|
|
|
|
The \code{handlers} entry is a comma-separated list of handler names,
|
|
which must appear in the \code{[handlers]} section. These names must
|
|
appear in the \code{[handlers]} section and have corresponding
|
|
sections in the configuration file.
|
|
|
|
For loggers other than the root logger, some additional information is
|
|
required. This is illustrated by the following example.
|
|
|
|
\begin{verbatim}
|
|
[logger_parser]
|
|
level=DEBUG
|
|
handlers=hand01
|
|
propagate=1
|
|
qualname=compiler.parser
|
|
\end{verbatim}
|
|
|
|
The \code{level} and \code{handlers} entries are interpreted as for
|
|
the root logger, except that if a non-root logger's level is specified
|
|
as \code{NOTSET}, the system consults loggers higher up the hierarchy
|
|
to determine the effective level of the logger. The \code{propagate}
|
|
entry is set to 1 to indicate that messages must propagate to handlers
|
|
higher up the logger hierarchy from this logger, or 0 to indicate that
|
|
messages are \strong{not} propagated to handlers up the hierarchy. The
|
|
\code{qualname} entry is the hierarchical channel name of the logger,
|
|
that is to say the name used by the application to get the logger.
|
|
|
|
Sections which specify handler configuration are exemplified by the
|
|
following.
|
|
|
|
\begin{verbatim}
|
|
[handler_hand01]
|
|
class=StreamHandler
|
|
level=NOTSET
|
|
formatter=form01
|
|
args=(sys.stdout,)
|
|
\end{verbatim}
|
|
|
|
The \code{class} entry indicates the handler's class (as determined by
|
|
\function{eval()} in the \code{logging} package's namespace). The
|
|
\code{level} is interpreted as for loggers, and \code{NOTSET} is taken
|
|
to mean "log everything".
|
|
|
|
The \code{formatter} entry indicates the key name of the formatter for
|
|
this handler. If blank, a default formatter
|
|
(\code{logging._defaultFormatter}) is used. If a name is specified, it
|
|
must appear in the \code{[formatters]} section and have a
|
|
corresponding section in the configuration file.
|
|
|
|
The \code{args} entry, when \function{eval()}uated in the context of
|
|
the \code{logging} package's namespace, is the list of arguments to
|
|
the constructor for the handler class. Refer to the constructors for
|
|
the relevant handlers, or to the examples below, to see how typical
|
|
entries are constructed.
|
|
|
|
\begin{verbatim}
|
|
[handler_hand02]
|
|
class=FileHandler
|
|
level=DEBUG
|
|
formatter=form02
|
|
args=('python.log', 'w')
|
|
|
|
[handler_hand03]
|
|
class=handlers.SocketHandler
|
|
level=INFO
|
|
formatter=form03
|
|
args=('localhost', handlers.DEFAULT_TCP_LOGGING_PORT)
|
|
|
|
[handler_hand04]
|
|
class=handlers.DatagramHandler
|
|
level=WARN
|
|
formatter=form04
|
|
args=('localhost', handlers.DEFAULT_UDP_LOGGING_PORT)
|
|
|
|
[handler_hand05]
|
|
class=handlers.SysLogHandler
|
|
level=ERROR
|
|
formatter=form05
|
|
args=(('localhost', handlers.SYSLOG_UDP_PORT), handlers.SysLogHandler.LOG_USER)
|
|
|
|
[handler_hand06]
|
|
class=handlers.NTEventLogHandler
|
|
level=CRITICAL
|
|
formatter=form06
|
|
args=('Python Application', '', 'Application')
|
|
|
|
[handler_hand07]
|
|
class=handlers.SMTPHandler
|
|
level=WARN
|
|
formatter=form07
|
|
args=('localhost', 'from@abc', ['user1@abc', 'user2@xyz'], 'Logger Subject')
|
|
|
|
[handler_hand08]
|
|
class=handlers.MemoryHandler
|
|
level=NOTSET
|
|
formatter=form08
|
|
target=
|
|
args=(10, ERROR)
|
|
|
|
[handler_hand09]
|
|
class=handlers.HTTPHandler
|
|
level=NOTSET
|
|
formatter=form09
|
|
args=('localhost:9022', '/log', 'GET')
|
|
\end{verbatim}
|
|
|
|
Sections which specify formatter configuration are typified by the following.
|
|
|
|
\begin{verbatim}
|
|
[formatter_form01]
|
|
format=F1 %(asctime)s %(levelname)s %(message)s
|
|
datefmt=
|
|
class=logging.Formatter
|
|
\end{verbatim}
|
|
|
|
The \code{format} entry is the overall format string, and the
|
|
\code{datefmt} entry is the \function{strftime()}-compatible date/time format
|
|
string. If empty, the package substitutes ISO8601 format date/times, which
|
|
is almost equivalent to specifying the date format string "%Y-%m-%d %H:%M:%S".
|
|
The ISO8601 format also specifies milliseconds, which are appended to the
|
|
result of using the above format string, with a comma separator. An example
|
|
time in ISO8601 format is \code{2003-01-23 00:29:50,411}.
|
|
|
|
The \code{class} entry is optional. It indicates the name of the
|
|
formatter's class (as a dotted module and class name.) This option is
|
|
useful for instantiating a \class{Formatter} subclass. Subclasses of
|
|
\class{Formatter} can present exception tracebacks in an expanded or
|
|
condensed format.
|