Thomas Wouters 
								
							 
						 
						
							
							
							
							
								
							
							
								a977329b6f 
								
							 
						 
						
							
							
								
								Merge part of the trunk changes into the p3yk branch. This merges from 43030  
							
							... 
							
							
							
							(branch-creation time) up to 43067. 43068 and 43069 contain a little
swapping action between re.py and sre.py, and this mightily confuses svn
merge, so later changes are going in separately.
This merge should break no additional tests.
The last-merged revision is going in a 'last_merge' property on '.' (the
branch directory.) Arbitrarily chosen, really; if there's a BCP for this, I
couldn't find it, but we can easily change it afterwards ;) 
							
						 
						
							2006-04-21 09:43:23 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Neal Norwitz 
								
							 
						 
						
							
							
							
							
								
							
							
								7c3072437a 
								
							 
						 
						
							
							
								
								More apply() cleanup  
							
							
							
						 
						
							2006-03-17 08:28:24 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Neal Norwitz 
								
							 
						 
						
							
							
							
							
								
							
							
								d91085598f 
								
							 
						 
						
							
							
								
								Remove apply()  
							
							
							
						 
						
							2006-03-17 08:00:19 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								d364a07517 
								
							 
						 
						
							
							
								
								Added logThreads and logProcesses to allow conditional omission of logging this information  
							
							
							
						 
						
							2006-03-13 22:05:28 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								ed1992f2aa 
								
							 
						 
						
							
							
								
								Added function name to LogRecord.  
							
							
							
						 
						
							2006-02-09 08:48:36 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								260ce43252 
								
							 
						 
						
							
							
								
								Propagate exceptions from shutdown() if raiseExceptions is not set.  
							
							... 
							
							
							
							Added 'extra' keyword argument handling to logging calls, as discussed on python-dev. 
							
						 
						
							2006-02-09 08:34:14 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								e0f85926d6 
								
							 
						 
						
							
							
								
								Removed defensive test in Handler.close  
							
							
							
						 
						
							2006-02-07 13:55:52 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Neal Norwitz 
								
							 
						 
						
							
							
							
							
								
							
							
								55cd82fe0a 
								
							 
						 
						
							
							
								
								Get test_logging to not hang when running under regrtest.py -R ::  
							
							... 
							
							
							
							Not sure why/how _handlers/_handlerList is out of sync.  This could
