mirror of
https://github.com/python/cpython.git
synced 2025-09-16 13:47:31 +00:00

svn+ssh://pythondev@svn.python.org/python/trunk ........ r58221 | georg.brandl | 2007-09-20 10:57:59 -0700 (Thu, 20 Sep 2007) | 2 lines Patch #1181: add os.environ.clear() method. ........ r58225 | sean.reifschneider | 2007-09-20 23:33:28 -0700 (Thu, 20 Sep 2007) | 3 lines Issue1704287: "make install" fails unless you do "make" first. Make oldsharedmods and sharedmods in "libinstall". ........ r58232 | guido.van.rossum | 2007-09-22 13:18:03 -0700 (Sat, 22 Sep 2007) | 4 lines Patch # 188 by Philip Jenvey. Make tell() mark CRLF as a newline. With unit test. ........ r58242 | georg.brandl | 2007-09-24 10:55:47 -0700 (Mon, 24 Sep 2007) | 2 lines Fix typo and double word. ........ r58245 | georg.brandl | 2007-09-24 10:59:28 -0700 (Mon, 24 Sep 2007) | 2 lines #1196: document default radix for int(). ........ r58247 | georg.brandl | 2007-09-24 11:08:24 -0700 (Mon, 24 Sep 2007) | 2 lines #1177: accept 2xx responses for https too, not only http. ........ r58249 | andrew.kuchling | 2007-09-24 16:45:51 -0700 (Mon, 24 Sep 2007) | 1 line Remove stray odd character; grammar fix ........ r58250 | andrew.kuchling | 2007-09-24 16:46:28 -0700 (Mon, 24 Sep 2007) | 1 line Typo fix ........ r58251 | andrew.kuchling | 2007-09-24 17:09:42 -0700 (Mon, 24 Sep 2007) | 1 line Add various items ........ r58268 | vinay.sajip | 2007-09-26 22:34:45 -0700 (Wed, 26 Sep 2007) | 1 line Change to flush and close logic to fix #1760556. ........ r58269 | vinay.sajip | 2007-09-26 22:38:51 -0700 (Wed, 26 Sep 2007) | 1 line Change to basicConfig() to fix #1021. ........ r58270 | georg.brandl | 2007-09-26 23:26:58 -0700 (Wed, 26 Sep 2007) | 2 lines #1208: document match object's boolean value. ........ r58271 | vinay.sajip | 2007-09-26 23:56:13 -0700 (Wed, 26 Sep 2007) | 1 line Minor date change. ........ r58272 | vinay.sajip | 2007-09-27 00:35:10 -0700 (Thu, 27 Sep 2007) | 1 line Change to LogRecord.__init__() to fix #1206. Note that archaic use of type(x) == types.DictType is because of keeping 1.5.2 compatibility. While this is much less relevant these days, there probably needs to be a separate commit for removing all archaic constructs at the same time. ........ r58288 | brett.cannon | 2007-09-30 12:45:10 -0700 (Sun, 30 Sep 2007) | 9 lines tuple.__repr__ did not consider a reference loop as it is not possible from Python code; but it is possible from C. object.__str__ had the issue of not expecting a type to doing something within it's tp_str implementation that could trigger an infinite recursion, but it could in C code.. Both found thanks to BaseException and how it handles its repr. Closes issue #1686386. Thanks to Thomas Herve for taking an initial stab at coming up with a solution. ........ r58289 | brett.cannon | 2007-09-30 13:37:19 -0700 (Sun, 30 Sep 2007) | 3 lines Fix error introduced by r58288; if a tuple is length 0 return its repr and don't worry about any self-referring tuples. ........ r58294 | facundo.batista | 2007-10-02 10:01:24 -0700 (Tue, 02 Oct 2007) | 11 lines Made the various is_* operations return booleans. This was discussed with Cawlishaw by mail, and he basically confirmed that to these is_* operations, there's no need to return Decimal(0) and Decimal(1) if the language supports the False and True booleans. Also added a few tests for the these functions in extra.decTest, since they are mostly untested (apart from the doctests). Thanks Mark Dickinson ........ r58295 | facundo.batista | 2007-10-02 11:21:18 -0700 (Tue, 02 Oct 2007) | 4 lines Added a class to store the digits of log(10), so that they can be made available when necessary without recomputing. Thanks Mark Dickinson ........ r58299 | mark.summerfield | 2007-10-03 01:53:21 -0700 (Wed, 03 Oct 2007) | 4 lines Added note in footnote about string comparisons about unicodedata.normalize(). ........ r58304 | raymond.hettinger | 2007-10-03 14:18:11 -0700 (Wed, 03 Oct 2007) | 1 line enumerate() is no longer bounded to using sequences shorter than LONG_MAX. The possibility of overflow was sending some newsgroup posters into a tizzy. ........ r58305 | raymond.hettinger | 2007-10-03 17:20:27 -0700 (Wed, 03 Oct 2007) | 1 line itertools.count() no longer limited to sys.maxint. ........ r58306 | kurt.kaiser | 2007-10-03 18:49:54 -0700 (Wed, 03 Oct 2007) | 3 lines Assume that the user knows when he wants to end the line; don't insert something he didn't select or complete. ........ r58307 | kurt.kaiser | 2007-10-03 19:07:50 -0700 (Wed, 03 Oct 2007) | 2 lines Remove unused theme that was causing a fault in p3k. ........ r58308 | kurt.kaiser | 2007-10-03 19:09:17 -0700 (Wed, 03 Oct 2007) | 2 lines Clean up EditorWindow close. ........ r58309 | kurt.kaiser | 2007-10-03 19:53:07 -0700 (Wed, 03 Oct 2007) | 7 lines textView cleanup. Patch 1718043 Tal Einat. M idlelib/EditorWindow.py M idlelib/aboutDialog.py M idlelib/textView.py M idlelib/NEWS.txt ........ r58310 | kurt.kaiser | 2007-10-03 20:11:12 -0700 (Wed, 03 Oct 2007) | 3 lines configDialog cleanup. Patch 1730217 Tal Einat. ........ r58311 | neal.norwitz | 2007-10-03 23:00:48 -0700 (Wed, 03 Oct 2007) | 4 lines Coverity #151: Remove deadcode. All this code already exists above starting at line 653. ........ r58325 | fred.drake | 2007-10-04 19:46:12 -0700 (Thu, 04 Oct 2007) | 1 line wrap lines to <80 characters before fixing errors ........ r58326 | raymond.hettinger | 2007-10-04 19:47:07 -0700 (Thu, 04 Oct 2007) | 6 lines Add __asdict__() to NamedTuple and refine the docs. Add maxlen support to deque() and fixup docs. Partially fix __reduce__(). The None as a third arg was no longer supported. Still needs work on __reduce__() to handle recursive inputs. ........ r58327 | fred.drake | 2007-10-04 19:48:32 -0700 (Thu, 04 Oct 2007) | 3 lines move descriptions of ac_(in|out)_buffer_size to the right place http://bugs.python.org/issue1053 ........ r58329 | neal.norwitz | 2007-10-04 20:39:17 -0700 (Thu, 04 Oct 2007) | 3 lines dict could be NULL, so we need to XDECREF. Fix a compiler warning about passing a PyTypeObject* instead of PyObject*. ........ r58330 | neal.norwitz | 2007-10-04 20:41:19 -0700 (Thu, 04 Oct 2007) | 2 lines Fix Coverity #158: Check the correct variable. ........ r58332 | neal.norwitz | 2007-10-04 22:01:38 -0700 (Thu, 04 Oct 2007) | 7 lines Fix Coverity #159. This code was broken if save() returned a negative number since i contained a boolean value and then we compared i < 0 which should never be true. Will backport (assuming it's necessary) ........ r58334 | neal.norwitz | 2007-10-04 22:29:17 -0700 (Thu, 04 Oct 2007) | 1 line Add a note about fixing some more warnings found by Coverity. ........ r58338 | raymond.hettinger | 2007-10-05 12:07:31 -0700 (Fri, 05 Oct 2007) | 1 line Restore BEGIN/END THREADS macros which were squashed in the previous checkin ........ r58343 | gregory.p.smith | 2007-10-06 00:48:10 -0700 (Sat, 06 Oct 2007) | 3 lines Stab in the dark attempt to fix the test_bsddb3 failure on sparc and S-390 ubuntu buildbots. ........ r58344 | gregory.p.smith | 2007-10-06 00:51:59 -0700 (Sat, 06 Oct 2007) | 2 lines Allows BerkeleyDB 4.6.x >= 4.6.21 for the bsddb module. ........ r58348 | gregory.p.smith | 2007-10-06 08:47:37 -0700 (Sat, 06 Oct 2007) | 3 lines Use the host the author likely meant in the first place. pop.gmail.com is reliable. gmail.org is someones personal domain. ........ r58351 | neal.norwitz | 2007-10-06 12:16:28 -0700 (Sat, 06 Oct 2007) | 3 lines Ensure that this test will pass even if another test left an unwritable TESTFN. Also use the safe unlink in test_support instead of rolling our own here. ........ r58368 | georg.brandl | 2007-10-08 00:50:24 -0700 (Mon, 08 Oct 2007) | 3 lines #1123: fix the docs for the str.split(None, sep) case. Also expand a few other methods' docs, which had more info in the deprecated string module docs. ........ r58369 | georg.brandl | 2007-10-08 01:06:05 -0700 (Mon, 08 Oct 2007) | 2 lines Update docstring of sched, also remove an unused assignment. ........ r58370 | raymond.hettinger | 2007-10-08 02:14:28 -0700 (Mon, 08 Oct 2007) | 5 lines Add comments to NamedTuple code. Let the field spec be either a string or a non-string sequence (suggested by Martin Blais with use cases). Improve the error message in the case of a SyntaxError (caused by a duplicate field name). ........ r58371 | raymond.hettinger | 2007-10-08 02:56:29 -0700 (Mon, 08 Oct 2007) | 1 line Missed a line in the docs ........ r58372 | raymond.hettinger | 2007-10-08 03:11:51 -0700 (Mon, 08 Oct 2007) | 1 line Better variable names ........ r58376 | georg.brandl | 2007-10-08 07:12:47 -0700 (Mon, 08 Oct 2007) | 3 lines #1199: docs for tp_as_{number,sequence,mapping}, by Amaury Forgeot d'Arc. No need to merge this to py3k! ........ r58380 | raymond.hettinger | 2007-10-08 14:26:58 -0700 (Mon, 08 Oct 2007) | 1 line Eliminate camelcase function name ........ r58381 | andrew.kuchling | 2007-10-08 16:23:03 -0700 (Mon, 08 Oct 2007) | 1 line Eliminate camelcase function name ........ r58382 | raymond.hettinger | 2007-10-08 18:36:23 -0700 (Mon, 08 Oct 2007) | 1 line Make the error messages more specific ........ r58384 | gregory.p.smith | 2007-10-08 23:02:21 -0700 (Mon, 08 Oct 2007) | 10 lines Splits Modules/_bsddb.c up into bsddb.h and _bsddb.c and adds a C API object available as bsddb.db.api. This is based on the patch submitted by Duncan Grisby here: http://sourceforge.net/tracker/index.php?func=detail&aid=1551895&group_id=13900&atid=313900 See this thread for additional info: http://sourceforge.net/mailarchive/forum.php?thread_name=E1GAVDK-0002rk-Iw%40apasphere.com&forum_name=pybsddb-users It also cleans up the code a little by removing some ifdef/endifs for python prior to 2.1 and for unsupported Berkeley DB <= 3.2. ........ r58385 | gregory.p.smith | 2007-10-08 23:50:43 -0700 (Mon, 08 Oct 2007) | 5 lines Fix a double free when positioning a database cursor to a non-existant string key (and probably a few other situations with string keys). This was reported with a patch as pybsddb sourceforge bug 1708868 by jjjhhhlll at gmail. ........ r58386 | gregory.p.smith | 2007-10-09 00:19:11 -0700 (Tue, 09 Oct 2007) | 3 lines Use the highest cPickle protocol in bsddb.dbshelve. This comes from sourceforge pybsddb patch 1551443 by w_barnes. ........ r58394 | gregory.p.smith | 2007-10-09 11:26:02 -0700 (Tue, 09 Oct 2007) | 2 lines remove another sleepycat reference ........ r58396 | kurt.kaiser | 2007-10-09 12:31:30 -0700 (Tue, 09 Oct 2007) | 3 lines Allow interrupt only when executing user code in subprocess Patch 1225 Tal Einat modified from IDLE-Spoon. ........ r58399 | brett.cannon | 2007-10-09 17:07:50 -0700 (Tue, 09 Oct 2007) | 5 lines Remove file-level typedefs that were inconsistently used throughout the file. Just move over to the public API names. Closes issue1238. ........ r58401 | raymond.hettinger | 2007-10-09 17:26:46 -0700 (Tue, 09 Oct 2007) | 1 line Accept Jim Jewett's api suggestion to use None instead of -1 to indicate unbounded deques. ........ r58403 | kurt.kaiser | 2007-10-09 17:55:40 -0700 (Tue, 09 Oct 2007) | 2 lines Allow cursor color change w/o restart. Patch 1725576 Tal Einat. ........ r58404 | kurt.kaiser | 2007-10-09 18:06:47 -0700 (Tue, 09 Oct 2007) | 2 lines show paste if > 80 columns. Patch 1659326 Tal Einat. ........ r58415 | thomas.heller | 2007-10-11 12:51:32 -0700 (Thu, 11 Oct 2007) | 5 lines On OS X, use os.uname() instead of gestalt.sysv(...) to get the operating system version. This allows to use ctypes when Python was configured with --disable-toolbox-glue. ........ r58419 | neal.norwitz | 2007-10-11 20:01:01 -0700 (Thu, 11 Oct 2007) | 1 line Get rid of warning about not being able to create an existing directory. ........ r58420 | neal.norwitz | 2007-10-11 20:01:30 -0700 (Thu, 11 Oct 2007) | 1 line Get rid of warnings on a bunch of platforms by using a proper prototype. ........ r58421 | neal.norwitz | 2007-10-11 20:01:54 -0700 (Thu, 11 Oct 2007) | 4 lines Get rid of compiler warning about retval being used (returned) without being initialized. (gcc warning and Coverity 202) ........ r58422 | neal.norwitz | 2007-10-11 20:03:23 -0700 (Thu, 11 Oct 2007) | 1 line Fix Coverity 168: Close the file before returning (exiting). ........ r58423 | neal.norwitz | 2007-10-11 20:04:18 -0700 (Thu, 11 Oct 2007) | 4 lines Fix Coverity 180: Don't overallocate. We don't need structs, but pointers. Also fix a memory leak. ........ r58424 | neal.norwitz | 2007-10-11 20:05:19 -0700 (Thu, 11 Oct 2007) | 5 lines Fix Coverity 185-186: If the passed in FILE is NULL, uninitialized memory would be accessed. Will backport. ........ r58425 | neal.norwitz | 2007-10-11 20:52:34 -0700 (Thu, 11 Oct 2007) | 1 line Get this module to compile with bsddb versions prior to 4.3 ........ r58430 | martin.v.loewis | 2007-10-12 01:56:52 -0700 (Fri, 12 Oct 2007) | 3 lines Bug #1216: Restore support for Visual Studio 2002. Will backport to 2.5. ........ r58433 | raymond.hettinger | 2007-10-12 10:53:11 -0700 (Fri, 12 Oct 2007) | 1 line Fix test of count.__repr__() to ignore the 'L' if the count is a long ........ r58434 | gregory.p.smith | 2007-10-12 11:44:06 -0700 (Fri, 12 Oct 2007) | 4 lines Fixes http://bugs.python.org/issue1233 - bsddb.dbshelve.DBShelf.append was useless due to inverted logic. Also adds a test case for RECNO dbs to test_dbshelve. ........ r58445 | georg.brandl | 2007-10-13 06:20:03 -0700 (Sat, 13 Oct 2007) | 2 lines Fix email example. ........ r58450 | gregory.p.smith | 2007-10-13 16:02:05 -0700 (Sat, 13 Oct 2007) | 2 lines Fix an uncollectable reference leak in bsddb.db.DBShelf.append ........ r58453 | neal.norwitz | 2007-10-13 17:18:40 -0700 (Sat, 13 Oct 2007) | 8 lines Let the O/S supply a port if none of the default ports can be used. This should make the tests more robust at the expense of allowing tests to be sloppier by not requiring them to cleanup after themselves. (It will legitamitely help when running two test suites simultaneously or if another process is already using one of the predefined ports.) Also simplifies (slightLy) the exception handling elsewhere. ........ r58459 | neal.norwitz | 2007-10-14 11:30:21 -0700 (Sun, 14 Oct 2007) | 2 lines Don't raise a string exception, they don't work anymore. ........ r58460 | neal.norwitz | 2007-10-14 11:40:37 -0700 (Sun, 14 Oct 2007) | 1 line Use unittest for assertions ........ r58468 | armin.rigo | 2007-10-15 00:48:35 -0700 (Mon, 15 Oct 2007) | 2 lines test_bigbits was not testing what it seemed to. ........ r58471 | guido.van.rossum | 2007-10-15 08:54:11 -0700 (Mon, 15 Oct 2007) | 3 lines Change a PyErr_Print() into a PyErr_Clear(), per discussion in issue 1031213. ........ r58500 | raymond.hettinger | 2007-10-16 12:18:30 -0700 (Tue, 16 Oct 2007) | 1 line Improve error messages ........ r58506 | raymond.hettinger | 2007-10-16 14:28:32 -0700 (Tue, 16 Oct 2007) | 1 line More docs, error messages, and tests ........ r58507 | andrew.kuchling | 2007-10-16 15:58:03 -0700 (Tue, 16 Oct 2007) | 1 line Add items ........ r58508 | brett.cannon | 2007-10-16 16:24:06 -0700 (Tue, 16 Oct 2007) | 3 lines Remove ``:const:`` notation on None in parameter list. Since the markup is not rendered for parameters it just showed up as ``:const:`None` `` in the output. ........ r58509 | brett.cannon | 2007-10-16 16:26:45 -0700 (Tue, 16 Oct 2007) | 3 lines Re-order some functions whose parameters differ between PyObject and const char * so that they are next to each other. ........ r58522 | armin.rigo | 2007-10-17 11:46:37 -0700 (Wed, 17 Oct 2007) | 5 lines Fix the overflow checking of list_repeat. Introduce overflow checking into list_inplace_repeat. Backport candidate, possibly. ........ r58530 | facundo.batista | 2007-10-17 20:16:03 -0700 (Wed, 17 Oct 2007) | 7 lines Issue #1580738. When HTTPConnection reads the whole stream with read(), it closes itself. When the stream is read in several calls to read(n), it should behave in the same way if HTTPConnection knows where the end of the stream is (through self.length). Added a test case for this behaviour. ........ r58531 | facundo.batista | 2007-10-17 20:44:48 -0700 (Wed, 17 Oct 2007) | 3 lines Issue 1289, just a typo. ........ r58532 | gregory.p.smith | 2007-10-18 00:56:54 -0700 (Thu, 18 Oct 2007) | 4 lines cleanup test_dbtables to use mkdtemp. cleanup dbtables to pass txn as a keyword argument whenever possible to avoid bugs and confusion. (dbtables.py line 447 self.db.get using txn as a non-keyword was an actual bug due to this) ........ r58533 | gregory.p.smith | 2007-10-18 01:34:20 -0700 (Thu, 18 Oct 2007) | 4 lines Fix a weird bug in dbtables: if it chose a random rowid string that contained NULL bytes it would cause the database all sorts of problems in the future leading to very strange random failures and corrupt dbtables.bsdTableDb dbs. ........ r58534 | gregory.p.smith | 2007-10-18 09:32:02 -0700 (Thu, 18 Oct 2007) | 3 lines A cleaner fix than the one committed last night. Generate random rowids that do not contain null bytes. ........ r58537 | gregory.p.smith | 2007-10-18 10:17:57 -0700 (Thu, 18 Oct 2007) | 2 lines mention bsddb fixes. ........ r58538 | raymond.hettinger | 2007-10-18 14:13:06 -0700 (Thu, 18 Oct 2007) | 1 line Remove useless warning ........ r58539 | gregory.p.smith | 2007-10-19 00:31:20 -0700 (Fri, 19 Oct 2007) | 2 lines squelch the warning that this test is supposed to trigger. ........ r58542 | georg.brandl | 2007-10-19 05:32:39 -0700 (Fri, 19 Oct 2007) | 2 lines Clarify wording for apply(). ........ r58544 | mark.summerfield | 2007-10-19 05:48:17 -0700 (Fri, 19 Oct 2007) | 3 lines Added a cross-ref to each other. ........ r58545 | georg.brandl | 2007-10-19 10:38:49 -0700 (Fri, 19 Oct 2007) | 2 lines #1284: "S" means "seen", not unread. ........ r58548 | thomas.heller | 2007-10-19 11:11:41 -0700 (Fri, 19 Oct 2007) | 4 lines Fix ctypes on 32-bit systems when Python is configured --with-system-ffi. See also https://bugs.launchpad.net/bugs/72505. Ported from release25-maint branch. ........ r58550 | facundo.batista | 2007-10-19 12:25:57 -0700 (Fri, 19 Oct 2007) | 8 lines The constructor from tuple was way too permissive: it allowed bad coefficient numbers, floats in the sign, and other details that generated directly the wrong number in the best case, or triggered misfunctionality in the alorithms. Test cases added for these issues. Thanks Mark Dickinson. ........ r58559 | georg.brandl | 2007-10-20 06:22:53 -0700 (Sat, 20 Oct 2007) | 2 lines Fix code being interpreted as a target. ........ r58561 | georg.brandl | 2007-10-20 06:36:24 -0700 (Sat, 20 Oct 2007) | 2 lines Document new "cmdoption" directive. ........ r58562 | georg.brandl | 2007-10-20 08:21:22 -0700 (Sat, 20 Oct 2007) | 2 lines Make a path more Unix-standardy. ........ r58564 | georg.brandl | 2007-10-20 10:51:39 -0700 (Sat, 20 Oct 2007) | 2 lines Document new directive "envvar". ........ r58567 | georg.brandl | 2007-10-20 11:08:14 -0700 (Sat, 20 Oct 2007) | 6 lines * Add new toplevel chapter, "Using Python." (how to install, configure and setup python on different platforms -- at least in theory.) * Move the Python on Mac docs in that chapter. * Add a new chapter about the command line invocation, by stargaming. ........ r58568 | georg.brandl | 2007-10-20 11:33:20 -0700 (Sat, 20 Oct 2007) | 2 lines Change title, for now. ........ r58569 | georg.brandl | 2007-10-20 11:39:25 -0700 (Sat, 20 Oct 2007) | 2 lines Add entry to ACKS. ........ r58570 | georg.brandl | 2007-10-20 12:05:45 -0700 (Sat, 20 Oct 2007) | 2 lines Clarify -E docs. ........ r58571 | georg.brandl | 2007-10-20 12:08:36 -0700 (Sat, 20 Oct 2007) | 2 lines Even more clarification. ........ r58572 | andrew.kuchling | 2007-10-20 12:25:37 -0700 (Sat, 20 Oct 2007) | 1 line Fix protocol name ........ r58573 | andrew.kuchling | 2007-10-20 12:35:18 -0700 (Sat, 20 Oct 2007) | 1 line Various items ........ r58574 | andrew.kuchling | 2007-10-20 12:39:35 -0700 (Sat, 20 Oct 2007) | 1 line Use correct header line ........ r58576 | armin.rigo | 2007-10-21 02:14:15 -0700 (Sun, 21 Oct 2007) | 3 lines Add a crasher for the long-standing issue with closing a file while another thread uses it. ........ r58577 | georg.brandl | 2007-10-21 03:01:56 -0700 (Sun, 21 Oct 2007) | 2 lines Remove duplicate crasher. ........ r58578 | georg.brandl | 2007-10-21 03:24:20 -0700 (Sun, 21 Oct 2007) | 2 lines Unify "byte code" to "bytecode". Also sprinkle :term: markup for it. ........ r58579 | georg.brandl | 2007-10-21 03:32:54 -0700 (Sun, 21 Oct 2007) | 2 lines Add markup to new function descriptions. ........ r58580 | georg.brandl | 2007-10-21 03:45:46 -0700 (Sun, 21 Oct 2007) | 2 lines Add :term:s for descriptors. ........ r58581 | georg.brandl | 2007-10-21 03:46:24 -0700 (Sun, 21 Oct 2007) | 2 lines Unify "file-descriptor" to "file descriptor". ........ r58582 | georg.brandl | 2007-10-21 03:52:38 -0700 (Sun, 21 Oct 2007) | 2 lines Add :term: for generators. ........ r58583 | georg.brandl | 2007-10-21 05:10:28 -0700 (Sun, 21 Oct 2007) | 2 lines Add :term:s for iterator. ........ r58584 | georg.brandl | 2007-10-21 05:15:05 -0700 (Sun, 21 Oct 2007) | 2 lines Add :term:s for "new-style class". ........ r58588 | neal.norwitz | 2007-10-21 21:47:54 -0700 (Sun, 21 Oct 2007) | 1 line Add Chris Monson so he can edit PEPs. ........ r58594 | guido.van.rossum | 2007-10-22 09:27:19 -0700 (Mon, 22 Oct 2007) | 4 lines Issue #1307, patch by Derek Shockey. When "MAIL" is received without args, an exception happens instead of sending a 501 syntax error response. ........ r58598 | travis.oliphant | 2007-10-22 19:40:56 -0700 (Mon, 22 Oct 2007) | 1 line Add phuang patch from Issue 708374 which adds offset parameter to mmap module. ........ r58601 | neal.norwitz | 2007-10-22 22:44:27 -0700 (Mon, 22 Oct 2007) | 2 lines Bug #1313, fix typo (wrong variable name) in example. ........ r58609 | georg.brandl | 2007-10-23 11:21:35 -0700 (Tue, 23 Oct 2007) | 2 lines Update Pygments version from externals. ........ r58618 | guido.van.rossum | 2007-10-23 12:25:41 -0700 (Tue, 23 Oct 2007) | 3 lines Issue 1307 by Derek Shockey, fox the same bug for RCPT. Neal: please backport! ........ r58620 | raymond.hettinger | 2007-10-23 13:37:41 -0700 (Tue, 23 Oct 2007) | 1 line Shorter name for namedtuple() ........ r58621 | andrew.kuchling | 2007-10-23 13:55:47 -0700 (Tue, 23 Oct 2007) | 1 line Update name ........ r58622 | raymond.hettinger | 2007-10-23 14:23:07 -0700 (Tue, 23 Oct 2007) | 1 line Fixup news entry ........ r58623 | raymond.hettinger | 2007-10-23 18:28:33 -0700 (Tue, 23 Oct 2007) | 1 line Optimize sum() for integer and float inputs. ........ r58624 | raymond.hettinger | 2007-10-23 19:05:51 -0700 (Tue, 23 Oct 2007) | 1 line Fixup error return and add support for intermixed ints and floats/ ........ r58628 | vinay.sajip | 2007-10-24 03:47:06 -0700 (Wed, 24 Oct 2007) | 1 line Bug #1321: Fixed logic error in TimedRotatingFileHandler.__init__() ........ r58641 | facundo.batista | 2007-10-24 12:11:08 -0700 (Wed, 24 Oct 2007) | 4 lines Issue 1290. CharacterData.__repr__ was constructing a string in response that keeped having a non-ascii character. ........ r58643 | thomas.heller | 2007-10-24 12:50:45 -0700 (Wed, 24 Oct 2007) | 1 line Added unittest for calling a function with paramflags (backport from py3k branch). ........ r58645 | matthias.klose | 2007-10-24 13:00:44 -0700 (Wed, 24 Oct 2007) | 2 lines - Build using system ffi library on arm*-linux*. ........ r58651 | georg.brandl | 2007-10-24 14:40:38 -0700 (Wed, 24 Oct 2007) | 2 lines Bug #1287: make os.environ.pop() work as expected. ........ r58652 | raymond.hettinger | 2007-10-24 19:26:58 -0700 (Wed, 24 Oct 2007) | 1 line Missing DECREFs ........ r58653 | matthias.klose | 2007-10-24 23:37:24 -0700 (Wed, 24 Oct 2007) | 2 lines - Build using system ffi library on arm*-linux*, pass --with-system-ffi to CONFIG_ARGS ........ r58655 | thomas.heller | 2007-10-25 12:47:32 -0700 (Thu, 25 Oct 2007) | 2 lines ffi_type_longdouble may be already #defined. See issue 1324. ........ r58656 | kurt.kaiser | 2007-10-25 15:43:45 -0700 (Thu, 25 Oct 2007) | 3 lines Correct an ancient bug in an unused path by removing that path: register() is now idempotent. ........ r58660 | kurt.kaiser | 2007-10-25 17:10:09 -0700 (Thu, 25 Oct 2007) | 4 lines 1. Add comments to provide top-level documentation. 2. Refactor to use more descriptive names. 3. Enhance tests in main(). ........ r58675 | georg.brandl | 2007-10-26 11:30:41 -0700 (Fri, 26 Oct 2007) | 2 lines Fix new pop() method on os.environ on ignorecase-platforms. ........ r58696 | neal.norwitz | 2007-10-27 15:32:21 -0700 (Sat, 27 Oct 2007) | 1 line Update URL for Pygments. 0.8.1 is no longer available ........ r58697 | hyeshik.chang | 2007-10-28 04:19:02 -0700 (Sun, 28 Oct 2007) | 3 lines - Add support for FreeBSD 8 which is recently forked from FreeBSD 7. - Regenerate IN module for most recent maintenance tree of FreeBSD 6 and 7. ........ r58698 | hyeshik.chang | 2007-10-28 05:38:09 -0700 (Sun, 28 Oct 2007) | 2 lines Enable platform-specific tweaks for FreeBSD 8 (exactly same to FreeBSD 7's yet) ........ r58700 | kurt.kaiser | 2007-10-28 12:03:59 -0700 (Sun, 28 Oct 2007) | 2 lines Add confirmation dialog before printing. Patch 1717170 Tal Einat. ........ r58706 | guido.van.rossum | 2007-10-29 13:52:45 -0700 (Mon, 29 Oct 2007) | 3 lines Patch 1353 by Jacob Winther. Add mp4 mapping to mimetypes.py. ........ r58709 | guido.van.rossum | 2007-10-29 15:15:05 -0700 (Mon, 29 Oct 2007) | 6 lines Backport fixes for the code that decodes octal escapes (and for PyString also hex escapes) -- this was reaching beyond the end of the input string buffer, even though it is not supposed to be \0-terminated. This has no visible effect but is clearly the correct thing to do. (In 3.0 it had a visible effect after removing ob_sstate from PyString.) ........ r58710 | kurt.kaiser | 2007-10-29 19:38:54 -0700 (Mon, 29 Oct 2007) | 7 lines check in Tal Einat's update to tabpage.py Patch 1612746 M configDialog.py M NEWS.txt AM tabbedpages.py ........ r58715 | georg.brandl | 2007-10-30 10:51:18 -0700 (Tue, 30 Oct 2007) | 2 lines Use correct markup. ........ r58716 | georg.brandl | 2007-10-30 10:57:12 -0700 (Tue, 30 Oct 2007) | 2 lines Make example about hiding None return values at the prompt clearer. ........ r58728 | neal.norwitz | 2007-10-30 23:33:20 -0700 (Tue, 30 Oct 2007) | 1 line Fix some compiler warnings for signed comparisons on Unix and Windows. ........ r58731 | martin.v.loewis | 2007-10-31 10:19:33 -0700 (Wed, 31 Oct 2007) | 2 lines Adding Christian Heimes. ........ r58737 | raymond.hettinger | 2007-10-31 14:57:58 -0700 (Wed, 31 Oct 2007) | 1 line Clarify the reasons why pickle is almost always better than marshal ........ r58739 | raymond.hettinger | 2007-10-31 15:15:49 -0700 (Wed, 31 Oct 2007) | 1 line Sets are marshalable. ........
1373 lines
46 KiB
Python
1373 lines
46 KiB
Python
# Copyright 2001-2007 by Vinay Sajip. All Rights Reserved.
|
|
#
|
|
# Permission to use, copy, modify, and distribute this software and its
|
|
# documentation for any purpose and without fee is hereby granted,
|
|
# provided that the above copyright notice appear in all copies and that
|
|
# both that copyright notice and this permission notice appear in
|
|
# supporting documentation, and that the name of Vinay Sajip
|
|
# not be used in advertising or publicity pertaining to distribution
|
|
# of the software without specific, written prior permission.
|
|
# VINAY SAJIP DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
|
|
# ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
|
|
# VINAY SAJIP BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
|
|
# ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
|
|
# IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
|
|
# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
|
|
"""
|
|
Logging package for Python. Based on PEP 282 and comments thereto in
|
|
comp.lang.python, and influenced by Apache's log4j system.
|
|
|
|
Should work under Python versions >= 1.5.2, except that source line
|
|
information is not available unless 'sys._getframe()' is.
|
|
|
|
Copyright (C) 2001-2007 Vinay Sajip. All Rights Reserved.
|
|
|
|
To use, simply 'import logging' and log away!
|
|
"""
|
|
|
|
import sys, os, time, io, traceback
|
|
|
|
try:
|
|
import codecs
|
|
except ImportError:
|
|
codecs = None
|
|
|
|
try:
|
|
import thread
|
|
import threading
|
|
except ImportError:
|
|
thread = None
|
|
|
|
__author__ = "Vinay Sajip <vinay_sajip@red-dove.com>"
|
|
__status__ = "production"
|
|
__version__ = "0.5.0.3"
|
|
__date__ = "26 September 2007"
|
|
|
|
#---------------------------------------------------------------------------
|
|
# Miscellaneous module data
|
|
#---------------------------------------------------------------------------
|
|
|
|
_unicode = 'unicode' in dir(__builtins__)
|
|
|
|
#
|
|
# _srcfile is used when walking the stack to check when we've got the first
|
|
# caller stack frame.
|
|
#
|
|
if hasattr(sys, 'frozen'): #support for py2exe
|
|
_srcfile = "logging%s__init__%s" % (os.sep, __file__[-4:])
|
|
elif __file__[-4:].lower() in ['.pyc', '.pyo']:
|
|
_srcfile = __file__[:-4] + '.py'
|
|
else:
|
|
_srcfile = __file__
|
|
_srcfile = os.path.normcase(_srcfile)
|
|
|
|
# next bit filched from 1.5.2's inspect.py
|
|
def currentframe():
|
|
"""Return the frame object for the caller's stack frame."""
|
|
try:
|
|
raise Exception
|
|
except:
|
|
return sys.exc_info()[2].tb_frame.f_back
|
|
|
|
if hasattr(sys, '_getframe'): currentframe = lambda: sys._getframe(3)
|
|
# done filching
|
|
|
|
# _srcfile is only used in conjunction with sys._getframe().
|
|
# To provide compatibility with older versions of Python, set _srcfile
|
|
# to None if _getframe() is not available; this value will prevent
|
|
# findCaller() from being called.
|
|
#if not hasattr(sys, "_getframe"):
|
|
# _srcfile = None
|
|
|
|
#
|
|
#_startTime is used as the base when calculating the relative time of events
|
|
#
|
|
_startTime = time.time()
|
|
|
|
#
|
|
#raiseExceptions is used to see if exceptions during handling should be
|
|
#propagated
|
|
#
|
|
raiseExceptions = 1
|
|
|
|
#
|
|
# If you don't want threading information in the log, set this to zero
|
|
#
|
|
logThreads = 1
|
|
|
|
#
|
|
# If you don't want process information in the log, set this to zero
|
|
#
|
|
logProcesses = 1
|
|
|
|
#---------------------------------------------------------------------------
|
|
# Level related stuff
|
|
#---------------------------------------------------------------------------
|
|
#
|
|
# Default levels and level names, these can be replaced with any positive set
|
|
# of values having corresponding names. There is a pseudo-level, NOTSET, which
|
|
# is only really there as a lower limit for user-defined levels. Handlers and
|
|
# loggers are initialized with NOTSET so that they will log all messages, even
|
|
# at user-defined levels.
|
|
#
|
|
|
|
CRITICAL = 50
|
|
FATAL = CRITICAL
|
|
ERROR = 40
|
|
WARNING = 30
|
|
WARN = WARNING
|
|
INFO = 20
|
|
DEBUG = 10
|
|
NOTSET = 0
|
|
|
|
_levelNames = {
|
|
CRITICAL : 'CRITICAL',
|
|
ERROR : 'ERROR',
|
|
WARNING : 'WARNING',
|
|
INFO : 'INFO',
|
|
DEBUG : 'DEBUG',
|
|
NOTSET : 'NOTSET',
|
|
'CRITICAL' : CRITICAL,
|
|
'ERROR' : ERROR,
|
|
'WARN' : WARNING,
|
|
'WARNING' : WARNING,
|
|
'INFO' : INFO,
|
|
'DEBUG' : DEBUG,
|
|
'NOTSET' : NOTSET,
|
|
}
|
|
|
|
def getLevelName(level):
|
|
"""
|
|
Return the textual representation of logging level 'level'.
|
|
|
|
If the level is one of the predefined levels (CRITICAL, ERROR, WARNING,
|
|
INFO, DEBUG) then you get the corresponding string. If you have
|
|
associated levels with names using addLevelName then the name you have
|
|
associated with 'level' 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" % level is returned.
|
|
"""
|
|
return _levelNames.get(level, ("Level %s" % level))
|
|
|
|
def addLevelName(level, levelName):
|
|
"""
|
|
Associate 'levelName' with 'level'.
|
|
|
|
This is used when converting levels to text during message formatting.
|
|
"""
|
|
_acquireLock()
|
|
try: #unlikely to cause an exception, but you never know...
|
|
_levelNames[level] = levelName
|
|
_levelNames[levelName] = level
|
|
finally:
|
|
_releaseLock()
|
|
|
|
#---------------------------------------------------------------------------
|
|
# Thread-related stuff
|
|
#---------------------------------------------------------------------------
|
|
|
|
#
|
|
#_lock is used to serialize access to shared data structures in this module.
|
|
#This needs to be an RLock because fileConfig() creates Handlers and so
|
|
#might arbitrary user threads. Since Handler.__init__() updates the shared
|
|
#dictionary _handlers, it needs to acquire the lock. But if configuring,
|
|
#the lock would already have been acquired - so we need an RLock.
|
|
#The same argument applies to Loggers and Manager.loggerDict.
|
|
#
|
|
_lock = None
|
|
|
|
def _acquireLock():
|
|
"""
|
|
Acquire the module-level lock for serializing access to shared data.
|
|
|
|
This should be released with _releaseLock().
|
|
"""
|
|
global _lock
|
|
if (not _lock) and thread:
|
|
_lock = threading.RLock()
|
|
if _lock:
|
|
_lock.acquire()
|
|
|
|
def _releaseLock():
|
|
"""
|
|
Release the module-level lock acquired by calling _acquireLock().
|
|
"""
|
|
if _lock:
|
|
_lock.release()
|
|
|
|
#---------------------------------------------------------------------------
|
|
# The logging record
|
|
#---------------------------------------------------------------------------
|
|
|
|
class LogRecord:
|
|
"""
|
|
A LogRecord instance represents an event being logged.
|
|
|
|
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 str(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.
|
|
"""
|
|
def __init__(self, name, level, pathname, lineno,
|
|
msg, args, exc_info, func=None):
|
|
"""
|
|
Initialize a logging record with interesting information.
|
|
"""
|
|
ct = time.time()
|
|
self.name = name
|
|
self.msg = msg
|
|
#
|
|
# The following statement allows passing of a dictionary as a sole
|
|
# argument, so that you can do something like
|
|
# logging.debug("a %(a)d b %(b)s", {'a':1, 'b':2})
|
|
# Suggested by Stefan Behnel.
|
|
# Note that without the test for args[0], we get a problem because
|
|
# during formatting, we test to see if the arg is present using
|
|
# 'if self.args:'. If the event being logged is e.g. 'Value is %d'
|
|
# and if the passed arg fails 'if self.args:' then no formatting
|
|
# is done. For example, logger.warn('Value is %d', 0) would log
|
|
# 'Value is %d' instead of 'Value is 0'.
|
|
# For the use case of passing a dictionary, this should not be a
|
|
# problem.
|
|
if args and len(args) == 1 and isinstance(args[0], dict) and args[0]:
|
|
args = args[0]
|
|
self.args = args
|
|
self.levelname = getLevelName(level)
|
|
self.levelno = level
|
|
self.pathname = pathname
|
|
try:
|
|
self.filename = os.path.basename(pathname)
|
|
self.module = os.path.splitext(self.filename)[0]
|
|
except (TypeError, ValueError, AttributeError):
|
|
self.filename = pathname
|
|
self.module = "Unknown module"
|
|
self.exc_info = exc_info
|
|
self.exc_text = None # used to cache the traceback text
|
|
self.lineno = lineno
|
|
self.funcName = func
|
|
self.created = ct
|
|
self.msecs = (ct - int(ct)) * 1000
|
|
self.relativeCreated = (self.created - _startTime) * 1000
|
|
if logThreads and thread:
|
|
self.thread = thread.get_ident()
|
|
self.threadName = threading.currentThread().getName()
|
|
else:
|
|
self.thread = None
|
|
self.threadName = None
|
|
if logProcesses and hasattr(os, 'getpid'):
|
|
self.process = os.getpid()
|
|
else:
|
|
self.process = None
|
|
|
|
def __str__(self):
|
|
return '<LogRecord: %s, %s, %s, %s, "%s">'%(self.name, self.levelno,
|
|
self.pathname, self.lineno, self.msg)
|
|
|
|
def getMessage(self):
|
|
"""
|
|
Return the message for this LogRecord.
|
|
|
|
Return the message for this LogRecord after merging any user-supplied
|
|
arguments with the message.
|
|
"""
|
|
if not _unicode: #if no unicode support...
|
|
msg = str(self.msg)
|
|
else:
|
|
msg = self.msg
|
|
if not isinstance(msg, str):
|
|
try:
|
|
msg = str(self.msg)
|
|
except UnicodeError:
|
|
msg = self.msg #Defer encoding till later
|
|
if self.args:
|
|
msg = msg % self.args
|
|
return msg
|
|
|
|
def makeLogRecord(dict):
|
|
"""
|
|
Make a LogRecord whose attributes are defined by the specified dictionary,
|
|
This function is useful for converting a logging event received over
|
|
a socket connection (which is sent as a dictionary) into a LogRecord
|
|
instance.
|
|
"""
|
|
rv = LogRecord(None, None, "", 0, "", (), None, None)
|
|
rv.__dict__.update(dict)
|
|
return rv
|
|
|
|
#---------------------------------------------------------------------------
|
|
# Formatter classes and functions
|
|
#---------------------------------------------------------------------------
|
|
|
|
class Formatter:
|
|
"""
|
|
Formatter instances are used to convert a LogRecord to text.
|
|
|
|
Formatters need to know how a LogRecord is constructed. They are
|
|
responsible for converting a LogRecord to (usually) a string which can
|
|
be interpreted by either a human or an external system. The base Formatter
|
|
allows a formatting string to be specified. If none is supplied, the
|
|
default value of "%s(message)\\n" is used.
|
|
|
|
The Formatter can be initialized with a format string which makes use of
|
|
knowledge of the LogRecord attributes - e.g. the default value mentioned
|
|
above makes use of the fact that the user's message and arguments are pre-
|
|
formatted into a LogRecord's message attribute. Currently, the useful
|
|
attributes in a LogRecord are described by:
|
|
|
|
%(name)s Name of the logger (logging channel)
|
|
%(levelno)s Numeric logging level for the message (DEBUG, INFO,
|
|
WARNING, ERROR, CRITICAL)
|
|
%(levelname)s Text logging level for the message ("DEBUG", "INFO",
|
|
"WARNING", "ERROR", "CRITICAL")
|
|
%(pathname)s Full pathname of the source file where the logging
|
|
call was issued (if available)
|
|
%(filename)s Filename portion of pathname
|
|
%(module)s Module (name portion of filename)
|
|
%(lineno)d Source line number where the logging call was issued
|
|
(if available)
|
|
%(funcName)s Function name
|
|
%(created)f Time when the LogRecord was created (time.time()
|
|
return value)
|
|
%(asctime)s Textual time when the LogRecord was created
|
|
%(msecs)d Millisecond portion of the creation time
|
|
%(relativeCreated)d Time in milliseconds when the LogRecord was created,
|
|
relative to the time the logging module was loaded
|
|
(typically at application startup time)
|
|
%(thread)d Thread ID (if available)
|
|
%(threadName)s Thread name (if available)
|
|
%(process)d Process ID (if available)
|
|
%(message)s The result of record.getMessage(), computed just as
|
|
the record is emitted
|
|
"""
|
|
|
|
converter = time.localtime
|
|
|
|
def __init__(self, fmt=None, datefmt=None):
|
|
"""
|
|
Initialize the formatter with specified format strings.
|
|
|
|
Initialize the formatter either with the specified format string, or a
|
|
default as described above. Allow for specialized date formatting with
|
|
the optional datefmt argument (if omitted, you get the ISO8601 format).
|
|
"""
|
|
if fmt:
|
|
self._fmt = fmt
|
|
else:
|
|
self._fmt = "%(message)s"
|
|
self.datefmt = datefmt
|
|
|
|
def formatTime(self, record, datefmt=None):
|
|
"""
|
|
Return the creation time of the specified LogRecord as formatted text.
|
|
|
|
This method should be called from 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 behaviour is as follows: if datefmt (a string) is specified,
|
|
it is used with time.strftime() to format the creation time of the
|
|
record. Otherwise, the ISO8601 format is used. The resulting
|
|
string is returned. This function uses a user-configurable function
|
|
to convert the creation time to a tuple. By default, time.localtime()
|
|
is used; to change this for a particular formatter instance, set the
|
|
'converter' attribute to a function with the same signature as
|
|
time.localtime() or time.gmtime(). To change it for all formatters,
|
|
for example if you want all logging times to be shown in GMT,
|
|
set the 'converter' attribute in the Formatter class.
|
|
"""
|
|
ct = self.converter(record.created)
|
|
if datefmt:
|
|
s = time.strftime(datefmt, ct)
|
|
else:
|
|
t = time.strftime("%Y-%m-%d %H:%M:%S", ct)
|
|
s = "%s,%03d" % (t, record.msecs)
|
|
return s
|
|
|
|
def formatException(self, ei):
|
|
"""
|
|
Format and return the specified exception information as a string.
|
|
|
|
This default implementation just uses
|
|
traceback.print_exception()
|
|
"""
|
|
sio = io.StringIO()
|
|
traceback.print_exception(ei[0], ei[1], ei[2], None, sio)
|
|
s = sio.getvalue()
|
|
sio.close()
|
|
if s[-1:] == "\n":
|
|
s = s[:-1]
|
|
return s
|
|
|
|
def format(self, record):
|
|
"""
|
|
Format the specified record as text.
|
|
|
|
The record's attribute dictionary is used as the operand to a
|
|
string formatting operation which yields the returned string.
|
|
Before formatting the dictionary, a couple of preparatory steps
|
|
are carried out. The message attribute of the record is computed
|
|
using LogRecord.getMessage(). If the formatting string contains
|
|
"%(asctime)", formatTime() is called to format the event time.
|
|
If there is exception information, it is formatted using
|
|
formatException() and appended to the message.
|
|
"""
|
|
record.message = record.getMessage()
|
|
if self._fmt.find("%(asctime)") >= 0:
|
|
record.asctime = self.formatTime(record, self.datefmt)
|
|
s = self._fmt % record.__dict__
|
|
if record.exc_info:
|
|
# Cache the traceback text to avoid converting it multiple times
|
|
# (it's constant anyway)
|
|
if not record.exc_text:
|
|
record.exc_text = self.formatException(record.exc_info)
|
|
if record.exc_text:
|
|
if s[-1:] != "\n":
|
|
s = s + "\n"
|
|
s = s + record.exc_text
|
|
return s
|
|
|
|
#
|
|
# The default formatter to use when no other is specified
|
|
#
|
|
_defaultFormatter = Formatter()
|
|
|
|
class BufferingFormatter:
|
|
"""
|
|
A formatter suitable for formatting a number of records.
|
|
"""
|
|
def __init__(self, linefmt=None):
|
|
"""
|
|
Optionally specify a formatter which will be used to format each
|
|
individual record.
|
|
"""
|
|
if linefmt:
|
|
self.linefmt = linefmt
|
|
else:
|
|
self.linefmt = _defaultFormatter
|
|
|
|
def formatHeader(self, records):
|
|
"""
|
|
Return the header string for the specified records.
|
|
"""
|
|
return ""
|
|
|
|
def formatFooter(self, records):
|
|
"""
|
|
Return the footer string for the specified records.
|
|
"""
|
|
return ""
|
|
|
|
def format(self, records):
|
|
"""
|
|
Format the specified records and return the result as a string.
|
|
"""
|
|
rv = ""
|
|
if len(records) > 0:
|
|
rv = rv + self.formatHeader(records)
|
|
for record in records:
|
|
rv = rv + self.linefmt.format(record)
|
|
rv = rv + self.formatFooter(records)
|
|
return rv
|
|
|
|
#---------------------------------------------------------------------------
|
|
# Filter classes and functions
|
|
#---------------------------------------------------------------------------
|
|
|
|
class Filter:
|
|
"""
|
|
Filter instances are used to perform arbitrary filtering of LogRecords.
|
|
|
|
Loggers and Handlers can optionally use Filter instances to filter
|
|
records as desired. 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.
|
|
"""
|
|
def __init__(self, name=''):
|
|
"""
|
|
Initialize a filter.
|
|
|
|
Initialize with the name of the logger which, together with its
|
|
children, will have its events allowed through the filter. If no
|
|
name is specified, allow every event.
|
|
"""
|
|
self.name = name
|
|
self.nlen = len(name)
|
|
|
|
def filter(self, record):
|
|
"""
|
|
Determine if the specified record is to be logged.
|
|
|
|
Is the specified record to be logged? Returns 0 for no, nonzero for
|
|
yes. If deemed appropriate, the record may be modified in-place.
|
|
"""
|
|
if self.nlen == 0:
|
|
return 1
|
|
elif self.name == record.name:
|
|
return 1
|
|
elif record.name.find(self.name, 0, self.nlen) != 0:
|
|
return 0
|
|
return (record.name[self.nlen] == ".")
|
|
|
|
class Filterer:
|
|
"""
|
|
A base class for loggers and handlers which allows them to share
|
|
common code.
|
|
"""
|
|
def __init__(self):
|
|
"""
|
|
Initialize the list of filters to be an empty list.
|
|
"""
|
|
self.filters = []
|
|
|
|
def addFilter(self, filter):
|
|
"""
|
|
Add the specified filter to this handler.
|
|
"""
|
|
if not (filter in self.filters):
|
|
self.filters.append(filter)
|
|
|
|
def removeFilter(self, filter):
|
|
"""
|
|
Remove the specified filter from this handler.
|
|
"""
|
|
if filter in self.filters:
|
|
self.filters.remove(filter)
|
|
|
|
def filter(self, record):
|
|
"""
|
|
Determine if a record is loggable by consulting all the filters.
|
|
|
|
The default is to allow the record to be logged; any filter can veto
|
|
this and the record is then dropped. Returns a zero value if a record
|
|
is to be dropped, else non-zero.
|
|
"""
|
|
rv = 1
|
|
for f in self.filters:
|
|
if not f.filter(record):
|
|
rv = 0
|
|
break
|
|
return rv
|
|
|
|
#---------------------------------------------------------------------------
|
|
# Handler classes and functions
|
|
#---------------------------------------------------------------------------
|
|
|
|
_handlers = {} #repository of handlers (for flushing when shutdown called)
|
|
_handlerList = [] # added to allow handlers to be removed in reverse of order initialized
|
|
|
|
class Handler(Filterer):
|
|
"""
|
|
Handler instances dispatch logging events to specific destinations.
|
|
|
|
The base handler class. Acts as a placeholder which defines the Handler
|
|
interface. Handlers can optionally use Formatter instances to format
|
|
records as desired. By default, no formatter is specified; in this case,
|
|
the 'raw' message as determined by record.message is logged.
|
|
"""
|
|
def __init__(self, level=NOTSET):
|
|
"""
|
|
Initializes the instance - basically setting the formatter to None
|
|
and the filter list to empty.
|
|
"""
|
|
Filterer.__init__(self)
|
|
self.level = level
|
|
self.formatter = None
|
|
#get the module data lock, as we're updating a shared structure.
|
|
_acquireLock()
|
|
try: #unlikely to raise an exception, but you never know...
|
|
_handlers[self] = 1
|
|
_handlerList.insert(0, self)
|
|
finally:
|
|
_releaseLock()
|
|
self.createLock()
|
|
|
|
def createLock(self):
|
|
"""
|
|
Acquire a thread lock for serializing access to the underlying I/O.
|
|
"""
|
|
if thread:
|
|
self.lock = threading.RLock()
|
|
else:
|
|
self.lock = None
|
|
|
|
def acquire(self):
|
|
"""
|
|
Acquire the I/O thread lock.
|
|
"""
|
|
if self.lock:
|
|
self.lock.acquire()
|
|
|
|
def release(self):
|
|
"""
|
|
Release the I/O thread lock.
|
|
"""
|
|
if self.lock:
|
|
self.lock.release()
|
|
|
|
def setLevel(self, level):
|
|
"""
|
|
Set the logging level of this handler.
|
|
"""
|
|
self.level = level
|
|
|
|
def format(self, record):
|
|
"""
|
|
Format the specified record.
|
|
|
|
If a formatter is set, use it. Otherwise, use the default formatter
|
|
for the module.
|
|
"""
|
|
if self.formatter:
|
|
fmt = self.formatter
|
|
else:
|
|
fmt = _defaultFormatter
|
|
return fmt.format(record)
|
|
|
|
def emit(self, 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 NotImplementedError.
|
|
"""
|
|
raise NotImplementedError('emit must be implemented '
|
|
'by Handler subclasses')
|
|
|
|
def handle(self, record):
|
|
"""
|
|
Conditionally emit the specified logging record.
|
|
|
|
Emission depends on filters which may have been added to the handler.
|
|
Wrap the actual emission of the record with acquisition/release of
|
|
the I/O thread lock. Returns whether the filter passed the record for
|
|
emission.
|
|
"""
|
|
rv = self.filter(record)
|
|
if rv:
|
|
self.acquire()
|
|
try:
|
|
self.emit(record)
|
|
finally:
|
|
self.release()
|
|
return rv
|
|
|
|
def setFormatter(self, fmt):
|
|
"""
|
|
Set the formatter for this handler.
|
|
"""
|
|
self.formatter = fmt
|
|
|
|
def flush(self):
|
|
"""
|
|
Ensure all logging output has been flushed.
|
|
|
|
This version does nothing and is intended to be implemented by
|
|
subclasses.
|
|
"""
|
|
pass
|
|
|
|
def close(self):
|
|
"""
|
|
Tidy up any resources used by the handler.
|
|
|
|
This version does removes the handler from an internal list
|
|
of handlers which is closed when shutdown() is called. Subclasses
|
|
should ensure that this gets called from overridden close()
|
|
methods.
|
|
"""
|
|
#get the module data lock, as we're updating a shared structure.
|
|
_acquireLock()
|
|
try: #unlikely to raise an exception, but you never know...
|
|
del _handlers[self]
|
|
_handlerList.remove(self)
|
|
finally:
|
|
_releaseLock()
|
|
|
|
def handleError(self, record):
|
|
"""
|
|
Handle errors which occur during an emit() call.
|
|
|
|
This method should be called from handlers when an exception is
|
|
encountered during an emit() call. If raiseExceptions is false,
|
|
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 record which was being processed is passed in to this method.
|
|
"""
|
|
if raiseExceptions:
|
|
ei = sys.exc_info()
|
|
traceback.print_exception(ei[0], ei[1], ei[2], None, sys.stderr)
|
|
del ei
|
|
|
|
class StreamHandler(Handler):
|
|
"""
|
|
A handler class which writes logging records, appropriately formatted,
|
|
to a stream. Note that this class does not close the stream, as
|
|
sys.stdout or sys.stderr may be used.
|
|
"""
|
|
def __init__(self, strm=None):
|
|
"""
|
|
Initialize the handler.
|
|
|
|
If strm is not specified, sys.stderr is used.
|
|
"""
|
|
Handler.__init__(self)
|
|
if strm is None:
|
|
strm = sys.stderr
|
|
self.stream = strm
|
|
self.formatter = None
|
|
|
|
def flush(self):
|
|
"""
|
|
Flushes the stream.
|
|
"""
|
|
if self.stream:
|
|
self.stream.flush()
|
|
|
|
def emit(self, record):
|
|
"""
|
|
Emit a 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
|
|
[N.B. this may be removed depending on feedback]. If exception
|
|
information is present, it is formatted using
|
|
traceback.print_exception and appended to the stream.
|
|
"""
|
|
try:
|
|
msg = self.format(record)
|
|
fs = "%s\n"
|
|
if not _unicode: #if no unicode support...
|
|
self.stream.write(fs % msg)
|
|
else:
|
|
try:
|
|
self.stream.write(fs % msg)
|
|
except UnicodeError:
|
|
self.stream.write(fs % msg.encode("UTF-8"))
|
|
self.flush()
|
|
except (KeyboardInterrupt, SystemExit):
|
|
raise
|
|
except:
|
|
self.handleError(record)
|
|
|
|
class FileHandler(StreamHandler):
|
|
"""
|
|
A handler class which writes formatted logging records to disk files.
|
|
"""
|
|
def __init__(self, filename, mode='a', encoding=None):
|
|
"""
|
|
Open the specified file and use it as the stream for logging.
|
|
"""
|
|
#keep the absolute path, otherwise derived classes which use this
|
|
#may come a cropper when the current directory changes
|
|
if codecs is None:
|
|
encoding = None
|
|
self.baseFilename = os.path.abspath(filename)
|
|
self.mode = mode
|
|
self.encoding = encoding
|
|
stream = self._open()
|
|
StreamHandler.__init__(self, stream)
|
|
|
|
def close(self):
|
|
"""
|
|
Closes the stream.
|
|
"""
|
|
if self.stream:
|
|
self.flush()
|
|
self.stream.close()
|
|
StreamHandler.close(self)
|
|
self.stream = None
|
|
|
|
def _open(self):
|
|
"""
|
|
Open the current base file with the (original) mode and encoding.
|
|
Return the resulting stream.
|
|
"""
|
|
if self.encoding is None:
|
|
stream = open(self.baseFilename, self.mode)
|
|
else:
|
|
stream = codecs.open(self.baseFilename, self.mode, self.encoding)
|
|
return stream
|
|
|
|
#---------------------------------------------------------------------------
|
|
# Manager classes and functions
|
|
#---------------------------------------------------------------------------
|
|
|
|
class PlaceHolder:
|
|
"""
|
|
PlaceHolder instances are used in the Manager logger hierarchy to take
|
|
the place of nodes for which no loggers have been defined. This class is
|
|
intended for internal use only and not as part of the public API.
|
|
"""
|
|
def __init__(self, alogger):
|
|
"""
|
|
Initialize with the specified logger being a child of this placeholder.
|
|
"""
|
|
#self.loggers = [alogger]
|
|
self.loggerMap = { alogger : None }
|
|
|
|
def append(self, alogger):
|
|
"""
|
|
Add the specified logger as a child of this placeholder.
|
|
"""
|
|
#if alogger not in self.loggers:
|
|
if alogger not in self.loggerMap:
|
|
#self.loggers.append(alogger)
|
|
self.loggerMap[alogger] = None
|
|
|
|
#
|
|
# Determine which class to use when instantiating loggers.
|
|
#
|
|
_loggerClass = None
|
|
|
|
def setLoggerClass(klass):
|
|
"""
|
|
Set the class to be used when instantiating a logger. The class should
|
|
define __init__() such that only a name argument is required, and the
|
|
__init__() should call Logger.__init__()
|
|
"""
|
|
if klass != Logger:
|
|
if not issubclass(klass, Logger):
|
|
raise TypeError("logger not derived from logging.Logger: "
|
|
+ klass.__name__)
|
|
global _loggerClass
|
|
_loggerClass = klass
|
|
|
|
def getLoggerClass():
|
|
"""
|
|
Return the class to be used when instantiating a logger.
|
|
"""
|
|
|
|
return _loggerClass
|
|
|
|
class Manager:
|
|
"""
|
|
There is [under normal circumstances] just one Manager instance, which
|
|
holds the hierarchy of loggers.
|
|
"""
|
|
def __init__(self, rootnode):
|
|
"""
|
|
Initialize the manager with the root node of the logger hierarchy.
|
|
"""
|
|
self.root = rootnode
|
|
self.disable = 0
|
|
self.emittedNoHandlerWarning = 0
|
|
self.loggerDict = {}
|
|
|
|
def getLogger(self, name):
|
|
"""
|
|
Get a logger with the specified name (channel name), creating it
|
|
if it doesn't yet exist. This name is a dot-separated hierarchical
|
|
name, such as "a", "a.b", "a.b.c" or similar.
|
|
|
|
If a PlaceHolder existed for the specified name [i.e. the logger
|
|
didn't exist but a child of it did], replace it with the created
|
|
logger and fix up the parent/child references which pointed to the
|
|
placeholder to now point to the logger.
|
|
"""
|
|
rv = None
|
|
_acquireLock()
|
|
try:
|
|
if name in self.loggerDict:
|
|
rv = self.loggerDict[name]
|
|
if isinstance(rv, PlaceHolder):
|
|
ph = rv
|
|
rv = _loggerClass(name)
|
|
rv.manager = self
|
|
self.loggerDict[name] = rv
|
|
self._fixupChildren(ph, rv)
|
|
self._fixupParents(rv)
|
|
else:
|
|
rv = _loggerClass(name)
|
|
rv.manager = self
|
|
self.loggerDict[name] = rv
|
|
self._fixupParents(rv)
|
|
finally:
|
|
_releaseLock()
|
|
return rv
|
|
|
|
def _fixupParents(self, alogger):
|
|
"""
|
|
Ensure that there are either loggers or placeholders all the way
|
|
from the specified logger to the root of the logger hierarchy.
|
|
"""
|
|
name = alogger.name
|
|
i = name.rfind(".")
|
|
rv = None
|
|
while (i > 0) and not rv:
|
|
substr = name[:i]
|
|
if substr not in self.loggerDict:
|
|
self.loggerDict[substr] = PlaceHolder(alogger)
|
|
else:
|
|
obj = self.loggerDict[substr]
|
|
if isinstance(obj, Logger):
|
|
rv = obj
|
|
else:
|
|
assert isinstance(obj, PlaceHolder)
|
|
obj.append(alogger)
|
|
i = name.rfind(".", 0, i - 1)
|
|
if not rv:
|
|
rv = self.root
|
|
alogger.parent = rv
|
|
|
|
def _fixupChildren(self, ph, alogger):
|
|
"""
|
|
Ensure that children of the placeholder ph are connected to the
|
|
specified logger.
|
|
"""
|
|
name = alogger.name
|
|
namelen = len(name)
|
|
for c in ph.loggerMap.keys():
|
|
#The if means ... if not c.parent.name.startswith(nm)
|
|
if c.parent.name[:namelen] != name:
|
|
alogger.parent = c.parent
|
|
c.parent = alogger
|
|
|
|
#---------------------------------------------------------------------------
|
|
# Logger classes and functions
|
|
#---------------------------------------------------------------------------
|
|
|
|
class Logger(Filterer):
|
|
"""
|
|
Instances of the Logger class represent a single logging channel. A
|
|
"logging channel" indicates an area of an application. Exactly how an
|
|
"area" is defined is up to the application developer. Since an
|
|
application can have any number of areas, logging channels are identified
|
|
by a unique string. Application areas can be nested (e.g. an area
|
|
of "input processing" might include sub-areas "read CSV files", "read
|
|
XLS files" and "read Gnumeric files"). To cater for this natural nesting,
|
|
channel names are organized into a namespace hierarchy where levels are
|
|
separated by periods, much like the Java or Python package namespace. So
|
|
in the instance given above, channel names might be "input" for the upper
|
|
level, and "input.csv", "input.xls" and "input.gnu" for the sub-levels.
|
|
There is no arbitrary limit to the depth of nesting.
|
|
"""
|
|
def __init__(self, name, level=NOTSET):
|
|
"""
|
|
Initialize the logger with a name and an optional level.
|
|
"""
|
|
Filterer.__init__(self)
|
|
self.name = name
|
|
self.level = level
|
|
self.parent = None
|
|
self.propagate = 1
|
|
self.handlers = []
|
|
self.disabled = 0
|
|
|
|
def setLevel(self, level):
|
|
"""
|
|
Set the logging level of this logger.
|
|
"""
|
|
self.level = level
|
|
|
|
def debug(self, msg, *args, **kwargs):
|
|
"""
|
|
Log 'msg % args' with severity 'DEBUG'.
|
|
|
|
To pass exception information, use the keyword argument exc_info with
|
|
a true value, e.g.
|
|
|
|
logger.debug("Houston, we have a %s", "thorny problem", exc_info=1)
|
|
"""
|
|
if self.isEnabledFor(DEBUG):
|
|
self._log(DEBUG, msg, args, **kwargs)
|
|
|
|
def info(self, msg, *args, **kwargs):
|
|
"""
|
|
Log 'msg % args' with severity 'INFO'.
|
|
|
|
To pass exception information, use the keyword argument exc_info with
|
|
a true value, e.g.
|
|
|
|
logger.info("Houston, we have a %s", "interesting problem", exc_info=1)
|
|
"""
|
|
if self.isEnabledFor(INFO):
|
|
self._log(INFO, msg, args, **kwargs)
|
|
|
|
def warning(self, msg, *args, **kwargs):
|
|
"""
|
|
Log 'msg % args' with severity 'WARNING'.
|
|
|
|
To pass exception information, use the keyword argument exc_info with
|
|
a true value, e.g.
|
|
|
|
logger.warning("Houston, we have a %s", "bit of a problem", exc_info=1)
|
|
"""
|
|
if self.isEnabledFor(WARNING):
|
|
self._log(WARNING, msg, args, **kwargs)
|
|
|
|
warn = warning
|
|
|
|
def error(self, msg, *args, **kwargs):
|
|
"""
|
|
Log 'msg % args' with severity 'ERROR'.
|
|
|
|
To pass exception information, use the keyword argument exc_info with
|
|
a true value, e.g.
|
|
|
|
logger.error("Houston, we have a %s", "major problem", exc_info=1)
|
|
"""
|
|
if self.isEnabledFor(ERROR):
|
|
self._log(ERROR, msg, args, **kwargs)
|
|
|
|
def exception(self, msg, *args):
|
|
"""
|
|
Convenience method for logging an ERROR with exception information.
|
|
"""
|
|
self.error(msg, exc_info=1, *args)
|
|
|
|
def critical(self, msg, *args, **kwargs):
|
|
"""
|
|
Log 'msg % args' with severity 'CRITICAL'.
|
|
|
|
To pass exception information, use the keyword argument exc_info with
|
|
a true value, e.g.
|
|
|
|
logger.critical("Houston, we have a %s", "major disaster", exc_info=1)
|
|
"""
|
|
if self.isEnabledFor(CRITICAL):
|
|
self._log(CRITICAL, msg, args, **kwargs)
|
|
|
|
fatal = critical
|
|
|
|
def log(self, level, msg, *args, **kwargs):
|
|
"""
|
|
Log 'msg % args' with the integer severity 'level'.
|
|
|
|
To pass exception information, use the keyword argument exc_info with
|
|
a true value, e.g.
|
|
|
|
logger.log(level, "We have a %s", "mysterious problem", exc_info=1)
|
|
"""
|
|
if not isinstance(level, int):
|
|
if raiseExceptions:
|
|
raise TypeError("level must be an integer")
|
|
else:
|
|
return
|
|
if self.isEnabledFor(level):
|
|
self._log(level, msg, args, **kwargs)
|
|
|
|
def findCaller(self):
|
|
"""
|
|
Find the stack frame of the caller so that we can note the source
|
|
file name, line number and function name.
|
|
"""
|
|
f = currentframe().f_back
|
|
rv = "(unknown file)", 0, "(unknown function)"
|
|
while hasattr(f, "f_code"):
|
|
co = f.f_code
|
|
filename = os.path.normcase(co.co_filename)
|
|
if filename == _srcfile:
|
|
f = f.f_back
|
|
continue
|
|
rv = (filename, f.f_lineno, co.co_name)
|
|
break
|
|
return rv
|
|
|
|
def makeRecord(self, name, level, fn, lno, msg, args, exc_info, func=None, extra=None):
|
|
"""
|
|
A factory method which can be overridden in subclasses to create
|
|
specialized LogRecords.
|
|
"""
|
|
rv = LogRecord(name, level, fn, lno, msg, args, exc_info, func)
|
|
if extra:
|
|
for key in extra:
|
|
if (key in ["message", "asctime"]) or (key in rv.__dict__):
|
|
raise KeyError("Attempt to overwrite %r in LogRecord" % key)
|
|
rv.__dict__[key] = extra[key]
|
|
return rv
|
|
|
|
def _log(self, level, msg, args, exc_info=None, extra=None):
|
|
"""
|
|
Low-level logging routine which creates a LogRecord and then calls
|
|
all the handlers of this logger to handle the record.
|
|
"""
|
|
if _srcfile:
|
|
fn, lno, func = self.findCaller()
|
|
else:
|
|
fn, lno, func = "(unknown file)", 0, "(unknown function)"
|
|
if exc_info:
|
|
if not isinstance(exc_info, tuple):
|
|
exc_info = sys.exc_info()
|
|
record = self.makeRecord(self.name, level, fn, lno, msg, args, exc_info, func, extra)
|
|
self.handle(record)
|
|
|
|
def handle(self, record):
|
|
"""
|
|
Call the handlers for the specified record.
|
|
|
|
This method is used for unpickled records received from a socket, as
|
|
well as those created locally. Logger-level filtering is applied.
|
|
"""
|
|
if (not self.disabled) and self.filter(record):
|
|
self.callHandlers(record)
|
|
|
|
def addHandler(self, hdlr):
|
|
"""
|
|
Add the specified handler to this logger.
|
|
"""
|
|
if not (hdlr in self.handlers):
|
|
self.handlers.append(hdlr)
|
|
|
|
def removeHandler(self, hdlr):
|
|
"""
|
|
Remove the specified handler from this logger.
|
|
"""
|
|
if hdlr in self.handlers:
|
|
#hdlr.close()
|
|
hdlr.acquire()
|
|
try:
|
|
self.handlers.remove(hdlr)
|
|
finally:
|
|
hdlr.release()
|
|
|
|
def callHandlers(self, record):
|
|
"""
|
|
Pass a record to all relevant handlers.
|
|
|
|
Loop through all handlers for this logger and its parents in the
|
|
logger hierarchy. If no handler was found, output a one-off error
|
|
message to sys.stderr. Stop searching up the hierarchy whenever a
|
|
logger with the "propagate" attribute set to zero is found - that
|
|
will be the last logger whose handlers are called.
|
|
"""
|
|
c = self
|
|
found = 0
|
|
while c:
|
|
for hdlr in c.handlers:
|
|
found = found + 1
|
|
if record.levelno >= hdlr.level:
|
|
hdlr.handle(record)
|
|
if not c.propagate:
|
|
c = None #break out
|
|
else:
|
|
c = c.parent
|
|
if (found == 0) and raiseExceptions and not self.manager.emittedNoHandlerWarning:
|
|
sys.stderr.write("No handlers could be found for logger"
|
|
" \"%s\"\n" % self.name)
|
|
self.manager.emittedNoHandlerWarning = 1
|
|
|
|
def getEffectiveLevel(self):
|
|
"""
|
|
Get the effective level for this logger.
|
|
|
|
Loop through this logger and its parents in the logger hierarchy,
|
|
looking for a non-zero logging level. Return the first one found.
|
|
"""
|
|
logger = self
|
|
while logger:
|
|
if logger.level:
|
|
return logger.level
|
|
logger = logger.parent
|
|
return NOTSET
|
|
|
|
def isEnabledFor(self, level):
|
|
"""
|
|
Is this logger enabled for level 'level'?
|
|
"""
|
|
if self.manager.disable >= level:
|
|
return 0
|
|
return level >= self.getEffectiveLevel()
|
|
|
|
class RootLogger(Logger):
|
|
"""
|
|
A root logger is not that different to any other logger, except that
|
|
it must have a logging level and there is only one instance of it in
|
|
the hierarchy.
|
|
"""
|
|
def __init__(self, level):
|
|
"""
|
|
Initialize the logger with the name "root".
|
|
"""
|
|
Logger.__init__(self, "root", level)
|
|
|
|
_loggerClass = Logger
|
|
|
|
root = RootLogger(WARNING)
|
|
Logger.root = root
|
|
Logger.manager = Manager(Logger.root)
|
|
|
|
#---------------------------------------------------------------------------
|
|
# Configuration classes and functions
|
|
#---------------------------------------------------------------------------
|
|
|
|
BASIC_FORMAT = "%(levelname)s:%(name)s:%(message)s"
|
|
|
|
def basicConfig(**kwargs):
|
|
"""
|
|
Do basic configuration for the logging system.
|
|
|
|
This function does nothing if the root logger already has handlers
|
|
configured. It is a convenience method intended for use by simple scripts
|
|
to do one-shot configuration of the logging package.
|
|
|
|
The default behaviour is to create a StreamHandler which writes to
|
|
sys.stderr, set a formatter using the BASIC_FORMAT format string, and
|
|
add the handler to the root logger.
|
|
|
|
A number of optional keyword arguments may be specified, which can alter
|
|
the default behaviour.
|
|
|
|
filename Specifies that a FileHandler be created, using the specified
|
|
filename, rather than a StreamHandler.
|
|
filemode Specifies the mode to open the file, if filename is specified
|
|
(if filemode is unspecified, it defaults to 'a').
|
|
format Use the specified format string for the handler.
|
|
datefmt Use the specified date/time format.
|
|
level Set the root logger level to the specified level.
|
|
stream Use the specified stream to initialize the StreamHandler. Note
|
|
that this argument is incompatible with 'filename' - if both
|
|
are present, 'stream' is ignored.
|
|
|
|
Note that you could specify a stream created using open(filename, mode)
|
|
rather than passing the filename and mode in. However, it should be
|
|
remembered that StreamHandler does not close its stream (since it may be
|
|
using sys.stdout or sys.stderr), whereas FileHandler closes its stream
|
|
when the handler is closed.
|
|
"""
|
|
if len(root.handlers) == 0:
|
|
filename = kwargs.get("filename")
|
|
if filename:
|
|
mode = kwargs.get("filemode", 'a')
|
|
hdlr = FileHandler(filename, mode)
|
|
else:
|
|
stream = kwargs.get("stream")
|
|
hdlr = StreamHandler(stream)
|
|
fs = kwargs.get("format", BASIC_FORMAT)
|
|
dfs = kwargs.get("datefmt", None)
|
|
fmt = Formatter(fs, dfs)
|
|
hdlr.setFormatter(fmt)
|
|
root.addHandler(hdlr)
|
|
level = kwargs.get("level")
|
|
if level is not None:
|
|
root.setLevel(level)
|
|
|
|
#---------------------------------------------------------------------------
|
|
# Utility functions at module level.
|
|
# Basically delegate everything to the root logger.
|
|
#---------------------------------------------------------------------------
|
|
|
|
def getLogger(name=None):
|
|
"""
|
|
Return a logger with the specified name, creating it if necessary.
|
|
|
|
If no name is specified, return the root logger.
|
|
"""
|
|
if name:
|
|
return Logger.manager.getLogger(name)
|
|
else:
|
|
return root
|
|
|
|
#def getRootLogger():
|
|
# """
|
|
# Return the root logger.
|
|
#
|
|
# Note that getLogger('') now does the same thing, so this function is
|
|
# deprecated and may disappear in the future.
|
|
# """
|
|
# return root
|
|
|
|
def critical(msg, *args, **kwargs):
|
|
"""
|
|
Log a message with severity 'CRITICAL' on the root logger.
|
|
"""
|
|
if len(root.handlers) == 0:
|
|
basicConfig()
|
|
root.critical(msg, *args, **kwargs)
|
|
|
|
fatal = critical
|
|
|
|
def error(msg, *args, **kwargs):
|
|
"""
|
|
Log a message with severity 'ERROR' on the root logger.
|
|
"""
|
|
if len(root.handlers) == 0:
|
|
basicConfig()
|
|
root.error(msg, *args, **kwargs)
|
|
|
|
def exception(msg, *args):
|
|
"""
|
|
Log a message with severity 'ERROR' on the root logger,
|
|
with exception information.
|
|
"""
|
|
error(msg, exc_info=1, *args)
|
|
|
|
def warning(msg, *args, **kwargs):
|
|
"""
|
|
Log a message with severity 'WARNING' on the root logger.
|
|
"""
|
|
if len(root.handlers) == 0:
|
|
basicConfig()
|
|
root.warning(msg, *args, **kwargs)
|
|
|
|
warn = warning
|
|
|
|
def info(msg, *args, **kwargs):
|
|
"""
|
|
Log a message with severity 'INFO' on the root logger.
|
|
"""
|
|
if len(root.handlers) == 0:
|
|
basicConfig()
|
|
root.info(msg, *args, **kwargs)
|
|
|
|
def debug(msg, *args, **kwargs):
|
|
"""
|
|
Log a message with severity 'DEBUG' on the root logger.
|
|
"""
|
|
if len(root.handlers) == 0:
|
|
basicConfig()
|
|
root.debug(msg, *args, **kwargs)
|
|
|
|
def log(level, msg, *args, **kwargs):
|
|
"""
|
|
Log 'msg % args' with the integer severity 'level' on the root logger.
|
|
"""
|
|
if len(root.handlers) == 0:
|
|
basicConfig()
|
|
root.log(level, msg, *args, **kwargs)
|
|
|
|
def disable(level):
|
|
"""
|
|
Disable all logging calls less severe than 'level'.
|
|
"""
|
|
root.manager.disable = level
|
|
|
|
def shutdown(handlerList=_handlerList):
|
|
"""
|
|
Perform any cleanup actions in the logging system (e.g. flushing
|
|
buffers).
|
|
|
|
Should be called at application exit.
|
|
"""
|
|
for h in handlerList[:]:
|
|
#errors might occur, for example, if files are locked
|
|
#we just ignore them if raiseExceptions is not set
|
|
try:
|
|
h.flush()
|
|
h.close()
|
|
except:
|
|
if raiseExceptions:
|
|
raise
|
|
#else, swallow
|
|
|
|
#Let's try and shutdown automatically on application exit...
|
|
try:
|
|
import atexit
|
|
atexit.register(shutdown)
|
|
except ImportError: # for Python versions < 2.0
|
|
def exithook(status, old_exit=sys.exit):
|
|
try:
|
|
shutdown()
|
|
finally:
|
|
old_exit(status)
|
|
|
|
sys.exit = exithook
|