indicate a deeper problem.
In test_logging, the only absolutely necessary change to get working
was tcpserver.abort = 1.  But we don't want to wait infinitely
to join the threads, so give a 2.0 second timeout.
There doesn't appear to be a need for a local abort variable
in serve_until_stopped, so just use the instance member.
Note the problem is only on HEAD, not in 2.4. 
							
						 
						
							2006-02-05 08:21:08 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								7a7160bd0c 
								
							 
						 
						
							
							
								
								Added the ability to specify a class attribute in Formatter configuration. Contributed by Shane Hathaway.  
							
							
							
						 
						
							2006-01-20 18:28:03 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								989b69a519 
								
							 
						 
						
							
							
								
								Refactoring for fileConfig. Contributed by Shane Hathaway.  
							
							
							
						 
						
							2006-01-16 21:28:37 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								814fa0fe11 
								
							 
						 
						
							
							
								
								Exceptions raised during renaming in rotating file handlers are now passed to handleError (except for SystemExit and KeyboardInterrupt, which are re-raised).  
							
							
							
						 
						
							2006-01-16 09:27:58 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								e928977b80 
								
							 
						 
						
							
							
								
								Exceptions raised during renaming in rotating file handlers are now passed to handleError (except for SystemExit and KeyboardInterrupt, which are re-raised).  
							
							
							
						 
						
							2006-01-16 09:27:10 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								d952041dc7 
								
							 
						 
						
							
							
								
								TimedRotatingFileHandler now calculates next rollover from previous rollover rather than current time.  
							
							
							
						 
						
							2006-01-16 09:13:58 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								74a83e9ffb 
								
							 
						 
						
							
							
								
								Fixed bug in time-to-midnight calculation.  
							
							
							
						 
						
							2006-01-16 09:08:06 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								8b6b53f8ac 
								
							 
						 
						
							
							
								
								Fixed indentation bug in _connect_unixsocket (thanks to Ken Lalonde for reporting it/supplying a patch)  
							
							
							
						 
						
							2005-11-09 13:55:13 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								245a5ab31b 
								
							 
						 
						
							
							
								
								Exception handling now raises KeyboardInterrupt and SystemExit rather than passing to handleError  
							
							
							
						 
						
							2005-10-31 14:27:01 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								85c1909a78 
								
							 
						 
						
							
							
								
								Exception handling now raises KeyboardInterrupt and SystemExit rather than passing to handleError  
							
							
							
						 
						
							2005-10-31 13:14:19 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								1e86beb3f8 
								
							 
						 
						
							
							
								
								One-off "No handlers..." error message only raised if raiseExceptions is set.  
							
							
							
						 
						
							2005-10-23 22:32:59 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Neal Norwitz 
								
							 
						 
						
							
							
							
							
								
							
							
								1e8659b963 
								
							 
						 
						
							
							
								
								Don't use a string exception since it's deprecated  
							
							
							
						 
						
							2005-10-21 06:00:24 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								239322b97e 
								
							 
						 
						
							
							
								
								Optimised Placeholders handling of child loggers by using a dict rather than a list (much slower in the pathological case of hundreds of child Loggers to a Placeholder - problem reported by Ryan Blazecka).  
							
							
							
						 
						
							2005-10-14 09:36:35 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								b79350601b 
								
							 
						 
						
							
							
								
								Added Host and Content-type headers to requests sent by HTTPHandler (suggested by Steven Vereecken)  
							
							
							
						 
						
							2005-10-11 13:15:31 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								43d6e812c8 
								
							 
						 
						
							
							
								
								Fixed bug where the logging message was wrongly being demoted from Unicode to string (SF  #1314107 )  
							
							
							
						 
						
							2005-10-07 08:35:36 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								116f16e4ab 
								
							 
						 
						
							
							
								
								Added lock acquisition around handler removal from logger  
							
							
							
						 
						
							2005-09-16 10:33:40 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								0ee9ba258e 
								
							 
						 
						
							
							
								
								Added _handlerList to allow shutdown to flush and close handlers in reverse order of creation (see SF# 1282539)  
							
							
							
						 
						
							2005-09-08 18:14:16 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								c384fc2357 
								
							 
						 
						
							
							
								
								Changed _srcfile determination to support py2exe.  
							
							
							
						 
						
							2005-09-02 11:20:33 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								4c1423bb7a 
								
							 
						 
						
							
							
								
								Documentation clarified re. config socket listener protocol  
							
							
							
						 
						
							2005-06-05 20:39:36 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								4a70486c37 
								
							 
						 
						
							
							
								
								Added threadName and now using re-entrant lock  
							
							
							
						 
						
							2005-03-31 20:16:55 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								8e628d2342 
								
							 
						 
						
							
							
								
								Made traceback unconditional, to avoid lock contention problems when logging errors occur in a custom importer (SF path  #1158052 ).  
							
							
							
						 
						
							2005-03-13 09:57:46 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								4600f11a07 
								
							 
						 
						
							
							
								
								Added optional encoding argument to file handlers.  
							
							
							
						 
						
							2005-03-13 09:56:36 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								b89e7c9bc9 
								
							 
						 
						
							
							
								
								Added optional encoding argument to file handlers. Made traceback import unconditional, to avoid lock contention problems which occur when logging from custom importers (SF patch  #1158052 )  
							
							
							
						 
						
							2005-03-13 09:54:31 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								612df8e21d 
								
							 
						 
						
							
							
								
								Handle errors in imports of thread, threading  
							
							
							
						 
						
							2005-02-18 11:54:46 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								829dc51a05 
								
							 
						 
						
							
							
								
								Improved frame handling for 1.5.2, and now return func from findCaller (not actually used yet)  
							
							
							
						 
						
							2005-02-18 11:53:32 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								a1974c1459 
								
							 
						 
						
							
							
								
								Improved SysLogHandler error recovery (patch by Erik Forsberg)  
							
							
							
						 
						
							2005-01-13 08:23:56 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								dccd4321a7 
								
							 
						 
						
							
							
								
								Fixed bug in handling of args in LogRecord.__init__.  
							
							
							
						 
						
							2004-10-21 21:24:27 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								4ed315ae66 
								
							 
						 
						
							
							
								
								Changed handling of args in LogRecord.__init__.  
							
							
							
						 
						
							2004-10-20 08:39:40 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								e7d4066cdf 
								
							 
						 
						
							
							
								
								Changes made to maintain 1.5.2 compatibility.  
							
							
							
						 
						
							2004-10-03 19:12:07 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								2d5fee06e0 
								
							 
						 
						
							
							
								
								Version number updated to 0.4.9.5  
							
							
							
						 
						
							2004-10-03 19:10:53 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								b2635b2f71 
								
							 
						 
						
							
							
								
								Added log() function  
							
							
							
						 
						
							2004-09-24 11:45:52 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								02dd994adf 
								
							 
						 
						
							
							
								
								Added exception handling during handler initialization in fileConfig()  
							
							
							
						 
						
							2004-09-24 11:45:13 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								b9591174df 
								
							 
						 
						
							
							
								
								Added getLoggerClass()  
							
							
							
						 
						
							2004-09-22 12:39:26 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								fb154171c4 
								
							 
						 
						
							
							
								
								Fixed bug in DatagramHandler.send()  
							
							
							
						 
						
							2004-08-24 09:36:23 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Martin v. Löwis 
								
							 
						 
						
							
							
							
							
								
							
							
								318a12eb01 
								
							 
						 
						
							
							
								
								Patch  #791776 : Replace SMTPHandler.date_time with email.Utils.formatdate.  
							
							
							
						 
						
							2004-08-18 12:27:40 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								eb477d04f7 
								
							 
						 
						
							
							
								
								Updated Logger.log() docstring to clarify that lvl parameter should be an integer.  
							
							
							
						 
						
							2004-08-04 08:38:08 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								e12f71586a 
								
							 
						 
						
							
							
								
								Ignore exceptions which occur when closing files in shutdown()  
							
							
							
						 
						
							2004-07-29 09:19:30 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								5e9e9e19f7 
								
							 
						 
						
							
							
								
								Removed debugging print statements from TimedRotatingFileHandler, and sorted list returned by glob.glob() (SF  #987166 )  
							
							
							
						 
						
							2004-07-12 09:21:41 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								3970c11157 
								
							 
						 
						
							
							
								
								Add exception handling for BaseRotatingFileHandler (SF  #979252 )  
							
							
							
						 
						
							2004-07-08 10:24:04 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								4bbab2bde4 
								
							 
						 
						
							
							
								
								FileHandler now stores the basename as an absolute path (fix for SF  #982049 )  
							
							
							
						 
						
							2004-07-08 10:22:35 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Tim Peters 
								
							 
						 
						
							
							
							
							
								
							
							
								4e0e1b6a54 
								
							 
						 
						
							
							
								
								Whitespace normalization.  
							
							
							
						 
						
							2004-07-07 20:54:48 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								17c52d8493 
								
							 
						 
						
							
							
								
								Refactored RotatingFileHandler to create a base class  for rotating handlers. Added TimedRotatingFileHandler.  
							
							
							
						 
						
							2004-07-03 11:48:34 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								779e0c9334 
								
							 
						 
						
							
							
								
								Changed basicConfig() to add keyword arguments. Changes are backward-compatible.  
							
							... 
							
							
							
							Added error checking to log() to check that level is an integer, and raise a TypeError if not (as long as raiseExceptions is set).
Minor documentation corrections. 
							
						 
						
							2004-07-03 11:47:26 +00:00