| 
									
										
											  
											
												Merged revisions 77967,77969,77973,77979,77985-77986,78009,78029,78031-78033,78081,78085,78103,78105-78106,78108,78246,78703,78728,78731,78853,78855 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 12:48:53 -0600 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 14:18:28 -0600 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r77973 | vinay.sajip | 2010-02-04 14:23:45 -0600 (Thu, 04 Feb 2010) | 1 line
  Issue #7851: logging: clarification on logging configuration files.
........
  r77979 | vinay.sajip | 2010-02-04 15:40:56 -0600 (Thu, 04 Feb 2010) | 1 line
  Added unit test for cfg:// resolution.
........
  r77985 | vinay.sajip | 2010-02-05 08:52:05 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener test now uses find_unused_port().
........
  r77986 | vinay.sajip | 2010-02-05 09:40:20 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener tests disabled for now.
........
  r78009 | vinay.sajip | 2010-02-05 17:43:11 -0600 (Fri, 05 Feb 2010) | 1 line
  test_logging: minor tweaks to timeouts, listening tests marked as skipped.
........
  r78029 | vinay.sajip | 2010-02-06 14:00:43 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Tentatively re-enabling one test to see effect on buildbots.
........
  r78031 | vinay.sajip | 2010-02-06 14:28:36 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Gave server thread more time to get ready, and re-enabled a skipped test.
........
  r78032 | georg.brandl | 2010-02-06 15:54:40 -0600 (Sat, 06 Feb 2010) | 1 line
  Remove unused imports from test_logging.
........
  r78033 | benjamin.peterson | 2010-02-06 16:08:15 -0600 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78081 | vinay.sajip | 2010-02-07 06:56:54 -0600 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 07:06:51 -0600 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78103 | vinay.sajip | 2010-02-08 00:50:14 -0600 (Mon, 08 Feb 2010) | 1 line
  Removed spurious print statement in test.
........
  r78105 | vinay.sajip | 2010-02-08 09:32:08 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: skipped listening tests because they're not working reliably.
........
  r78106 | vinay.sajip | 2010-02-08 10:05:50 -0600 (Mon, 08 Feb 2010) | 1 line
  Issue #7857: Another attempt to keep the buildbots happy.
........
  r78108 | vinay.sajip | 2010-02-08 15:18:15 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
  r78246 | vinay.sajip | 2010-02-19 17:53:17 -0600 (Fri, 19 Feb 2010) | 1 line
  logging: Documented warnings module integration.
........
  r78703 | vinay.sajip | 2010-03-05 16:11:24 -0600 (Fri, 05 Mar 2010) | 1 line
  Factored out time usage determination into a method, to facilitate alternative formatting implementations in the future.
........
  r78728 | vinay.sajip | 2010-03-06 09:12:08 -0600 (Sat, 06 Mar 2010) | 1 line
  Added schema version test in dictConfig.
........
  r78731 | vinay.sajip | 2010-03-06 09:56:03 -0600 (Sat, 06 Mar 2010) | 1 line
  Added checks for tuples in dictConfig.
........
  r78853 | vinay.sajip | 2010-03-12 00:01:21 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: logging: Improved algorithm for computing initial rollover time.
........
  r78855 | vinay.sajip | 2010-03-12 03:16:10 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: Updated NEWS entry and added to logging documentation.
........
											
										 
											2010-03-13 22:30:34 +00:00
										 |  |  | #!/usr/bin/env python | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  | # | 
					
						
							| 
									
										
										
										
											2011-02-26 15:35:38 +00:00
										 |  |  | # Copyright 2001-2011 by Vinay Sajip. All Rights Reserved. | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  | # | 
					
						
							|  |  |  | # 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. | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | """Test harness for the logging module. Run all tests.
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-02-26 15:35:38 +00:00
										 |  |  | Copyright (C) 2001-2011 Vinay Sajip. All Rights Reserved. | 
					
						
							| 
									
										
										
										
											2003-01-02 14:56:39 +00:00
										 |  |  | """
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  | import logging | 
					
						
							|  |  |  | import logging.handlers | 
					
						
							|  |  |  | import logging.config | 
					
						
							| 
									
										
											  
											
												Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60873 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r60850 | amaury.forgeotdarc | 2008-02-16 01:16:50 +0100 (Sat, 16 Feb 2008) | 3 lines
  mmap.PROT_READ does not exists on win32;
  Skip this test created by r60830.
........
  r60851 | raymond.hettinger | 2008-02-16 02:22:54 +0100 (Sat, 16 Feb 2008) | 1 line
  Add __all__ to logging module.
........
  r60855 | georg.brandl | 2008-02-16 10:37:32 +0100 (Sat, 16 Feb 2008) | 2 lines
  #2120: broken links in advocacy document.
........
  r60860 | amaury.forgeotdarc | 2008-02-16 15:34:57 +0100 (Sat, 16 Feb 2008) | 23 lines
  Crashers of the day: Py_CLEAR must be used when there is a chance that the
  function can be called recursively.
  This was discussed in issue1020188.
  In python codebase, all occurrences of Py_[X]DECREF(xxx->yyy) are suspect,
  except when they appear in tp_new or tp_dealloc functions, or when
  the member cannot be of a user-defined class.
  Note that tp_init is not safe.
  I do have a (crashing) example for every changed line.
  Is it worth adding them to the test suite?
  Example:
  class SpecialStr(str):
      def __del__(self):
          s.close()
  import cStringIO
  s = cStringIO.StringIO(SpecialStr("text"))
  s.close() # Segfault
........
  r60871 | amaury.forgeotdarc | 2008-02-16 21:55:24 +0100 (Sat, 16 Feb 2008) | 3 lines
  Prevent a crash with nested scopes, again caused by calling Py_DECREF when the pointer
  is still present in the containing structure.
........
  r60872 | brett.cannon | 2008-02-17 02:59:18 +0100 (Sun, 17 Feb 2008) | 4 lines
  Move test_logging over to doctest.
  Thanks to Christopher White from GHOP.
........
  r60873 | georg.brandl | 2008-02-17 12:33:38 +0100 (Sun, 17 Feb 2008) | 2 lines
  #2131: note that codecs.open() always opens files in binary mode.
........
											
										 
											2008-02-17 13:31:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 69364-69365,69409-69410,69413,69417,69435,69442,69447,69495,69519-69521 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r69364 | kristjan.jonsson | 2009-02-06 04:17:34 -0600 (Fri, 06 Feb 2009) | 1 line
  Fix a number of Win32ErrorTests error cases.  chmod wasn't being tested.  'access' never raises an error.
........
  r69365 | armin.rigo | 2009-02-06 05:46:26 -0600 (Fri, 06 Feb 2009) | 2 lines
  Ivan on IRC in #twisted reported this crasher.
........
  r69409 | georg.brandl | 2009-02-07 06:21:17 -0600 (Sat, 07 Feb 2009) | 1 line
  #5174: fix wrong file closing in example.
........
  r69410 | neil.schemenauer | 2009-02-07 08:53:31 -0600 (Sat, 07 Feb 2009) | 4 lines
  Fix broken test in test_hotshot.  Treating the current directory as an
  empty file is sloppy and non-portable.  Use NamedTemporaryFile to make
  an empty file.
........
  r69413 | neil.schemenauer | 2009-02-07 12:35:16 -0600 (Sat, 07 Feb 2009) | 2 lines
  Add test for issue #999042, explict global statement works.
........
  r69417 | benjamin.peterson | 2009-02-07 17:01:19 -0600 (Sat, 07 Feb 2009) | 1 line
  document individual 2to3 fixers
........
  r69435 | benjamin.peterson | 2009-02-08 08:38:13 -0600 (Sun, 08 Feb 2009) | 1 line
  document numliterals fixer
........
  r69442 | benjamin.peterson | 2009-02-08 09:14:57 -0600 (Sun, 08 Feb 2009) | 1 line
  a few edits and typos
........
  r69447 | vinay.sajip | 2009-02-08 13:06:08 -0600 (Sun, 08 Feb 2009) | 2 lines
  Issue #5170: Fixed Unicode output bug in logging and added test case. This is a regression which did not occur in 2.5.
........
  r69495 | kristjan.jonsson | 2009-02-10 07:32:24 -0600 (Tue, 10 Feb 2009) | 1 line
  Issue 4804.  Add a function to test the validity of file descriptors on Windows, and stop using global runtime settings to silence the warnings / assertions.
........
  r69519 | gregory.p.smith | 2009-02-11 17:45:25 -0600 (Wed, 11 Feb 2009) | 3 lines
  Issue #1008086: Fixes socket.inet_aton() to always return 4 bytes even
  on LP64 platforms (most 64-bit Linux, bsd, unix systems).
........
  r69520 | benjamin.peterson | 2009-02-11 21:50:00 -0600 (Wed, 11 Feb 2009) | 1 line
  os.fsync() should be used to ensure that data is written to disk
........
  r69521 | benjamin.peterson | 2009-02-11 22:17:04 -0600 (Wed, 11 Feb 2009) | 1 line
  no need for this __bases__ trick anymore
........
											
										 
											2009-02-13 02:50:59 +00:00
										 |  |  | import codecs | 
					
						
							| 
									
										
										
										
											2010-09-17 18:57:36 +00:00
										 |  |  | import datetime | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  | import pickle | 
					
						
							|  |  |  | import io | 
					
						
							|  |  |  | import gc | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  | import json | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  | import os | 
					
						
							| 
									
										
										
										
											2010-09-14 09:34:09 +00:00
										 |  |  | import queue | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  | import re | 
					
						
							|  |  |  | import select | 
					
						
							|  |  |  | import socket | 
					
						
							|  |  |  | import struct | 
					
						
							|  |  |  | import sys | 
					
						
							|  |  |  | import tempfile | 
					
						
							| 
									
										
										
										
											2011-03-29 17:20:34 +01:00
										 |  |  | from test.support import captured_stdout, run_with_locale, run_unittest, patch | 
					
						
							| 
									
										
										
										
											2011-04-15 22:27:17 +01:00
										 |  |  | from test.support import TestHandler, Matcher | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  | import textwrap | 
					
						
							| 
									
										
										
										
											2011-04-26 20:26:41 +01:00
										 |  |  | import time | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  | import unittest | 
					
						
							| 
									
										
										
										
											2008-12-07 15:30:06 +00:00
										 |  |  | import warnings | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  | import weakref | 
					
						
							| 
									
										
											  
											
												Merged revisions 80552-80556,80564-80566,80568-80571 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r80552 | victor.stinner | 2010-04-27 23:46:03 +0200 (mar., 27 avril 2010) | 3 lines
  Issue #7449, part 1: fix test_support.py for Python compiled without thread
........
  r80553 | victor.stinner | 2010-04-27 23:47:01 +0200 (mar., 27 avril 2010) | 1 line
  Issue #7449, part 2: regrtest.py -j option requires thread support
........
  r80554 | victor.stinner | 2010-04-27 23:51:26 +0200 (mar., 27 avril 2010) | 9 lines
  Issue #7449 part 3, test_doctest: import trace module in test_coverage()
  Import trace module fail if the threading module is missing. test_coverage() is
  only used if test_doctest.py is used with the -c option. This commit allows to
  execute the test suite without thread support.
  Move "import trace" in test_coverage() and use
  test_support.import_module('trace').
........
  r80555 | victor.stinner | 2010-04-27 23:56:26 +0200 (mar., 27 avril 2010) | 6 lines
  Issue #7449, part 4: skip test_multiprocessing if thread support is disabled
  import threading after _multiprocessing to raise a more revelant error message:
  "No module named _multiprocessing". _multiprocessing is not compiled without
  thread support.
........
  r80556 | victor.stinner | 2010-04-28 00:01:24 +0200 (mer., 28 avril 2010) | 8 lines
  Issue #7449, part 5: split Test.test_open() of ctypes/test/test_errno.py
   * Split Test.test_open() in 2 functions: test_open() and test_thread_open()
   * Skip test_open() and test_thread_open() if we are unable to find the C
     library
   * Skip test_thread_open() if thread support is disabled
   * Use unittest.skipUnless(os.name == "nt", ...) on test_GetLastError()
........
  r80564 | victor.stinner | 2010-04-28 00:59:35 +0200 (mer., 28 avril 2010) | 4 lines
  Issue #7449, part 6: fix test_hashlib for missing threading module
  Move @test_support.reap_thread decorator from test_main() to test_threaded_hashing().
........
  r80565 | victor.stinner | 2010-04-28 01:01:29 +0200 (mer., 28 avril 2010) | 6 lines
  Issue #7449, part 7: simplify threading detection in test_capi
   * Skip TestPendingCalls if threading module is missing
   * Test if threading module is present or not, instead of test the presence of
     _testcapi._test_thread_state
........
  r80566 | victor.stinner | 2010-04-28 01:03:16 +0200 (mer., 28 avril 2010) | 4 lines
  Issue #7449, part 8: don't skip the whole test_asynchat if threading is missing
  TestFifo can be executed without the threading module
........
  r80568 | victor.stinner | 2010-04-28 01:14:58 +0200 (mer., 28 avril 2010) | 6 lines
  Issue #7449, part 9: fix test_xmlrpclib for missing threading module
   * Skip testcases using threads if threading module is missing
   * Use "http://" instead of URL in ServerProxyTestCase if threading is missing
     because URL is not set in this case
........
  r80569 | victor.stinner | 2010-04-28 01:33:58 +0200 (mer., 28 avril 2010) | 6 lines
  Partial revert of r80556 (Issue #7449, part 5, fix ctypes test)
  Rewrite r80556: the thread test have to be executed just after the test on
  libc_open() and so the test cannot be splitted in two functions (without
  duplicating code, and I don't want to duplicate code).
........
  r80570 | victor.stinner | 2010-04-28 01:51:16 +0200 (mer., 28 avril 2010) | 8 lines
  Issue #7449, part 10: test_cmd imports trace module using test_support.import_module()
  Use test_support.import_module() instead of import to raise a SkipTest
  exception if the import fail. Import trace fails if the threading module is
  missing.
  See also part 3: test_doctest: import trace module in test_coverage().
........
  r80571 | victor.stinner | 2010-04-28 01:55:59 +0200 (mer., 28 avril 2010) | 6 lines
  Issue #7449, last part (11): fix many tests if thread support is disabled
   * Use try/except ImportError or test_support.import_module() to import thread
     and threading modules
   * Add @unittest.skipUnless(threading, ...) to testcases using threads
........
											
										 
											2010-04-28 22:31:17 +00:00
										 |  |  | try: | 
					
						
							|  |  |  |     import threading | 
					
						
							| 
									
										
										
										
											2011-05-17 07:15:53 +01:00
										 |  |  |     # The following imports are needed only for tests which | 
					
						
							|  |  |  |     import asynchat | 
					
						
							|  |  |  |     import asyncore | 
					
						
							|  |  |  |     import errno | 
					
						
							|  |  |  |     from http.server import HTTPServer, BaseHTTPRequestHandler | 
					
						
							|  |  |  |     import smtpd | 
					
						
							|  |  |  |     from urllib.parse import urlparse, parse_qs | 
					
						
							|  |  |  |     from socketserver import (ThreadingUDPServer, DatagramRequestHandler, | 
					
						
							|  |  |  |                               ThreadingTCPServer, StreamRequestHandler) | 
					
						
							| 
									
										
											  
											
												Merged revisions 80552-80556,80564-80566,80568-80571 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r80552 | victor.stinner | 2010-04-27 23:46:03 +0200 (mar., 27 avril 2010) | 3 lines
  Issue #7449, part 1: fix test_support.py for Python compiled without thread
........
  r80553 | victor.stinner | 2010-04-27 23:47:01 +0200 (mar., 27 avril 2010) | 1 line
  Issue #7449, part 2: regrtest.py -j option requires thread support
........
  r80554 | victor.stinner | 2010-04-27 23:51:26 +0200 (mar., 27 avril 2010) | 9 lines
  Issue #7449 part 3, test_doctest: import trace module in test_coverage()
  Import trace module fail if the threading module is missing. test_coverage() is
  only used if test_doctest.py is used with the -c option. This commit allows to
  execute the test suite without thread support.
  Move "import trace" in test_coverage() and use
  test_support.import_module('trace').
........
  r80555 | victor.stinner | 2010-04-27 23:56:26 +0200 (mar., 27 avril 2010) | 6 lines
  Issue #7449, part 4: skip test_multiprocessing if thread support is disabled
  import threading after _multiprocessing to raise a more revelant error message:
  "No module named _multiprocessing". _multiprocessing is not compiled without
  thread support.
........
  r80556 | victor.stinner | 2010-04-28 00:01:24 +0200 (mer., 28 avril 2010) | 8 lines
  Issue #7449, part 5: split Test.test_open() of ctypes/test/test_errno.py
   * Split Test.test_open() in 2 functions: test_open() and test_thread_open()
   * Skip test_open() and test_thread_open() if we are unable to find the C
     library
   * Skip test_thread_open() if thread support is disabled
   * Use unittest.skipUnless(os.name == "nt", ...) on test_GetLastError()
........
  r80564 | victor.stinner | 2010-04-28 00:59:35 +0200 (mer., 28 avril 2010) | 4 lines
  Issue #7449, part 6: fix test_hashlib for missing threading module
  Move @test_support.reap_thread decorator from test_main() to test_threaded_hashing().
........
  r80565 | victor.stinner | 2010-04-28 01:01:29 +0200 (mer., 28 avril 2010) | 6 lines
  Issue #7449, part 7: simplify threading detection in test_capi
   * Skip TestPendingCalls if threading module is missing
   * Test if threading module is present or not, instead of test the presence of
     _testcapi._test_thread_state
........
  r80566 | victor.stinner | 2010-04-28 01:03:16 +0200 (mer., 28 avril 2010) | 4 lines
  Issue #7449, part 8: don't skip the whole test_asynchat if threading is missing
  TestFifo can be executed without the threading module
........
  r80568 | victor.stinner | 2010-04-28 01:14:58 +0200 (mer., 28 avril 2010) | 6 lines
  Issue #7449, part 9: fix test_xmlrpclib for missing threading module
   * Skip testcases using threads if threading module is missing
   * Use "http://" instead of URL in ServerProxyTestCase if threading is missing
     because URL is not set in this case
........
  r80569 | victor.stinner | 2010-04-28 01:33:58 +0200 (mer., 28 avril 2010) | 6 lines
  Partial revert of r80556 (Issue #7449, part 5, fix ctypes test)
  Rewrite r80556: the thread test have to be executed just after the test on
  libc_open() and so the test cannot be splitted in two functions (without
  duplicating code, and I don't want to duplicate code).
........
  r80570 | victor.stinner | 2010-04-28 01:51:16 +0200 (mer., 28 avril 2010) | 8 lines
  Issue #7449, part 10: test_cmd imports trace module using test_support.import_module()
  Use test_support.import_module() instead of import to raise a SkipTest
  exception if the import fail. Import trace fails if the threading module is
  missing.
  See also part 3: test_doctest: import trace module in test_coverage().
........
  r80571 | victor.stinner | 2010-04-28 01:55:59 +0200 (mer., 28 avril 2010) | 6 lines
  Issue #7449, last part (11): fix many tests if thread support is disabled
   * Use try/except ImportError or test_support.import_module() to import thread
     and threading modules
   * Add @unittest.skipUnless(threading, ...) to testcases using threads
........
											
										 
											2010-04-28 22:31:17 +00:00
										 |  |  | except ImportError: | 
					
						
							|  |  |  |     threading = None | 
					
						
							| 
									
										
										
										
											2011-05-09 17:32:09 +01:00
										 |  |  | try: | 
					
						
							|  |  |  |     import win32evtlog | 
					
						
							|  |  |  | except ImportError: | 
					
						
							|  |  |  |     win32evtlog = None | 
					
						
							|  |  |  | try: | 
					
						
							|  |  |  |     import win32evtlogutil | 
					
						
							|  |  |  | except ImportError: | 
					
						
							|  |  |  |     win32evtlogutil = None | 
					
						
							|  |  |  |     win32evtlog = None | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | class BaseTest(unittest.TestCase): | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     """Base class for logging tests.""" | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     log_format = "%(name)s -> %(levelname)s: %(message)s" | 
					
						
							|  |  |  |     expected_log_pat = r"^([\w.]+) -> ([\w]+): ([\d]+)$" | 
					
						
							|  |  |  |     message_num = 0 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def setUp(self): | 
					
						
							|  |  |  |         """Setup the default logging stream to an internal StringIO instance,
 | 
					
						
							|  |  |  |         so that we can examine log output as we want."""
 | 
					
						
							|  |  |  |         logger_dict = logging.getLogger().manager.loggerDict | 
					
						
							|  |  |  |         logging._acquireLock() | 
					
						
							|  |  |  |         try: | 
					
						
							|  |  |  |             self.saved_handlers = logging._handlers.copy() | 
					
						
							|  |  |  |             self.saved_handler_list = logging._handlerList[:] | 
					
						
							| 
									
										
										
										
											2010-12-27 14:31:52 +00:00
										 |  |  |             self.saved_loggers = saved_loggers = logger_dict.copy() | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |             self.saved_level_names = logging._levelNames.copy() | 
					
						
							| 
									
										
										
										
											2010-12-27 14:31:52 +00:00
										 |  |  |             self.logger_states = logger_states = {} | 
					
						
							|  |  |  |             for name in saved_loggers: | 
					
						
							|  |  |  |                 logger_states[name] = getattr(saved_loggers[name], | 
					
						
							|  |  |  |                                               'disabled', None) | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |         finally: | 
					
						
							|  |  |  |             logging._releaseLock() | 
					
						
							| 
									
										
											  
											
												Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60873 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r60850 | amaury.forgeotdarc | 2008-02-16 01:16:50 +0100 (Sat, 16 Feb 2008) | 3 lines
  mmap.PROT_READ does not exists on win32;
  Skip this test created by r60830.
........
  r60851 | raymond.hettinger | 2008-02-16 02:22:54 +0100 (Sat, 16 Feb 2008) | 1 line
  Add __all__ to logging module.
........
  r60855 | georg.brandl | 2008-02-16 10:37:32 +0100 (Sat, 16 Feb 2008) | 2 lines
  #2120: broken links in advocacy document.
........
  r60860 | amaury.forgeotdarc | 2008-02-16 15:34:57 +0100 (Sat, 16 Feb 2008) | 23 lines
  Crashers of the day: Py_CLEAR must be used when there is a chance that the
  function can be called recursively.
  This was discussed in issue1020188.
  In python codebase, all occurrences of Py_[X]DECREF(xxx->yyy) are suspect,
  except when they appear in tp_new or tp_dealloc functions, or when
  the member cannot be of a user-defined class.
  Note that tp_init is not safe.
  I do have a (crashing) example for every changed line.
  Is it worth adding them to the test suite?
  Example:
  class SpecialStr(str):
      def __del__(self):
          s.close()
  import cStringIO
  s = cStringIO.StringIO(SpecialStr("text"))
  s.close() # Segfault
........
  r60871 | amaury.forgeotdarc | 2008-02-16 21:55:24 +0100 (Sat, 16 Feb 2008) | 3 lines
  Prevent a crash with nested scopes, again caused by calling Py_DECREF when the pointer
  is still present in the containing structure.
........
  r60872 | brett.cannon | 2008-02-17 02:59:18 +0100 (Sun, 17 Feb 2008) | 4 lines
  Move test_logging over to doctest.
  Thanks to Christopher White from GHOP.
........
  r60873 | georg.brandl | 2008-02-17 12:33:38 +0100 (Sun, 17 Feb 2008) | 2 lines
  #2131: note that codecs.open() always opens files in binary mode.
........
											
										 
											2008-02-17 13:31:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 79279,79284,79293,79373,79376,79379,79876,79888 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r79279 | vinay.sajip | 2010-03-22 07:33:08 -0500 (Mon, 22 Mar 2010) | 1 line
  Issue #8200: logging: Handle errors when multiprocessing is not fully loaded when logging occurs.
........
  r79284 | vinay.sajip | 2010-03-22 08:02:28 -0500 (Mon, 22 Mar 2010) | 1 line
  Issue #8201: logging: Handle config errors when non-ASCII and Unicode logger names exist at the same time.
........
  r79293 | vinay.sajip | 2010-03-22 10:29:01 -0500 (Mon, 22 Mar 2010) | 1 line
  logging: Added getChild utility method to Logger and added isEnabledFor method to LoggerAdapter.
........
  r79373 | vinay.sajip | 2010-03-24 09:31:21 -0500 (Wed, 24 Mar 2010) | 1 line
  logging: Added LOG_FTP for SysLogHandler and updated documentation.
........
  r79376 | vinay.sajip | 2010-03-24 10:10:40 -0500 (Wed, 24 Mar 2010) | 1 line
  logging: Documentation tweak.
........
  r79379 | vinay.sajip | 2010-03-24 12:36:35 -0500 (Wed, 24 Mar 2010) | 1 line
  logging: Updated SysLogHandler documentation.
........
  r79876 | vinay.sajip | 2010-04-06 17:32:37 -0500 (Tue, 06 Apr 2010) | 1 line
  Issue #8327: logging: Clarification of propagation functionality in documentation.
........
  r79888 | vinay.sajip | 2010-04-07 04:40:52 -0500 (Wed, 07 Apr 2010) | 1 line
  Issue #8331: logging: fixed some grammatical errors in documentation.
........
											
										 
											2010-04-11 16:25:06 +00:00
										 |  |  |         # Set two unused loggers: one non-ASCII and one Unicode. | 
					
						
							|  |  |  |         # This is to test correct operation when sorting existing | 
					
						
							|  |  |  |         # loggers in the configuration code. See issue 8201. | 
					
						
							| 
									
										
										
										
											2010-09-20 09:55:00 +00:00
										 |  |  |         self.logger1 = logging.getLogger("\xab\xd7\xbb") | 
					
						
							|  |  |  |         self.logger2 = logging.getLogger("\u013f\u00d6\u0047") | 
					
						
							| 
									
										
											  
											
												Merged revisions 79279,79284,79293,79373,79376,79379,79876,79888 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r79279 | vinay.sajip | 2010-03-22 07:33:08 -0500 (Mon, 22 Mar 2010) | 1 line
  Issue #8200: logging: Handle errors when multiprocessing is not fully loaded when logging occurs.
........
  r79284 | vinay.sajip | 2010-03-22 08:02:28 -0500 (Mon, 22 Mar 2010) | 1 line
  Issue #8201: logging: Handle config errors when non-ASCII and Unicode logger names exist at the same time.
........
  r79293 | vinay.sajip | 2010-03-22 10:29:01 -0500 (Mon, 22 Mar 2010) | 1 line
  logging: Added getChild utility method to Logger and added isEnabledFor method to LoggerAdapter.
........
  r79373 | vinay.sajip | 2010-03-24 09:31:21 -0500 (Wed, 24 Mar 2010) | 1 line
  logging: Added LOG_FTP for SysLogHandler and updated documentation.
........
  r79376 | vinay.sajip | 2010-03-24 10:10:40 -0500 (Wed, 24 Mar 2010) | 1 line
  logging: Documentation tweak.
........
  r79379 | vinay.sajip | 2010-03-24 12:36:35 -0500 (Wed, 24 Mar 2010) | 1 line
  logging: Updated SysLogHandler documentation.
........
  r79876 | vinay.sajip | 2010-04-06 17:32:37 -0500 (Tue, 06 Apr 2010) | 1 line
  Issue #8327: logging: Clarification of propagation functionality in documentation.
........
  r79888 | vinay.sajip | 2010-04-07 04:40:52 -0500 (Wed, 07 Apr 2010) | 1 line
  Issue #8331: logging: fixed some grammatical errors in documentation.
........
											
										 
											2010-04-11 16:25:06 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |         self.root_logger = logging.getLogger("") | 
					
						
							|  |  |  |         self.original_logging_level = self.root_logger.getEffectiveLevel() | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         self.stream = io.StringIO() | 
					
						
							|  |  |  |         self.root_logger.setLevel(logging.DEBUG) | 
					
						
							|  |  |  |         self.root_hdlr = logging.StreamHandler(self.stream) | 
					
						
							|  |  |  |         self.root_formatter = logging.Formatter(self.log_format) | 
					
						
							|  |  |  |         self.root_hdlr.setFormatter(self.root_formatter) | 
					
						
							| 
									
										
										
										
											2010-12-30 23:26:50 +00:00
										 |  |  |         if self.logger1.hasHandlers(): | 
					
						
							|  |  |  |             hlist = self.logger1.handlers + self.root_logger.handlers | 
					
						
							|  |  |  |             raise AssertionError('Unexpected handlers: %s' % hlist) | 
					
						
							|  |  |  |         if self.logger2.hasHandlers(): | 
					
						
							|  |  |  |             hlist = self.logger2.handlers + self.root_logger.handlers | 
					
						
							|  |  |  |             raise AssertionError('Unexpected handlers: %s' % hlist) | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |         self.root_logger.addHandler(self.root_hdlr) | 
					
						
							| 
									
										
										
										
											2010-09-20 09:55:00 +00:00
										 |  |  |         self.assertTrue(self.logger1.hasHandlers()) | 
					
						
							|  |  |  |         self.assertTrue(self.logger2.hasHandlers()) | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def tearDown(self): | 
					
						
							|  |  |  |         """Remove our logging stream, and restore the original logging
 | 
					
						
							|  |  |  |         level."""
 | 
					
						
							|  |  |  |         self.stream.close() | 
					
						
							|  |  |  |         self.root_logger.removeHandler(self.root_hdlr) | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  |         while self.root_logger.handlers: | 
					
						
							|  |  |  |             h = self.root_logger.handlers[0] | 
					
						
							|  |  |  |             self.root_logger.removeHandler(h) | 
					
						
							|  |  |  |             h.close() | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |         self.root_logger.setLevel(self.original_logging_level) | 
					
						
							|  |  |  |         logging._acquireLock() | 
					
						
							|  |  |  |         try: | 
					
						
							|  |  |  |             logging._levelNames.clear() | 
					
						
							|  |  |  |             logging._levelNames.update(self.saved_level_names) | 
					
						
							|  |  |  |             logging._handlers.clear() | 
					
						
							|  |  |  |             logging._handlers.update(self.saved_handlers) | 
					
						
							|  |  |  |             logging._handlerList[:] = self.saved_handler_list | 
					
						
							|  |  |  |             loggerDict = logging.getLogger().manager.loggerDict | 
					
						
							|  |  |  |             loggerDict.clear() | 
					
						
							|  |  |  |             loggerDict.update(self.saved_loggers) | 
					
						
							| 
									
										
										
										
											2010-12-27 14:31:52 +00:00
										 |  |  |             logger_states = self.logger_states | 
					
						
							|  |  |  |             for name in self.logger_states: | 
					
						
							|  |  |  |                 if logger_states[name] is not None: | 
					
						
							|  |  |  |                     self.saved_loggers[name].disabled = logger_states[name] | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |         finally: | 
					
						
							|  |  |  |             logging._releaseLock() | 
					
						
							| 
									
										
											  
											
												Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60873 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r60850 | amaury.forgeotdarc | 2008-02-16 01:16:50 +0100 (Sat, 16 Feb 2008) | 3 lines
  mmap.PROT_READ does not exists on win32;
  Skip this test created by r60830.
........
  r60851 | raymond.hettinger | 2008-02-16 02:22:54 +0100 (Sat, 16 Feb 2008) | 1 line
  Add __all__ to logging module.
........
  r60855 | georg.brandl | 2008-02-16 10:37:32 +0100 (Sat, 16 Feb 2008) | 2 lines
  #2120: broken links in advocacy document.
........
  r60860 | amaury.forgeotdarc | 2008-02-16 15:34:57 +0100 (Sat, 16 Feb 2008) | 23 lines
  Crashers of the day: Py_CLEAR must be used when there is a chance that the
  function can be called recursively.
  This was discussed in issue1020188.
  In python codebase, all occurrences of Py_[X]DECREF(xxx->yyy) are suspect,
  except when they appear in tp_new or tp_dealloc functions, or when
  the member cannot be of a user-defined class.
  Note that tp_init is not safe.
  I do have a (crashing) example for every changed line.
  Is it worth adding them to the test suite?
  Example:
  class SpecialStr(str):
      def __del__(self):
          s.close()
  import cStringIO
  s = cStringIO.StringIO(SpecialStr("text"))
  s.close() # Segfault
........
  r60871 | amaury.forgeotdarc | 2008-02-16 21:55:24 +0100 (Sat, 16 Feb 2008) | 3 lines
  Prevent a crash with nested scopes, again caused by calling Py_DECREF when the pointer
  is still present in the containing structure.
........
  r60872 | brett.cannon | 2008-02-17 02:59:18 +0100 (Sun, 17 Feb 2008) | 4 lines
  Move test_logging over to doctest.
  Thanks to Christopher White from GHOP.
........
  r60873 | georg.brandl | 2008-02-17 12:33:38 +0100 (Sun, 17 Feb 2008) | 2 lines
  #2131: note that codecs.open() always opens files in binary mode.
........
											
										 
											2008-02-17 13:31:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-07-01 00:43:10 +00:00
										 |  |  |     def assert_log_lines(self, expected_values, stream=None): | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |         """Match the collected log lines against the regular expression
 | 
					
						
							|  |  |  |         self.expected_log_pat, and compare the extracted group values to | 
					
						
							|  |  |  |         the expected_values list of tuples."""
 | 
					
						
							|  |  |  |         stream = stream or self.stream | 
					
						
							|  |  |  |         pat = re.compile(self.expected_log_pat) | 
					
						
							|  |  |  |         try: | 
					
						
							|  |  |  |             stream.reset() | 
					
						
							|  |  |  |             actual_lines = stream.readlines() | 
					
						
							|  |  |  |         except AttributeError: | 
					
						
							|  |  |  |             # StringIO.StringIO lacks a reset() method. | 
					
						
							|  |  |  |             actual_lines = stream.getvalue().splitlines() | 
					
						
							| 
									
										
										
										
											2011-06-05 09:31:34 +01:00
										 |  |  |         self.assertEqual(len(actual_lines), len(expected_values)) | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |         for actual, expected in zip(actual_lines, expected_values): | 
					
						
							|  |  |  |             match = pat.search(actual) | 
					
						
							|  |  |  |             if not match: | 
					
						
							|  |  |  |                 self.fail("Log line does not match expected pattern:\n" + | 
					
						
							|  |  |  |                             actual) | 
					
						
							| 
									
										
										
										
											2010-11-20 19:04:17 +00:00
										 |  |  |             self.assertEqual(tuple(match.groups()), expected) | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |         s = stream.read() | 
					
						
							|  |  |  |         if s: | 
					
						
							|  |  |  |             self.fail("Remaining output at end of log stream:\n" + s) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def next_message(self): | 
					
						
							|  |  |  |         """Generate a message consisting solely of an auto-incrementing
 | 
					
						
							|  |  |  |         integer."""
 | 
					
						
							|  |  |  |         self.message_num += 1 | 
					
						
							|  |  |  |         return "%d" % self.message_num | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | class BuiltinLevelsTest(BaseTest): | 
					
						
							|  |  |  |     """Test builtin levels and their inheritance.""" | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_flat(self): | 
					
						
							|  |  |  |         #Logging levels in a flat logger namespace. | 
					
						
							|  |  |  |         m = self.next_message | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         ERR = logging.getLogger("ERR") | 
					
						
							|  |  |  |         ERR.setLevel(logging.ERROR) | 
					
						
							| 
									
										
										
										
											2010-09-21 11:25:39 +00:00
										 |  |  |         INF = logging.LoggerAdapter(logging.getLogger("INF"), {}) | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |         INF.setLevel(logging.INFO) | 
					
						
							|  |  |  |         DEB = logging.getLogger("DEB") | 
					
						
							|  |  |  |         DEB.setLevel(logging.DEBUG) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         # These should log. | 
					
						
							|  |  |  |         ERR.log(logging.CRITICAL, m()) | 
					
						
							|  |  |  |         ERR.error(m()) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         INF.log(logging.CRITICAL, m()) | 
					
						
							|  |  |  |         INF.error(m()) | 
					
						
							|  |  |  |         INF.warn(m()) | 
					
						
							|  |  |  |         INF.info(m()) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         DEB.log(logging.CRITICAL, m()) | 
					
						
							|  |  |  |         DEB.error(m()) | 
					
						
							|  |  |  |         DEB.warn (m()) | 
					
						
							|  |  |  |         DEB.info (m()) | 
					
						
							|  |  |  |         DEB.debug(m()) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         # These should not log. | 
					
						
							|  |  |  |         ERR.warn(m()) | 
					
						
							|  |  |  |         ERR.info(m()) | 
					
						
							|  |  |  |         ERR.debug(m()) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         INF.debug(m()) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-07-01 00:43:10 +00:00
										 |  |  |         self.assert_log_lines([ | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |             ('ERR', 'CRITICAL', '1'), | 
					
						
							|  |  |  |             ('ERR', 'ERROR', '2'), | 
					
						
							|  |  |  |             ('INF', 'CRITICAL', '3'), | 
					
						
							|  |  |  |             ('INF', 'ERROR', '4'), | 
					
						
							|  |  |  |             ('INF', 'WARNING', '5'), | 
					
						
							|  |  |  |             ('INF', 'INFO', '6'), | 
					
						
							|  |  |  |             ('DEB', 'CRITICAL', '7'), | 
					
						
							|  |  |  |             ('DEB', 'ERROR', '8'), | 
					
						
							|  |  |  |             ('DEB', 'WARNING', '9'), | 
					
						
							|  |  |  |             ('DEB', 'INFO', '10'), | 
					
						
							|  |  |  |             ('DEB', 'DEBUG', '11'), | 
					
						
							|  |  |  |         ]) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_nested_explicit(self): | 
					
						
							|  |  |  |         # Logging levels in a nested namespace, all explicitly set. | 
					
						
							|  |  |  |         m = self.next_message | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         INF = logging.getLogger("INF") | 
					
						
							|  |  |  |         INF.setLevel(logging.INFO) | 
					
						
							|  |  |  |         INF_ERR  = logging.getLogger("INF.ERR") | 
					
						
							|  |  |  |         INF_ERR.setLevel(logging.ERROR) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         # These should log. | 
					
						
							|  |  |  |         INF_ERR.log(logging.CRITICAL, m()) | 
					
						
							|  |  |  |         INF_ERR.error(m()) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         # These should not log. | 
					
						
							|  |  |  |         INF_ERR.warn(m()) | 
					
						
							|  |  |  |         INF_ERR.info(m()) | 
					
						
							|  |  |  |         INF_ERR.debug(m()) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-07-01 00:43:10 +00:00
										 |  |  |         self.assert_log_lines([ | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |             ('INF.ERR', 'CRITICAL', '1'), | 
					
						
							|  |  |  |             ('INF.ERR', 'ERROR', '2'), | 
					
						
							|  |  |  |         ]) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_nested_inherited(self): | 
					
						
							|  |  |  |         #Logging levels in a nested namespace, inherited from parent loggers. | 
					
						
							|  |  |  |         m = self.next_message | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         INF = logging.getLogger("INF") | 
					
						
							|  |  |  |         INF.setLevel(logging.INFO) | 
					
						
							|  |  |  |         INF_ERR  = logging.getLogger("INF.ERR") | 
					
						
							|  |  |  |         INF_ERR.setLevel(logging.ERROR) | 
					
						
							|  |  |  |         INF_UNDEF = logging.getLogger("INF.UNDEF") | 
					
						
							|  |  |  |         INF_ERR_UNDEF = logging.getLogger("INF.ERR.UNDEF") | 
					
						
							|  |  |  |         UNDEF = logging.getLogger("UNDEF") | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         # These should log. | 
					
						
							|  |  |  |         INF_UNDEF.log(logging.CRITICAL, m()) | 
					
						
							|  |  |  |         INF_UNDEF.error(m()) | 
					
						
							|  |  |  |         INF_UNDEF.warn(m()) | 
					
						
							|  |  |  |         INF_UNDEF.info(m()) | 
					
						
							|  |  |  |         INF_ERR_UNDEF.log(logging.CRITICAL, m()) | 
					
						
							|  |  |  |         INF_ERR_UNDEF.error(m()) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         # These should not log. | 
					
						
							|  |  |  |         INF_UNDEF.debug(m()) | 
					
						
							|  |  |  |         INF_ERR_UNDEF.warn(m()) | 
					
						
							|  |  |  |         INF_ERR_UNDEF.info(m()) | 
					
						
							|  |  |  |         INF_ERR_UNDEF.debug(m()) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-07-01 00:43:10 +00:00
										 |  |  |         self.assert_log_lines([ | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |             ('INF.UNDEF', 'CRITICAL', '1'), | 
					
						
							|  |  |  |             ('INF.UNDEF', 'ERROR', '2'), | 
					
						
							|  |  |  |             ('INF.UNDEF', 'WARNING', '3'), | 
					
						
							|  |  |  |             ('INF.UNDEF', 'INFO', '4'), | 
					
						
							|  |  |  |             ('INF.ERR.UNDEF', 'CRITICAL', '5'), | 
					
						
							|  |  |  |             ('INF.ERR.UNDEF', 'ERROR', '6'), | 
					
						
							|  |  |  |         ]) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_nested_with_virtual_parent(self): | 
					
						
							|  |  |  |         # Logging levels when some parent does not exist yet. | 
					
						
							|  |  |  |         m = self.next_message | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         INF = logging.getLogger("INF") | 
					
						
							|  |  |  |         GRANDCHILD = logging.getLogger("INF.BADPARENT.UNDEF") | 
					
						
							|  |  |  |         CHILD = logging.getLogger("INF.BADPARENT") | 
					
						
							|  |  |  |         INF.setLevel(logging.INFO) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         # These should log. | 
					
						
							|  |  |  |         GRANDCHILD.log(logging.FATAL, m()) | 
					
						
							|  |  |  |         GRANDCHILD.info(m()) | 
					
						
							|  |  |  |         CHILD.log(logging.FATAL, m()) | 
					
						
							|  |  |  |         CHILD.info(m()) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         # These should not log. | 
					
						
							|  |  |  |         GRANDCHILD.debug(m()) | 
					
						
							|  |  |  |         CHILD.debug(m()) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-07-01 00:43:10 +00:00
										 |  |  |         self.assert_log_lines([ | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |             ('INF.BADPARENT.UNDEF', 'CRITICAL', '1'), | 
					
						
							|  |  |  |             ('INF.BADPARENT.UNDEF', 'INFO', '2'), | 
					
						
							|  |  |  |             ('INF.BADPARENT', 'CRITICAL', '3'), | 
					
						
							|  |  |  |             ('INF.BADPARENT', 'INFO', '4'), | 
					
						
							|  |  |  |         ]) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | class BasicFilterTest(BaseTest): | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     """Test the bundled Filter class.""" | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_filter(self): | 
					
						
							|  |  |  |         # Only messages satisfying the specified criteria pass through the | 
					
						
							|  |  |  |         #  filter. | 
					
						
							|  |  |  |         filter_ = logging.Filter("spam.eggs") | 
					
						
							|  |  |  |         handler = self.root_logger.handlers[0] | 
					
						
							|  |  |  |         try: | 
					
						
							|  |  |  |             handler.addFilter(filter_) | 
					
						
							|  |  |  |             spam = logging.getLogger("spam") | 
					
						
							|  |  |  |             spam_eggs = logging.getLogger("spam.eggs") | 
					
						
							|  |  |  |             spam_eggs_fish = logging.getLogger("spam.eggs.fish") | 
					
						
							|  |  |  |             spam_bakedbeans = logging.getLogger("spam.bakedbeans") | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |             spam.info(self.next_message()) | 
					
						
							|  |  |  |             spam_eggs.info(self.next_message())  # Good. | 
					
						
							|  |  |  |             spam_eggs_fish.info(self.next_message())  # Good. | 
					
						
							|  |  |  |             spam_bakedbeans.info(self.next_message()) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-07-01 00:43:10 +00:00
										 |  |  |             self.assert_log_lines([ | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |                 ('spam.eggs', 'INFO', '2'), | 
					
						
							|  |  |  |                 ('spam.eggs.fish', 'INFO', '3'), | 
					
						
							|  |  |  |             ]) | 
					
						
							|  |  |  |         finally: | 
					
						
							|  |  |  |             handler.removeFilter(filter_) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2010-10-19 20:53:01 +00:00
										 |  |  |     def test_callable_filter(self): | 
					
						
							|  |  |  |         # Only messages satisfying the specified criteria pass through the | 
					
						
							|  |  |  |         #  filter. | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         def filterfunc(record): | 
					
						
							|  |  |  |             parts = record.name.split('.') | 
					
						
							|  |  |  |             prefix = '.'.join(parts[:2]) | 
					
						
							|  |  |  |             return prefix == 'spam.eggs' | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         handler = self.root_logger.handlers[0] | 
					
						
							|  |  |  |         try: | 
					
						
							|  |  |  |             handler.addFilter(filterfunc) | 
					
						
							|  |  |  |             spam = logging.getLogger("spam") | 
					
						
							|  |  |  |             spam_eggs = logging.getLogger("spam.eggs") | 
					
						
							|  |  |  |             spam_eggs_fish = logging.getLogger("spam.eggs.fish") | 
					
						
							|  |  |  |             spam_bakedbeans = logging.getLogger("spam.bakedbeans") | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |             spam.info(self.next_message()) | 
					
						
							|  |  |  |             spam_eggs.info(self.next_message())  # Good. | 
					
						
							|  |  |  |             spam_eggs_fish.info(self.next_message())  # Good. | 
					
						
							|  |  |  |             spam_bakedbeans.info(self.next_message()) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |             self.assert_log_lines([ | 
					
						
							|  |  |  |                 ('spam.eggs', 'INFO', '2'), | 
					
						
							|  |  |  |                 ('spam.eggs.fish', 'INFO', '3'), | 
					
						
							|  |  |  |             ]) | 
					
						
							|  |  |  |         finally: | 
					
						
							|  |  |  |             handler.removeFilter(filterfunc) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-04-26 19:34:04 +01:00
										 |  |  |     def test_empty_filter(self): | 
					
						
							|  |  |  |         f = logging.Filter() | 
					
						
							|  |  |  |         r = logging.makeLogRecord({'name': 'spam.eggs'}) | 
					
						
							|  |  |  |         self.assertTrue(f.filter(r)) | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | # | 
					
						
							|  |  |  | #   First, we define our levels. There can be as many as you want - the only | 
					
						
							|  |  |  | #     limitations are that they should be integers, the lowest should be > 0 and | 
					
						
							|  |  |  | #   larger values mean less information being logged. If you need specific | 
					
						
							|  |  |  | #   level values which do not fit into these limitations, you can use a | 
					
						
							|  |  |  | #   mapping dictionary to convert between your application levels and the | 
					
						
							|  |  |  | #   logging system. | 
					
						
							|  |  |  | # | 
					
						
							|  |  |  | SILENT      = 120 | 
					
						
							|  |  |  | TACITURN    = 119 | 
					
						
							|  |  |  | TERSE       = 118 | 
					
						
							|  |  |  | EFFUSIVE    = 117 | 
					
						
							|  |  |  | SOCIABLE    = 116 | 
					
						
							|  |  |  | VERBOSE     = 115 | 
					
						
							|  |  |  | TALKATIVE   = 114 | 
					
						
							|  |  |  | GARRULOUS   = 113 | 
					
						
							|  |  |  | CHATTERBOX  = 112 | 
					
						
							|  |  |  | BORING      = 111 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | LEVEL_RANGE = range(BORING, SILENT + 1) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | # | 
					
						
							|  |  |  | #   Next, we define names for our levels. You don't need to do this - in which | 
					
						
							|  |  |  | #   case the system will use "Level n" to denote the text for the level. | 
					
						
							|  |  |  | # | 
					
						
							|  |  |  | my_logging_levels = { | 
					
						
							|  |  |  |     SILENT      : 'Silent', | 
					
						
							|  |  |  |     TACITURN    : 'Taciturn', | 
					
						
							|  |  |  |     TERSE       : 'Terse', | 
					
						
							|  |  |  |     EFFUSIVE    : 'Effusive', | 
					
						
							|  |  |  |     SOCIABLE    : 'Sociable', | 
					
						
							|  |  |  |     VERBOSE     : 'Verbose', | 
					
						
							|  |  |  |     TALKATIVE   : 'Talkative', | 
					
						
							|  |  |  |     GARRULOUS   : 'Garrulous', | 
					
						
							|  |  |  |     CHATTERBOX  : 'Chatterbox', | 
					
						
							|  |  |  |     BORING      : 'Boring', | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | class GarrulousFilter(logging.Filter): | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     """A filter which blocks garrulous messages.""" | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def filter(self, record): | 
					
						
							|  |  |  |         return record.levelno != GARRULOUS | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | class VerySpecificFilter(logging.Filter): | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     """A filter which blocks sociable and taciturn messages.""" | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def filter(self, record): | 
					
						
							|  |  |  |         return record.levelno not in [SOCIABLE, TACITURN] | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | class CustomLevelsAndFiltersTest(BaseTest): | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     """Test various filtering possibilities with custom logging levels.""" | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     # Skip the logger name group. | 
					
						
							|  |  |  |     expected_log_pat = r"^[\w.]+ -> ([\w]+): ([\d]+)$" | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def setUp(self): | 
					
						
							|  |  |  |         BaseTest.setUp(self) | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,77973,77979,77985-77986,78009,78029,78031-78033,78081,78085,78103,78105-78106,78108,78246,78703,78728,78731,78853,78855 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 12:48:53 -0600 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 14:18:28 -0600 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r77973 | vinay.sajip | 2010-02-04 14:23:45 -0600 (Thu, 04 Feb 2010) | 1 line
  Issue #7851: logging: clarification on logging configuration files.
........
  r77979 | vinay.sajip | 2010-02-04 15:40:56 -0600 (Thu, 04 Feb 2010) | 1 line
  Added unit test for cfg:// resolution.
........
  r77985 | vinay.sajip | 2010-02-05 08:52:05 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener test now uses find_unused_port().
........
  r77986 | vinay.sajip | 2010-02-05 09:40:20 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener tests disabled for now.
........
  r78009 | vinay.sajip | 2010-02-05 17:43:11 -0600 (Fri, 05 Feb 2010) | 1 line
  test_logging: minor tweaks to timeouts, listening tests marked as skipped.
........
  r78029 | vinay.sajip | 2010-02-06 14:00:43 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Tentatively re-enabling one test to see effect on buildbots.
........
  r78031 | vinay.sajip | 2010-02-06 14:28:36 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Gave server thread more time to get ready, and re-enabled a skipped test.
........
  r78032 | georg.brandl | 2010-02-06 15:54:40 -0600 (Sat, 06 Feb 2010) | 1 line
  Remove unused imports from test_logging.
........
  r78033 | benjamin.peterson | 2010-02-06 16:08:15 -0600 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78081 | vinay.sajip | 2010-02-07 06:56:54 -0600 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 07:06:51 -0600 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78103 | vinay.sajip | 2010-02-08 00:50:14 -0600 (Mon, 08 Feb 2010) | 1 line
  Removed spurious print statement in test.
........
  r78105 | vinay.sajip | 2010-02-08 09:32:08 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: skipped listening tests because they're not working reliably.
........
  r78106 | vinay.sajip | 2010-02-08 10:05:50 -0600 (Mon, 08 Feb 2010) | 1 line
  Issue #7857: Another attempt to keep the buildbots happy.
........
  r78108 | vinay.sajip | 2010-02-08 15:18:15 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
  r78246 | vinay.sajip | 2010-02-19 17:53:17 -0600 (Fri, 19 Feb 2010) | 1 line
  logging: Documented warnings module integration.
........
  r78703 | vinay.sajip | 2010-03-05 16:11:24 -0600 (Fri, 05 Mar 2010) | 1 line
  Factored out time usage determination into a method, to facilitate alternative formatting implementations in the future.
........
  r78728 | vinay.sajip | 2010-03-06 09:12:08 -0600 (Sat, 06 Mar 2010) | 1 line
  Added schema version test in dictConfig.
........
  r78731 | vinay.sajip | 2010-03-06 09:56:03 -0600 (Sat, 06 Mar 2010) | 1 line
  Added checks for tuples in dictConfig.
........
  r78853 | vinay.sajip | 2010-03-12 00:01:21 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: logging: Improved algorithm for computing initial rollover time.
........
  r78855 | vinay.sajip | 2010-03-12 03:16:10 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: Updated NEWS entry and added to logging documentation.
........
											
										 
											2010-03-13 22:30:34 +00:00
										 |  |  |         for k, v in my_logging_levels.items(): | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |             logging.addLevelName(k, v) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def log_at_all_levels(self, logger): | 
					
						
							|  |  |  |         for lvl in LEVEL_RANGE: | 
					
						
							|  |  |  |             logger.log(lvl, self.next_message()) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_logger_filter(self): | 
					
						
							|  |  |  |         # Filter at logger level. | 
					
						
							|  |  |  |         self.root_logger.setLevel(VERBOSE) | 
					
						
							|  |  |  |         # Levels >= 'Verbose' are good. | 
					
						
							|  |  |  |         self.log_at_all_levels(self.root_logger) | 
					
						
							| 
									
										
										
										
											2009-07-01 00:43:10 +00:00
										 |  |  |         self.assert_log_lines([ | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |             ('Verbose', '5'), | 
					
						
							|  |  |  |             ('Sociable', '6'), | 
					
						
							|  |  |  |             ('Effusive', '7'), | 
					
						
							|  |  |  |             ('Terse', '8'), | 
					
						
							|  |  |  |             ('Taciturn', '9'), | 
					
						
							|  |  |  |             ('Silent', '10'), | 
					
						
							|  |  |  |         ]) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_handler_filter(self): | 
					
						
							|  |  |  |         # Filter at handler level. | 
					
						
							|  |  |  |         self.root_logger.handlers[0].setLevel(SOCIABLE) | 
					
						
							|  |  |  |         try: | 
					
						
							|  |  |  |             # Levels >= 'Sociable' are good. | 
					
						
							|  |  |  |             self.log_at_all_levels(self.root_logger) | 
					
						
							| 
									
										
										
										
											2009-07-01 00:43:10 +00:00
										 |  |  |             self.assert_log_lines([ | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |                 ('Sociable', '6'), | 
					
						
							|  |  |  |                 ('Effusive', '7'), | 
					
						
							|  |  |  |                 ('Terse', '8'), | 
					
						
							|  |  |  |                 ('Taciturn', '9'), | 
					
						
							|  |  |  |                 ('Silent', '10'), | 
					
						
							|  |  |  |             ]) | 
					
						
							|  |  |  |         finally: | 
					
						
							|  |  |  |             self.root_logger.handlers[0].setLevel(logging.NOTSET) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_specific_filters(self): | 
					
						
							|  |  |  |         # Set a specific filter object on the handler, and then add another | 
					
						
							|  |  |  |         #  filter object on the logger itself. | 
					
						
							|  |  |  |         handler = self.root_logger.handlers[0] | 
					
						
							|  |  |  |         specific_filter = None | 
					
						
							|  |  |  |         garr = GarrulousFilter() | 
					
						
							|  |  |  |         handler.addFilter(garr) | 
					
						
							|  |  |  |         try: | 
					
						
							|  |  |  |             self.log_at_all_levels(self.root_logger) | 
					
						
							|  |  |  |             first_lines = [ | 
					
						
							|  |  |  |                 # Notice how 'Garrulous' is missing | 
					
						
							|  |  |  |                 ('Boring', '1'), | 
					
						
							|  |  |  |                 ('Chatterbox', '2'), | 
					
						
							|  |  |  |                 ('Talkative', '4'), | 
					
						
							|  |  |  |                 ('Verbose', '5'), | 
					
						
							|  |  |  |                 ('Sociable', '6'), | 
					
						
							|  |  |  |                 ('Effusive', '7'), | 
					
						
							|  |  |  |                 ('Terse', '8'), | 
					
						
							|  |  |  |                 ('Taciturn', '9'), | 
					
						
							|  |  |  |                 ('Silent', '10'), | 
					
						
							|  |  |  |             ] | 
					
						
							| 
									
										
										
										
											2009-07-01 00:43:10 +00:00
										 |  |  |             self.assert_log_lines(first_lines) | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |             specific_filter = VerySpecificFilter() | 
					
						
							|  |  |  |             self.root_logger.addFilter(specific_filter) | 
					
						
							|  |  |  |             self.log_at_all_levels(self.root_logger) | 
					
						
							| 
									
										
										
										
											2009-07-01 00:43:10 +00:00
										 |  |  |             self.assert_log_lines(first_lines + [ | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |                 # Not only 'Garrulous' is still missing, but also 'Sociable' | 
					
						
							|  |  |  |                 # and 'Taciturn' | 
					
						
							|  |  |  |                 ('Boring', '11'), | 
					
						
							|  |  |  |                 ('Chatterbox', '12'), | 
					
						
							|  |  |  |                 ('Talkative', '14'), | 
					
						
							|  |  |  |                 ('Verbose', '15'), | 
					
						
							|  |  |  |                 ('Effusive', '17'), | 
					
						
							|  |  |  |                 ('Terse', '18'), | 
					
						
							|  |  |  |                 ('Silent', '20'), | 
					
						
							|  |  |  |         ]) | 
					
						
							|  |  |  |         finally: | 
					
						
							|  |  |  |             if specific_filter: | 
					
						
							|  |  |  |                 self.root_logger.removeFilter(specific_filter) | 
					
						
							|  |  |  |             handler.removeFilter(garr) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-04-26 18:43:05 +01:00
										 |  |  | class HandlerTest(BaseTest): | 
					
						
							|  |  |  |     def test_name(self): | 
					
						
							|  |  |  |         h = logging.Handler() | 
					
						
							|  |  |  |         h.name = 'generic' | 
					
						
							|  |  |  |         self.assertEqual(h.name, 'generic') | 
					
						
							|  |  |  |         h.name = 'anothergeneric' | 
					
						
							|  |  |  |         self.assertEqual(h.name, 'anothergeneric') | 
					
						
							|  |  |  |         self.assertRaises(NotImplementedError, h.emit, None) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-04-27 11:31:14 +01:00
										 |  |  |     def test_builtin_handlers(self): | 
					
						
							|  |  |  |         # We can't actually *use* too many handlers in the tests, | 
					
						
							|  |  |  |         # but we can try instantiating them with various options | 
					
						
							| 
									
										
										
										
											2011-08-21 00:39:18 +02:00
										 |  |  |         if sys.platform in ('linux', 'darwin'): | 
					
						
							| 
									
										
										
										
											2011-04-27 11:31:14 +01:00
										 |  |  |             for existing in (True, False): | 
					
						
							|  |  |  |                 fd, fn = tempfile.mkstemp() | 
					
						
							|  |  |  |                 os.close(fd) | 
					
						
							|  |  |  |                 if not existing: | 
					
						
							|  |  |  |                     os.unlink(fn) | 
					
						
							|  |  |  |                 h = logging.handlers.WatchedFileHandler(fn, delay=True) | 
					
						
							|  |  |  |                 if existing: | 
					
						
							| 
									
										
										
										
											2011-04-28 12:04:58 +01:00
										 |  |  |                     dev, ino = h.dev, h.ino | 
					
						
							|  |  |  |                     self.assertNotEqual(dev, -1) | 
					
						
							|  |  |  |                     self.assertNotEqual(ino, -1) | 
					
						
							|  |  |  |                     r = logging.makeLogRecord({'msg': 'Test'}) | 
					
						
							|  |  |  |                     h.handle(r) | 
					
						
							|  |  |  |                     # Now remove the file. | 
					
						
							|  |  |  |                     os.unlink(fn) | 
					
						
							|  |  |  |                     self.assertFalse(os.path.exists(fn)) | 
					
						
							|  |  |  |                     # The next call should recreate the file. | 
					
						
							|  |  |  |                     h.handle(r) | 
					
						
							|  |  |  |                     self.assertTrue(os.path.exists(fn)) | 
					
						
							| 
									
										
										
										
											2011-04-27 11:31:14 +01:00
										 |  |  |                 else: | 
					
						
							|  |  |  |                     self.assertEqual(h.dev, -1) | 
					
						
							|  |  |  |                     self.assertEqual(h.ino, -1) | 
					
						
							|  |  |  |                 h.close() | 
					
						
							|  |  |  |                 if existing: | 
					
						
							|  |  |  |                     os.unlink(fn) | 
					
						
							|  |  |  |             if sys.platform == 'darwin': | 
					
						
							| 
									
										
										
										
											2011-04-27 14:31:55 +01:00
										 |  |  |                 sockname = '/var/run/syslog' | 
					
						
							| 
									
										
										
										
											2011-04-27 11:31:14 +01:00
										 |  |  |             else: | 
					
						
							|  |  |  |                 sockname = '/dev/log' | 
					
						
							| 
									
										
										
										
											2011-04-27 14:18:06 +01:00
										 |  |  |             try: | 
					
						
							|  |  |  |                 h = logging.handlers.SysLogHandler(sockname) | 
					
						
							|  |  |  |                 self.assertEqual(h.facility, h.LOG_USER) | 
					
						
							|  |  |  |                 self.assertTrue(h.unixsocket) | 
					
						
							|  |  |  |                 h.close() | 
					
						
							|  |  |  |             except socket.error: # syslogd might not be available | 
					
						
							|  |  |  |                 pass | 
					
						
							| 
									
										
										
										
											2011-04-27 11:31:14 +01:00
										 |  |  |         for method in ('GET', 'POST', 'PUT'): | 
					
						
							|  |  |  |             if method == 'PUT': | 
					
						
							|  |  |  |                 self.assertRaises(ValueError, logging.handlers.HTTPHandler, | 
					
						
							|  |  |  |                                   'localhost', '/log', method) | 
					
						
							|  |  |  |             else: | 
					
						
							|  |  |  |                 h = logging.handlers.HTTPHandler('localhost', '/log', method) | 
					
						
							|  |  |  |                 h.close() | 
					
						
							|  |  |  |         h = logging.handlers.BufferingHandler(0) | 
					
						
							|  |  |  |         r = logging.makeLogRecord({}) | 
					
						
							|  |  |  |         self.assertTrue(h.shouldFlush(r)) | 
					
						
							|  |  |  |         h.close() | 
					
						
							|  |  |  |         h = logging.handlers.BufferingHandler(1) | 
					
						
							|  |  |  |         self.assertFalse(h.shouldFlush(r)) | 
					
						
							|  |  |  |         h.close() | 
					
						
							| 
									
										
										
										
											2011-04-26 18:43:05 +01:00
										 |  |  | 
 | 
					
						
							|  |  |  | class BadStream(object): | 
					
						
							|  |  |  |     def write(self, data): | 
					
						
							|  |  |  |         raise RuntimeError('deliberate mistake') | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | class TestStreamHandler(logging.StreamHandler): | 
					
						
							|  |  |  |     def handleError(self, record): | 
					
						
							|  |  |  |         self.error_record = record | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | class StreamHandlerTest(BaseTest): | 
					
						
							|  |  |  |     def test_error_handling(self): | 
					
						
							|  |  |  |         h = TestStreamHandler(BadStream()) | 
					
						
							|  |  |  |         r = logging.makeLogRecord({}) | 
					
						
							|  |  |  |         old_raise = logging.raiseExceptions | 
					
						
							| 
									
										
										
										
											2011-04-26 19:34:04 +01:00
										 |  |  |         old_stderr = sys.stderr | 
					
						
							| 
									
										
										
										
											2011-04-26 18:43:05 +01:00
										 |  |  |         try: | 
					
						
							|  |  |  |             h.handle(r) | 
					
						
							|  |  |  |             self.assertIs(h.error_record, r) | 
					
						
							| 
									
										
										
										
											2011-04-26 19:34:04 +01:00
										 |  |  |             h = logging.StreamHandler(BadStream()) | 
					
						
							|  |  |  |             sys.stderr = sio = io.StringIO() | 
					
						
							|  |  |  |             h.handle(r) | 
					
						
							| 
									
										
										
										
											2011-06-05 09:31:34 +01:00
										 |  |  |             self.assertIn('\nRuntimeError: deliberate mistake\n', | 
					
						
							|  |  |  |                           sio.getvalue()) | 
					
						
							| 
									
										
										
										
											2011-04-26 19:34:04 +01:00
										 |  |  |             logging.raiseExceptions = False | 
					
						
							|  |  |  |             sys.stderr = sio = io.StringIO() | 
					
						
							|  |  |  |             h.handle(r) | 
					
						
							|  |  |  |             self.assertEqual('', sio.getvalue()) | 
					
						
							| 
									
										
										
										
											2011-04-26 18:43:05 +01:00
										 |  |  |         finally: | 
					
						
							|  |  |  |             logging.raiseExceptions = old_raise | 
					
						
							| 
									
										
										
										
											2011-04-26 19:34:04 +01:00
										 |  |  |             sys.stderr = old_stderr | 
					
						
							| 
									
										
										
										
											2011-04-26 18:43:05 +01:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-05-02 13:17:27 +01:00
										 |  |  | # -- The following section could be moved into a server_helper.py module | 
					
						
							|  |  |  | # -- if it proves to be of wider utility than just test_logging | 
					
						
							| 
									
										
										
										
											2011-04-30 21:52:48 +01:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-05-17 07:15:53 +01:00
										 |  |  | if threading: | 
					
						
							|  |  |  |     class TestSMTPChannel(smtpd.SMTPChannel): | 
					
						
							| 
									
										
										
										
											2011-05-02 14:31:16 +01:00
										 |  |  |         """
 | 
					
						
							| 
									
										
										
										
											2011-05-17 07:15:53 +01:00
										 |  |  |         This derived class has had to be created because smtpd does not | 
					
						
							|  |  |  |         support use of custom channel maps, although they are allowed by | 
					
						
							|  |  |  |         asyncore's design. Issue #11959 has been raised to address this, | 
					
						
							|  |  |  |         and if resolved satisfactorily, some of this code can be removed. | 
					
						
							| 
									
										
										
										
											2011-05-02 14:31:16 +01:00
										 |  |  |         """
 | 
					
						
							| 
									
										
										
										
											2011-05-17 07:15:53 +01:00
										 |  |  |         def __init__(self, server, conn, addr, sockmap): | 
					
						
							|  |  |  |             asynchat.async_chat.__init__(self, conn, sockmap) | 
					
						
							|  |  |  |             self.smtp_server = server | 
					
						
							|  |  |  |             self.conn = conn | 
					
						
							|  |  |  |             self.addr = addr | 
					
						
							|  |  |  |             self.received_lines = [] | 
					
						
							|  |  |  |             self.smtp_state = self.COMMAND | 
					
						
							|  |  |  |             self.seen_greeting = '' | 
					
						
							|  |  |  |             self.mailfrom = None | 
					
						
							|  |  |  |             self.rcpttos = [] | 
					
						
							|  |  |  |             self.received_data = '' | 
					
						
							|  |  |  |             self.fqdn = socket.getfqdn() | 
					
						
							|  |  |  |             self.num_bytes = 0 | 
					
						
							|  |  |  |             try: | 
					
						
							|  |  |  |                 self.peer = conn.getpeername() | 
					
						
							|  |  |  |             except socket.error as err: | 
					
						
							|  |  |  |                 # a race condition  may occur if the other end is closing | 
					
						
							|  |  |  |                 # before we can get the peername | 
					
						
							|  |  |  |                 self.close() | 
					
						
							|  |  |  |                 if err.args[0] != errno.ENOTCONN: | 
					
						
							|  |  |  |                     raise | 
					
						
							|  |  |  |                 return | 
					
						
							|  |  |  |             self.push('220 %s %s' % (self.fqdn, smtpd.__version__)) | 
					
						
							|  |  |  |             self.set_terminator(b'\r\n') | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     class TestSMTPServer(smtpd.SMTPServer): | 
					
						
							| 
									
										
										
										
											2011-05-02 14:31:16 +01:00
										 |  |  |         """
 | 
					
						
							| 
									
										
										
										
											2011-05-17 07:15:53 +01:00
										 |  |  |         This class implements a test SMTP server. | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         :param addr: A (host, port) tuple which the server listens on. | 
					
						
							|  |  |  |                      You can specify a port value of zero: the server's | 
					
						
							|  |  |  |                      *port* attribute will hold the actual port number | 
					
						
							|  |  |  |                      used, which can be used in client connections. | 
					
						
							|  |  |  |         :param handler: A callable which will be called to process | 
					
						
							|  |  |  |                         incoming messages. The handler will be passed | 
					
						
							|  |  |  |                         the client address tuple, who the message is from, | 
					
						
							|  |  |  |                         a list of recipients and the message data. | 
					
						
							| 
									
										
										
										
											2011-05-02 14:31:16 +01:00
										 |  |  |         :param poll_interval: The interval, in seconds, used in the underlying | 
					
						
							|  |  |  |                               :func:`select` or :func:`poll` call by | 
					
						
							|  |  |  |                               :func:`asyncore.loop`. | 
					
						
							| 
									
										
										
										
											2011-05-17 07:15:53 +01:00
										 |  |  |         :param sockmap: A dictionary which will be used to hold | 
					
						
							|  |  |  |                         :class:`asyncore.dispatcher` instances used by | 
					
						
							|  |  |  |                         :func:`asyncore.loop`. This avoids changing the | 
					
						
							|  |  |  |                         :mod:`asyncore` module's global state. | 
					
						
							| 
									
										
										
										
											2011-05-02 14:31:16 +01:00
										 |  |  |         """
 | 
					
						
							| 
									
										
										
										
											2011-05-17 07:15:53 +01:00
										 |  |  |         channel_class = TestSMTPChannel | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         def __init__(self, addr, handler, poll_interval, sockmap): | 
					
						
							|  |  |  |             self._localaddr = addr | 
					
						
							|  |  |  |             self._remoteaddr = None | 
					
						
							|  |  |  |             self.sockmap = sockmap | 
					
						
							|  |  |  |             asyncore.dispatcher.__init__(self, map=sockmap) | 
					
						
							|  |  |  |             try: | 
					
						
							|  |  |  |                 sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) | 
					
						
							|  |  |  |                 sock.setblocking(0) | 
					
						
							|  |  |  |                 self.set_socket(sock, map=sockmap) | 
					
						
							|  |  |  |                 # try to re-use a server port if possible | 
					
						
							|  |  |  |                 self.set_reuse_addr() | 
					
						
							|  |  |  |                 self.bind(addr) | 
					
						
							|  |  |  |                 self.port = sock.getsockname()[1] | 
					
						
							|  |  |  |                 self.listen(5) | 
					
						
							|  |  |  |             except: | 
					
						
							|  |  |  |                 self.close() | 
					
						
							| 
									
										
										
										
											2011-05-10 07:48:28 +01:00
										 |  |  |                 raise | 
					
						
							| 
									
										
										
										
											2011-05-17 07:15:53 +01:00
										 |  |  |             self._handler = handler | 
					
						
							|  |  |  |             self._thread = None | 
					
						
							|  |  |  |             self.poll_interval = poll_interval | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         def handle_accepted(self, conn, addr): | 
					
						
							|  |  |  |             """
 | 
					
						
							|  |  |  |             Redefined only because the base class does not pass in a | 
					
						
							|  |  |  |             map, forcing use of a global in :mod:`asyncore`. | 
					
						
							|  |  |  |             """
 | 
					
						
							|  |  |  |             channel = self.channel_class(self, conn, addr, self.sockmap) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         def process_message(self, peer, mailfrom, rcpttos, data): | 
					
						
							|  |  |  |             """
 | 
					
						
							|  |  |  |             Delegates to the handler passed in to the server's constructor. | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |             Typically, this will be a test case method. | 
					
						
							|  |  |  |             :param peer: The client (host, port) tuple. | 
					
						
							|  |  |  |             :param mailfrom: The address of the sender. | 
					
						
							|  |  |  |             :param rcpttos: The addresses of the recipients. | 
					
						
							|  |  |  |             :param data: The message. | 
					
						
							|  |  |  |             """
 | 
					
						
							|  |  |  |             self._handler(peer, mailfrom, rcpttos, data) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         def start(self): | 
					
						
							|  |  |  |             """
 | 
					
						
							|  |  |  |             Start the server running on a separate daemon thread. | 
					
						
							|  |  |  |             """
 | 
					
						
							|  |  |  |             self._thread = t = threading.Thread(target=self.serve_forever, | 
					
						
							|  |  |  |                                                 args=(self.poll_interval,)) | 
					
						
							|  |  |  |             t.setDaemon(True) | 
					
						
							|  |  |  |             t.start() | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         def serve_forever(self, poll_interval): | 
					
						
							|  |  |  |             """
 | 
					
						
							|  |  |  |             Run the :mod:`asyncore` loop until normal termination | 
					
						
							|  |  |  |             conditions arise. | 
					
						
							|  |  |  |             :param poll_interval: The interval, in seconds, used in the underlying | 
					
						
							|  |  |  |                                   :func:`select` or :func:`poll` call by | 
					
						
							|  |  |  |                                   :func:`asyncore.loop`. | 
					
						
							|  |  |  |             """
 | 
					
						
							|  |  |  |             try: | 
					
						
							|  |  |  |                 asyncore.loop(poll_interval, map=self.sockmap) | 
					
						
							|  |  |  |             except select.error: | 
					
						
							|  |  |  |                 # On FreeBSD 8, closing the server repeatably | 
					
						
							|  |  |  |                 # raises this error. We swallow it if the | 
					
						
							|  |  |  |                 # server has been closed. | 
					
						
							|  |  |  |                 if self.connected or self.accepting: | 
					
						
							|  |  |  |                     raise | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         def stop(self, timeout=None): | 
					
						
							|  |  |  |             """
 | 
					
						
							|  |  |  |             Stop the thread by closing the server instance. | 
					
						
							|  |  |  |             Wait for the server thread to terminate. | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |             :param timeout: How long to wait for the server thread | 
					
						
							|  |  |  |                             to terminate. | 
					
						
							|  |  |  |             """
 | 
					
						
							|  |  |  |             self.close() | 
					
						
							|  |  |  |             self._thread.join(timeout) | 
					
						
							|  |  |  |             self._thread = None | 
					
						
							| 
									
										
										
										
											2011-04-30 21:52:48 +01:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-05-17 07:15:53 +01:00
										 |  |  |     class ControlMixin(object): | 
					
						
							| 
									
										
										
										
											2011-05-02 14:31:16 +01:00
										 |  |  |         """
 | 
					
						
							| 
									
										
										
										
											2011-05-17 07:15:53 +01:00
										 |  |  |         This mixin is used to start a server on a separate thread, and | 
					
						
							|  |  |  |         shut it down programmatically. Request handling is simplified - instead | 
					
						
							|  |  |  |         of needing to derive a suitable RequestHandler subclass, you just | 
					
						
							|  |  |  |         provide a callable which will be passed each received request to be | 
					
						
							|  |  |  |         processed. | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         :param handler: A handler callable which will be called with a | 
					
						
							|  |  |  |                         single parameter - the request - in order to | 
					
						
							|  |  |  |                         process the request. This handler is called on the | 
					
						
							|  |  |  |                         server thread, effectively meaning that requests are | 
					
						
							|  |  |  |                         processed serially. While not quite Web scale ;-), | 
					
						
							|  |  |  |                         this should be fine for testing applications. | 
					
						
							|  |  |  |         :param poll_interval: The polling interval in seconds. | 
					
						
							| 
									
										
										
										
											2011-05-02 14:31:16 +01:00
										 |  |  |         """
 | 
					
						
							| 
									
										
										
										
											2011-05-17 07:15:53 +01:00
										 |  |  |         def __init__(self, handler, poll_interval): | 
					
						
							|  |  |  |             self._thread = None | 
					
						
							|  |  |  |             self.poll_interval = poll_interval | 
					
						
							|  |  |  |             self._handler = handler | 
					
						
							|  |  |  |             self.ready = threading.Event() | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         def start(self): | 
					
						
							|  |  |  |             """
 | 
					
						
							|  |  |  |             Create a daemon thread to run the server, and start it. | 
					
						
							|  |  |  |             """
 | 
					
						
							|  |  |  |             self._thread = t = threading.Thread(target=self.serve_forever, | 
					
						
							|  |  |  |                                                 args=(self.poll_interval,)) | 
					
						
							|  |  |  |             t.setDaemon(True) | 
					
						
							|  |  |  |             t.start() | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         def serve_forever(self, poll_interval): | 
					
						
							|  |  |  |             """
 | 
					
						
							|  |  |  |             Run the server. Set the ready flag before entering the | 
					
						
							|  |  |  |             service loop. | 
					
						
							|  |  |  |             """
 | 
					
						
							|  |  |  |             self.ready.set() | 
					
						
							|  |  |  |             super(ControlMixin, self).serve_forever(poll_interval) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         def stop(self, timeout=None): | 
					
						
							|  |  |  |             """
 | 
					
						
							|  |  |  |             Tell the server thread to stop, and wait for it to do so. | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |             :param timeout: How long to wait for the server thread | 
					
						
							|  |  |  |                             to terminate. | 
					
						
							|  |  |  |             """
 | 
					
						
							|  |  |  |             self.shutdown() | 
					
						
							|  |  |  |             if self._thread is not None: | 
					
						
							|  |  |  |                 self._thread.join(timeout) | 
					
						
							|  |  |  |                 self._thread = None | 
					
						
							|  |  |  |             self.server_close() | 
					
						
							|  |  |  |             self.ready.clear() | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     class TestHTTPServer(ControlMixin, HTTPServer): | 
					
						
							| 
									
										
										
										
											2011-05-02 13:17:27 +01:00
										 |  |  |         """
 | 
					
						
							| 
									
										
										
										
											2011-05-17 07:15:53 +01:00
										 |  |  |         An HTTP server which is controllable using :class:`ControlMixin`. | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         :param addr: A tuple with the IP address and port to listen on. | 
					
						
							|  |  |  |         :param handler: A handler callable which will be called with a | 
					
						
							|  |  |  |                         single parameter - the request - in order to | 
					
						
							|  |  |  |                         process the request. | 
					
						
							|  |  |  |         :param poll_interval: The polling interval in seconds. | 
					
						
							|  |  |  |         :param log: Pass ``True`` to enable log messages. | 
					
						
							| 
									
										
										
										
											2011-05-02 13:17:27 +01:00
										 |  |  |         """
 | 
					
						
							| 
									
										
										
										
											2011-05-21 00:34:51 +01:00
										 |  |  |         def __init__(self, addr, handler, poll_interval=0.5, | 
					
						
							|  |  |  |                      log=False, sslctx=None): | 
					
						
							| 
									
										
										
										
											2011-05-17 07:15:53 +01:00
										 |  |  |             class DelegatingHTTPRequestHandler(BaseHTTPRequestHandler): | 
					
						
							|  |  |  |                 def __getattr__(self, name, default=None): | 
					
						
							|  |  |  |                     if name.startswith('do_'): | 
					
						
							|  |  |  |                         return self.process_request | 
					
						
							|  |  |  |                     raise AttributeError(name) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |                 def process_request(self): | 
					
						
							|  |  |  |                     self.server._handler(self) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |                 def log_message(self, format, *args): | 
					
						
							|  |  |  |                     if log: | 
					
						
							|  |  |  |                         super(DelegatingHTTPRequestHandler, | 
					
						
							|  |  |  |                               self).log_message(format, *args) | 
					
						
							|  |  |  |             HTTPServer.__init__(self, addr, DelegatingHTTPRequestHandler) | 
					
						
							|  |  |  |             ControlMixin.__init__(self, handler, poll_interval) | 
					
						
							| 
									
										
										
										
											2011-05-21 00:34:51 +01:00
										 |  |  |             self.sslctx = sslctx | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         def get_request(self): | 
					
						
							|  |  |  |             try: | 
					
						
							|  |  |  |                 sock, addr = self.socket.accept() | 
					
						
							|  |  |  |                 if self.sslctx: | 
					
						
							|  |  |  |                     sock = self.sslctx.wrap_socket(sock, server_side=True) | 
					
						
							|  |  |  |             except socket.error as e: | 
					
						
							|  |  |  |                 # socket errors are silenced by the caller, print them here | 
					
						
							|  |  |  |                 sys.stderr.write("Got an error:\n%s\n" % e) | 
					
						
							|  |  |  |                 raise | 
					
						
							|  |  |  |             return sock, addr | 
					
						
							| 
									
										
										
										
											2011-05-17 07:15:53 +01:00
										 |  |  | 
 | 
					
						
							|  |  |  |     class TestTCPServer(ControlMixin, ThreadingTCPServer): | 
					
						
							| 
									
										
										
										
											2011-05-02 14:31:16 +01:00
										 |  |  |         """
 | 
					
						
							| 
									
										
										
										
											2011-05-17 07:15:53 +01:00
										 |  |  |         A TCP server which is controllable using :class:`ControlMixin`. | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         :param addr: A tuple with the IP address and port to listen on. | 
					
						
							|  |  |  |         :param handler: A handler callable which will be called with a single | 
					
						
							|  |  |  |                         parameter - the request - in order to process the request. | 
					
						
							|  |  |  |         :param poll_interval: The polling interval in seconds. | 
					
						
							|  |  |  |         :bind_and_activate: If True (the default), binds the server and starts it | 
					
						
							|  |  |  |                             listening. If False, you need to call | 
					
						
							|  |  |  |                             :meth:`server_bind` and :meth:`server_activate` at | 
					
						
							|  |  |  |                             some later time before calling :meth:`start`, so that | 
					
						
							|  |  |  |                             the server will set up the socket and listen on it. | 
					
						
							| 
									
										
										
										
											2011-05-02 14:31:16 +01:00
										 |  |  |         """
 | 
					
						
							| 
									
										
										
										
											2011-05-02 13:17:27 +01:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-05-17 07:15:53 +01:00
										 |  |  |         allow_reuse_address = True | 
					
						
							| 
									
										
										
										
											2011-05-02 14:31:16 +01:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-05-17 07:15:53 +01:00
										 |  |  |         def __init__(self, addr, handler, poll_interval=0.5, | 
					
						
							|  |  |  |                      bind_and_activate=True): | 
					
						
							|  |  |  |             class DelegatingTCPRequestHandler(StreamRequestHandler): | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |                 def handle(self): | 
					
						
							|  |  |  |                     self.server._handler(self) | 
					
						
							|  |  |  |             ThreadingTCPServer.__init__(self, addr, DelegatingTCPRequestHandler, | 
					
						
							|  |  |  |                                         bind_and_activate) | 
					
						
							|  |  |  |             ControlMixin.__init__(self, handler, poll_interval) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         def server_bind(self): | 
					
						
							|  |  |  |             super(TestTCPServer, self).server_bind() | 
					
						
							|  |  |  |             self.port = self.socket.getsockname()[1] | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     class TestUDPServer(ControlMixin, ThreadingUDPServer): | 
					
						
							| 
									
										
										
										
											2011-05-02 13:17:27 +01:00
										 |  |  |         """
 | 
					
						
							| 
									
										
										
										
											2011-05-17 07:15:53 +01:00
										 |  |  |         A UDP server which is controllable using :class:`ControlMixin`. | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         :param addr: A tuple with the IP address and port to listen on. | 
					
						
							|  |  |  |         :param handler: A handler callable which will be called with a | 
					
						
							|  |  |  |                         single parameter - the request - in order to | 
					
						
							|  |  |  |                         process the request. | 
					
						
							|  |  |  |         :param poll_interval: The polling interval for shutdown requests, | 
					
						
							|  |  |  |                               in seconds. | 
					
						
							|  |  |  |         :bind_and_activate: If True (the default), binds the server and | 
					
						
							|  |  |  |                             starts it listening. If False, you need to | 
					
						
							|  |  |  |                             call :meth:`server_bind` and | 
					
						
							|  |  |  |                             :meth:`server_activate` at some later time | 
					
						
							|  |  |  |                             before calling :meth:`start`, so that the server will | 
					
						
							|  |  |  |                             set up the socket and listen on it. | 
					
						
							|  |  |  |         """
 | 
					
						
							| 
									
										
										
										
											2011-05-23 23:00:42 +01:00
										 |  |  |         def __init__(self, addr, handler, poll_interval=0.5, | 
					
						
							|  |  |  |                      bind_and_activate=True): | 
					
						
							| 
									
										
										
										
											2011-05-17 07:15:53 +01:00
										 |  |  |             class DelegatingUDPRequestHandler(DatagramRequestHandler): | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |                 def handle(self): | 
					
						
							|  |  |  |                     self.server._handler(self) | 
					
						
							| 
									
										
										
										
											2011-05-23 21:37:54 +01:00
										 |  |  | 
 | 
					
						
							|  |  |  |                 def finish(self): | 
					
						
							|  |  |  |                     data = self.wfile.getvalue() | 
					
						
							| 
									
										
										
										
											2011-05-23 23:00:42 +01:00
										 |  |  |                     if data: | 
					
						
							|  |  |  |                         try: | 
					
						
							|  |  |  |                             super(DelegatingUDPRequestHandler, self).finish() | 
					
						
							|  |  |  |                         except socket.error: | 
					
						
							|  |  |  |                             if not self.server._closed: | 
					
						
							|  |  |  |                                 raise | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |             ThreadingUDPServer.__init__(self, addr, | 
					
						
							|  |  |  |                                         DelegatingUDPRequestHandler, | 
					
						
							| 
									
										
										
										
											2011-05-17 07:15:53 +01:00
										 |  |  |                                         bind_and_activate) | 
					
						
							|  |  |  |             ControlMixin.__init__(self, handler, poll_interval) | 
					
						
							| 
									
										
										
										
											2011-05-23 21:37:54 +01:00
										 |  |  |             self._closed = False | 
					
						
							| 
									
										
										
										
											2011-05-17 07:15:53 +01:00
										 |  |  | 
 | 
					
						
							|  |  |  |         def server_bind(self): | 
					
						
							|  |  |  |             super(TestUDPServer, self).server_bind() | 
					
						
							|  |  |  |             self.port = self.socket.getsockname()[1] | 
					
						
							| 
									
										
										
										
											2011-05-02 13:17:27 +01:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-05-23 21:37:54 +01:00
										 |  |  |         def server_close(self): | 
					
						
							|  |  |  |             super(TestUDPServer, self).server_close() | 
					
						
							|  |  |  |             self._closed = True | 
					
						
							| 
									
										
										
										
											2011-05-02 13:17:27 +01:00
										 |  |  | 
 | 
					
						
							|  |  |  | # - end of server_helper section | 
					
						
							| 
									
										
										
										
											2011-04-30 21:52:48 +01:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-05-17 07:15:53 +01:00
										 |  |  | @unittest.skipUnless(threading, 'Threading required for this test.') | 
					
						
							| 
									
										
										
										
											2011-04-30 21:52:48 +01:00
										 |  |  | class SMTPHandlerTest(BaseTest): | 
					
						
							|  |  |  |     def test_basic(self): | 
					
						
							| 
									
										
										
										
											2011-05-02 13:17:27 +01:00
										 |  |  |         sockmap = {} | 
					
						
							|  |  |  |         server = TestSMTPServer(('localhost', 0), self.process_message, 0.001, | 
					
						
							|  |  |  |                                 sockmap) | 
					
						
							|  |  |  |         server.start() | 
					
						
							|  |  |  |         addr = ('localhost', server.port) | 
					
						
							| 
									
										
										
										
											2011-04-30 21:52:48 +01:00
										 |  |  |         h = logging.handlers.SMTPHandler(addr, 'me', 'you', 'Log') | 
					
						
							|  |  |  |         self.assertEqual(h.toaddrs, ['you']) | 
					
						
							|  |  |  |         self.messages = [] | 
					
						
							|  |  |  |         r = logging.makeLogRecord({'msg': 'Hello'}) | 
					
						
							| 
									
										
										
										
											2011-05-02 13:17:27 +01:00
										 |  |  |         self.handled = threading.Event() | 
					
						
							| 
									
										
										
										
											2011-04-30 21:52:48 +01:00
										 |  |  |         h.handle(r) | 
					
						
							| 
									
										
										
										
											2011-05-02 13:17:27 +01:00
										 |  |  |         self.handled.wait() | 
					
						
							| 
									
										
										
										
											2011-04-30 21:52:48 +01:00
										 |  |  |         server.stop() | 
					
						
							|  |  |  |         self.assertEqual(len(self.messages), 1) | 
					
						
							|  |  |  |         peer, mailfrom, rcpttos, data = self.messages[0] | 
					
						
							|  |  |  |         self.assertEqual(mailfrom, 'me') | 
					
						
							|  |  |  |         self.assertEqual(rcpttos, ['you']) | 
					
						
							| 
									
										
										
										
											2011-06-05 09:31:34 +01:00
										 |  |  |         self.assertIn('\nSubject: Log\n', data) | 
					
						
							| 
									
										
										
										
											2011-04-30 21:52:48 +01:00
										 |  |  |         self.assertTrue(data.endswith('\n\nHello')) | 
					
						
							|  |  |  |         h.close() | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def process_message(self, *args): | 
					
						
							|  |  |  |         self.messages.append(args) | 
					
						
							| 
									
										
										
										
											2011-05-02 13:17:27 +01:00
										 |  |  |         self.handled.set() | 
					
						
							| 
									
										
										
										
											2011-04-30 21:52:48 +01:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  | class MemoryHandlerTest(BaseTest): | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     """Tests for the MemoryHandler.""" | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     # Do not bother with a logger name group. | 
					
						
							|  |  |  |     expected_log_pat = r"^[\w.]+ -> ([\w]+): ([\d]+)$" | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def setUp(self): | 
					
						
							|  |  |  |         BaseTest.setUp(self) | 
					
						
							|  |  |  |         self.mem_hdlr = logging.handlers.MemoryHandler(10, logging.WARNING, | 
					
						
							|  |  |  |                                                         self.root_hdlr) | 
					
						
							|  |  |  |         self.mem_logger = logging.getLogger('mem') | 
					
						
							|  |  |  |         self.mem_logger.propagate = 0 | 
					
						
							|  |  |  |         self.mem_logger.addHandler(self.mem_hdlr) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def tearDown(self): | 
					
						
							|  |  |  |         self.mem_hdlr.close() | 
					
						
							| 
									
										
											  
											
												Merged revisions 62021,62029,62035-62038,62043-62044,62052-62053 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r62021 | benjamin.peterson | 2008-03-28 18:11:01 -0500 (Fri, 28 Mar 2008) | 2 lines
  NIL => NULL
........
  r62029 | amaury.forgeotdarc | 2008-03-28 20:42:31 -0500 (Fri, 28 Mar 2008) | 3 lines
  Correctly call the base class tearDown();
  otherwise running test_logging twice produce the errors we see on all buildbots
........
  r62035 | raymond.hettinger | 2008-03-29 05:42:07 -0500 (Sat, 29 Mar 2008) | 1 line
  Be explicit about what efficient means.
........
  r62036 | georg.brandl | 2008-03-29 06:46:18 -0500 (Sat, 29 Mar 2008) | 2 lines
  Fix capitalization.
........
  r62037 | amaury.forgeotdarc | 2008-03-29 07:42:54 -0500 (Sat, 29 Mar 2008) | 5 lines
  lib2to3 should install a logging handler only when run as a main program,
  not when used as a library.
  This may please the buildbots, which fail when test_lib2to3 is run before test_logging.
........
  r62043 | benjamin.peterson | 2008-03-29 10:24:25 -0500 (Sat, 29 Mar 2008) | 3 lines
  #2503 make singletons compared with "is" not == or !=
  Thanks to Wummel for the patch
........
  r62044 | gerhard.haering | 2008-03-29 14:11:52 -0500 (Sat, 29 Mar 2008) | 2 lines
  Documented the lastrowid attribute.
........
  r62052 | benjamin.peterson | 2008-03-30 14:35:10 -0500 (Sun, 30 Mar 2008) | 2 lines
  Updated README regarding doc formats
........
  r62053 | georg.brandl | 2008-03-30 14:41:39 -0500 (Sun, 30 Mar 2008) | 2 lines
  The other download formats will be available for 2.6 too.
........
											
										 
											2008-03-31 01:51:45 +00:00
										 |  |  |         BaseTest.tearDown(self) | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_flush(self): | 
					
						
							|  |  |  |         # The memory handler flushes to its target handler based on specific | 
					
						
							|  |  |  |         #  criteria (message count and message level). | 
					
						
							|  |  |  |         self.mem_logger.debug(self.next_message()) | 
					
						
							| 
									
										
										
										
											2009-07-01 00:43:10 +00:00
										 |  |  |         self.assert_log_lines([]) | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |         self.mem_logger.info(self.next_message()) | 
					
						
							| 
									
										
										
										
											2009-07-01 00:43:10 +00:00
										 |  |  |         self.assert_log_lines([]) | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |         # This will flush because the level is >= logging.WARNING | 
					
						
							|  |  |  |         self.mem_logger.warn(self.next_message()) | 
					
						
							|  |  |  |         lines = [ | 
					
						
							|  |  |  |             ('DEBUG', '1'), | 
					
						
							|  |  |  |             ('INFO', '2'), | 
					
						
							|  |  |  |             ('WARNING', '3'), | 
					
						
							|  |  |  |         ] | 
					
						
							| 
									
										
										
										
											2009-07-01 00:43:10 +00:00
										 |  |  |         self.assert_log_lines(lines) | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |         for n in (4, 14): | 
					
						
							|  |  |  |             for i in range(9): | 
					
						
							|  |  |  |                 self.mem_logger.debug(self.next_message()) | 
					
						
							| 
									
										
										
										
											2009-07-01 00:43:10 +00:00
										 |  |  |             self.assert_log_lines(lines) | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |             # This will flush because it's the 10th message since the last | 
					
						
							|  |  |  |             #  flush. | 
					
						
							|  |  |  |             self.mem_logger.debug(self.next_message()) | 
					
						
							|  |  |  |             lines = lines + [('DEBUG', str(i)) for i in range(n, n + 10)] | 
					
						
							| 
									
										
										
										
											2009-07-01 00:43:10 +00:00
										 |  |  |             self.assert_log_lines(lines) | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |         self.mem_logger.debug(self.next_message()) | 
					
						
							| 
									
										
										
										
											2009-07-01 00:43:10 +00:00
										 |  |  |         self.assert_log_lines(lines) | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | class ExceptionFormatter(logging.Formatter): | 
					
						
							|  |  |  |     """A special exception formatter.""" | 
					
						
							|  |  |  |     def formatException(self, ei): | 
					
						
							|  |  |  |         return "Got a [%s]" % ei[0].__name__ | 
					
						
							| 
									
										
											  
											
												Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60873 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r60850 | amaury.forgeotdarc | 2008-02-16 01:16:50 +0100 (Sat, 16 Feb 2008) | 3 lines
  mmap.PROT_READ does not exists on win32;
  Skip this test created by r60830.
........
  r60851 | raymond.hettinger | 2008-02-16 02:22:54 +0100 (Sat, 16 Feb 2008) | 1 line
  Add __all__ to logging module.
........
  r60855 | georg.brandl | 2008-02-16 10:37:32 +0100 (Sat, 16 Feb 2008) | 2 lines
  #2120: broken links in advocacy document.
........
  r60860 | amaury.forgeotdarc | 2008-02-16 15:34:57 +0100 (Sat, 16 Feb 2008) | 23 lines
  Crashers of the day: Py_CLEAR must be used when there is a chance that the
  function can be called recursively.
  This was discussed in issue1020188.
  In python codebase, all occurrences of Py_[X]DECREF(xxx->yyy) are suspect,
  except when they appear in tp_new or tp_dealloc functions, or when
  the member cannot be of a user-defined class.
  Note that tp_init is not safe.
  I do have a (crashing) example for every changed line.
  Is it worth adding them to the test suite?
  Example:
  class SpecialStr(str):
      def __del__(self):
          s.close()
  import cStringIO
  s = cStringIO.StringIO(SpecialStr("text"))
  s.close() # Segfault
........
  r60871 | amaury.forgeotdarc | 2008-02-16 21:55:24 +0100 (Sat, 16 Feb 2008) | 3 lines
  Prevent a crash with nested scopes, again caused by calling Py_DECREF when the pointer
  is still present in the containing structure.
........
  r60872 | brett.cannon | 2008-02-17 02:59:18 +0100 (Sun, 17 Feb 2008) | 4 lines
  Move test_logging over to doctest.
  Thanks to Christopher White from GHOP.
........
  r60873 | georg.brandl | 2008-02-17 12:33:38 +0100 (Sun, 17 Feb 2008) | 2 lines
  #2131: note that codecs.open() always opens files in binary mode.
........
											
										 
											2008-02-17 13:31:39 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  | class ConfigFileTest(BaseTest): | 
					
						
							| 
									
										
											  
											
												Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60873 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r60850 | amaury.forgeotdarc | 2008-02-16 01:16:50 +0100 (Sat, 16 Feb 2008) | 3 lines
  mmap.PROT_READ does not exists on win32;
  Skip this test created by r60830.
........
  r60851 | raymond.hettinger | 2008-02-16 02:22:54 +0100 (Sat, 16 Feb 2008) | 1 line
  Add __all__ to logging module.
........
  r60855 | georg.brandl | 2008-02-16 10:37:32 +0100 (Sat, 16 Feb 2008) | 2 lines
  #2120: broken links in advocacy document.
........
  r60860 | amaury.forgeotdarc | 2008-02-16 15:34:57 +0100 (Sat, 16 Feb 2008) | 23 lines
  Crashers of the day: Py_CLEAR must be used when there is a chance that the
  function can be called recursively.
  This was discussed in issue1020188.
  In python codebase, all occurrences of Py_[X]DECREF(xxx->yyy) are suspect,
  except when they appear in tp_new or tp_dealloc functions, or when
  the member cannot be of a user-defined class.
  Note that tp_init is not safe.
  I do have a (crashing) example for every changed line.
  Is it worth adding them to the test suite?
  Example:
  class SpecialStr(str):
      def __del__(self):
          s.close()
  import cStringIO
  s = cStringIO.StringIO(SpecialStr("text"))
  s.close() # Segfault
........
  r60871 | amaury.forgeotdarc | 2008-02-16 21:55:24 +0100 (Sat, 16 Feb 2008) | 3 lines
  Prevent a crash with nested scopes, again caused by calling Py_DECREF when the pointer
  is still present in the containing structure.
........
  r60872 | brett.cannon | 2008-02-17 02:59:18 +0100 (Sun, 17 Feb 2008) | 4 lines
  Move test_logging over to doctest.
  Thanks to Christopher White from GHOP.
........
  r60873 | georg.brandl | 2008-02-17 12:33:38 +0100 (Sun, 17 Feb 2008) | 2 lines
  #2131: note that codecs.open() always opens files in binary mode.
........
											
										 
											2008-02-17 13:31:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |     """Reading logging config from a .ini-style config file.""" | 
					
						
							| 
									
										
											  
											
												Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60873 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r60850 | amaury.forgeotdarc | 2008-02-16 01:16:50 +0100 (Sat, 16 Feb 2008) | 3 lines
  mmap.PROT_READ does not exists on win32;
  Skip this test created by r60830.
........
  r60851 | raymond.hettinger | 2008-02-16 02:22:54 +0100 (Sat, 16 Feb 2008) | 1 line
  Add __all__ to logging module.
........
  r60855 | georg.brandl | 2008-02-16 10:37:32 +0100 (Sat, 16 Feb 2008) | 2 lines
  #2120: broken links in advocacy document.
........
  r60860 | amaury.forgeotdarc | 2008-02-16 15:34:57 +0100 (Sat, 16 Feb 2008) | 23 lines
  Crashers of the day: Py_CLEAR must be used when there is a chance that the
  function can be called recursively.
  This was discussed in issue1020188.
  In python codebase, all occurrences of Py_[X]DECREF(xxx->yyy) are suspect,
  except when they appear in tp_new or tp_dealloc functions, or when
  the member cannot be of a user-defined class.
  Note that tp_init is not safe.
  I do have a (crashing) example for every changed line.
  Is it worth adding them to the test suite?
  Example:
  class SpecialStr(str):
      def __del__(self):
          s.close()
  import cStringIO
  s = cStringIO.StringIO(SpecialStr("text"))
  s.close() # Segfault
........
  r60871 | amaury.forgeotdarc | 2008-02-16 21:55:24 +0100 (Sat, 16 Feb 2008) | 3 lines
  Prevent a crash with nested scopes, again caused by calling Py_DECREF when the pointer
  is still present in the containing structure.
........
  r60872 | brett.cannon | 2008-02-17 02:59:18 +0100 (Sun, 17 Feb 2008) | 4 lines
  Move test_logging over to doctest.
  Thanks to Christopher White from GHOP.
........
  r60873 | georg.brandl | 2008-02-17 12:33:38 +0100 (Sun, 17 Feb 2008) | 2 lines
  #2131: note that codecs.open() always opens files in binary mode.
........
											
										 
											2008-02-17 13:31:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |     expected_log_pat = r"^([\w]+) \+\+ ([\w]+)$" | 
					
						
							| 
									
										
											  
											
												Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60873 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r60850 | amaury.forgeotdarc | 2008-02-16 01:16:50 +0100 (Sat, 16 Feb 2008) | 3 lines
  mmap.PROT_READ does not exists on win32;
  Skip this test created by r60830.
........
  r60851 | raymond.hettinger | 2008-02-16 02:22:54 +0100 (Sat, 16 Feb 2008) | 1 line
  Add __all__ to logging module.
........
  r60855 | georg.brandl | 2008-02-16 10:37:32 +0100 (Sat, 16 Feb 2008) | 2 lines
  #2120: broken links in advocacy document.
........
  r60860 | amaury.forgeotdarc | 2008-02-16 15:34:57 +0100 (Sat, 16 Feb 2008) | 23 lines
  Crashers of the day: Py_CLEAR must be used when there is a chance that the
  function can be called recursively.
  This was discussed in issue1020188.
  In python codebase, all occurrences of Py_[X]DECREF(xxx->yyy) are suspect,
  except when they appear in tp_new or tp_dealloc functions, or when
  the member cannot be of a user-defined class.
  Note that tp_init is not safe.
  I do have a (crashing) example for every changed line.
  Is it worth adding them to the test suite?
  Example:
  class SpecialStr(str):
      def __del__(self):
          s.close()
  import cStringIO
  s = cStringIO.StringIO(SpecialStr("text"))
  s.close() # Segfault
........
  r60871 | amaury.forgeotdarc | 2008-02-16 21:55:24 +0100 (Sat, 16 Feb 2008) | 3 lines
  Prevent a crash with nested scopes, again caused by calling Py_DECREF when the pointer
  is still present in the containing structure.
........
  r60872 | brett.cannon | 2008-02-17 02:59:18 +0100 (Sun, 17 Feb 2008) | 4 lines
  Move test_logging over to doctest.
  Thanks to Christopher White from GHOP.
........
  r60873 | georg.brandl | 2008-02-17 12:33:38 +0100 (Sun, 17 Feb 2008) | 2 lines
  #2131: note that codecs.open() always opens files in binary mode.
........
											
										 
											2008-02-17 13:31:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |     # config0 is a standard configuration. | 
					
						
							|  |  |  |     config0 = """
 | 
					
						
							|  |  |  |     [loggers] | 
					
						
							|  |  |  |     keys=root | 
					
						
							| 
									
										
											  
											
												Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60873 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r60850 | amaury.forgeotdarc | 2008-02-16 01:16:50 +0100 (Sat, 16 Feb 2008) | 3 lines
  mmap.PROT_READ does not exists on win32;
  Skip this test created by r60830.
........
  r60851 | raymond.hettinger | 2008-02-16 02:22:54 +0100 (Sat, 16 Feb 2008) | 1 line
  Add __all__ to logging module.
........
  r60855 | georg.brandl | 2008-02-16 10:37:32 +0100 (Sat, 16 Feb 2008) | 2 lines
  #2120: broken links in advocacy document.
........
  r60860 | amaury.forgeotdarc | 2008-02-16 15:34:57 +0100 (Sat, 16 Feb 2008) | 23 lines
  Crashers of the day: Py_CLEAR must be used when there is a chance that the
  function can be called recursively.
  This was discussed in issue1020188.
  In python codebase, all occurrences of Py_[X]DECREF(xxx->yyy) are suspect,
  except when they appear in tp_new or tp_dealloc functions, or when
  the member cannot be of a user-defined class.
  Note that tp_init is not safe.
  I do have a (crashing) example for every changed line.
  Is it worth adding them to the test suite?
  Example:
  class SpecialStr(str):
      def __del__(self):
          s.close()
  import cStringIO
  s = cStringIO.StringIO(SpecialStr("text"))
  s.close() # Segfault
........
  r60871 | amaury.forgeotdarc | 2008-02-16 21:55:24 +0100 (Sat, 16 Feb 2008) | 3 lines
  Prevent a crash with nested scopes, again caused by calling Py_DECREF when the pointer
  is still present in the containing structure.
........
  r60872 | brett.cannon | 2008-02-17 02:59:18 +0100 (Sun, 17 Feb 2008) | 4 lines
  Move test_logging over to doctest.
  Thanks to Christopher White from GHOP.
........
  r60873 | georg.brandl | 2008-02-17 12:33:38 +0100 (Sun, 17 Feb 2008) | 2 lines
  #2131: note that codecs.open() always opens files in binary mode.
........
											
										 
											2008-02-17 13:31:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |     [handlers] | 
					
						
							|  |  |  |     keys=hand1 | 
					
						
							| 
									
										
											  
											
												Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60873 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r60850 | amaury.forgeotdarc | 2008-02-16 01:16:50 +0100 (Sat, 16 Feb 2008) | 3 lines
  mmap.PROT_READ does not exists on win32;
  Skip this test created by r60830.
........
  r60851 | raymond.hettinger | 2008-02-16 02:22:54 +0100 (Sat, 16 Feb 2008) | 1 line
  Add __all__ to logging module.
........
  r60855 | georg.brandl | 2008-02-16 10:37:32 +0100 (Sat, 16 Feb 2008) | 2 lines
  #2120: broken links in advocacy document.
........
  r60860 | amaury.forgeotdarc | 2008-02-16 15:34:57 +0100 (Sat, 16 Feb 2008) | 23 lines
  Crashers of the day: Py_CLEAR must be used when there is a chance that the
  function can be called recursively.
  This was discussed in issue1020188.
  In python codebase, all occurrences of Py_[X]DECREF(xxx->yyy) are suspect,
  except when they appear in tp_new or tp_dealloc functions, or when
  the member cannot be of a user-defined class.
  Note that tp_init is not safe.
  I do have a (crashing) example for every changed line.
  Is it worth adding them to the test suite?
  Example:
  class SpecialStr(str):
      def __del__(self):
          s.close()
  import cStringIO
  s = cStringIO.StringIO(SpecialStr("text"))
  s.close() # Segfault
........
  r60871 | amaury.forgeotdarc | 2008-02-16 21:55:24 +0100 (Sat, 16 Feb 2008) | 3 lines
  Prevent a crash with nested scopes, again caused by calling Py_DECREF when the pointer
  is still present in the containing structure.
........
  r60872 | brett.cannon | 2008-02-17 02:59:18 +0100 (Sun, 17 Feb 2008) | 4 lines
  Move test_logging over to doctest.
  Thanks to Christopher White from GHOP.
........
  r60873 | georg.brandl | 2008-02-17 12:33:38 +0100 (Sun, 17 Feb 2008) | 2 lines
  #2131: note that codecs.open() always opens files in binary mode.
........
											
										 
											2008-02-17 13:31:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |     [formatters] | 
					
						
							|  |  |  |     keys=form1 | 
					
						
							| 
									
										
											  
											
												Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60873 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r60850 | amaury.forgeotdarc | 2008-02-16 01:16:50 +0100 (Sat, 16 Feb 2008) | 3 lines
  mmap.PROT_READ does not exists on win32;
  Skip this test created by r60830.
........
  r60851 | raymond.hettinger | 2008-02-16 02:22:54 +0100 (Sat, 16 Feb 2008) | 1 line
  Add __all__ to logging module.
........
  r60855 | georg.brandl | 2008-02-16 10:37:32 +0100 (Sat, 16 Feb 2008) | 2 lines
  #2120: broken links in advocacy document.
........
  r60860 | amaury.forgeotdarc | 2008-02-16 15:34:57 +0100 (Sat, 16 Feb 2008) | 23 lines
  Crashers of the day: Py_CLEAR must be used when there is a chance that the
  function can be called recursively.
  This was discussed in issue1020188.
  In python codebase, all occurrences of Py_[X]DECREF(xxx->yyy) are suspect,
  except when they appear in tp_new or tp_dealloc functions, or when
  the member cannot be of a user-defined class.
  Note that tp_init is not safe.
  I do have a (crashing) example for every changed line.
  Is it worth adding them to the test suite?
  Example:
  class SpecialStr(str):
      def __del__(self):
          s.close()
  import cStringIO
  s = cStringIO.StringIO(SpecialStr("text"))
  s.close() # Segfault
........
  r60871 | amaury.forgeotdarc | 2008-02-16 21:55:24 +0100 (Sat, 16 Feb 2008) | 3 lines
  Prevent a crash with nested scopes, again caused by calling Py_DECREF when the pointer
  is still present in the containing structure.
........
  r60872 | brett.cannon | 2008-02-17 02:59:18 +0100 (Sun, 17 Feb 2008) | 4 lines
  Move test_logging over to doctest.
  Thanks to Christopher White from GHOP.
........
  r60873 | georg.brandl | 2008-02-17 12:33:38 +0100 (Sun, 17 Feb 2008) | 2 lines
  #2131: note that codecs.open() always opens files in binary mode.
........
											
										 
											2008-02-17 13:31:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |     [logger_root] | 
					
						
							|  |  |  |     level=WARNING | 
					
						
							|  |  |  |     handlers=hand1 | 
					
						
							| 
									
										
											  
											
												Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60873 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r60850 | amaury.forgeotdarc | 2008-02-16 01:16:50 +0100 (Sat, 16 Feb 2008) | 3 lines
  mmap.PROT_READ does not exists on win32;
  Skip this test created by r60830.
........
  r60851 | raymond.hettinger | 2008-02-16 02:22:54 +0100 (Sat, 16 Feb 2008) | 1 line
  Add __all__ to logging module.
........
  r60855 | georg.brandl | 2008-02-16 10:37:32 +0100 (Sat, 16 Feb 2008) | 2 lines
  #2120: broken links in advocacy document.
........
  r60860 | amaury.forgeotdarc | 2008-02-16 15:34:57 +0100 (Sat, 16 Feb 2008) | 23 lines
  Crashers of the day: Py_CLEAR must be used when there is a chance that the
  function can be called recursively.
  This was discussed in issue1020188.
  In python codebase, all occurrences of Py_[X]DECREF(xxx->yyy) are suspect,
  except when they appear in tp_new or tp_dealloc functions, or when
  the member cannot be of a user-defined class.
  Note that tp_init is not safe.
  I do have a (crashing) example for every changed line.
  Is it worth adding them to the test suite?
  Example:
  class SpecialStr(str):
      def __del__(self):
          s.close()
  import cStringIO
  s = cStringIO.StringIO(SpecialStr("text"))
  s.close() # Segfault
........
  r60871 | amaury.forgeotdarc | 2008-02-16 21:55:24 +0100 (Sat, 16 Feb 2008) | 3 lines
  Prevent a crash with nested scopes, again caused by calling Py_DECREF when the pointer
  is still present in the containing structure.
........
  r60872 | brett.cannon | 2008-02-17 02:59:18 +0100 (Sun, 17 Feb 2008) | 4 lines
  Move test_logging over to doctest.
  Thanks to Christopher White from GHOP.
........
  r60873 | georg.brandl | 2008-02-17 12:33:38 +0100 (Sun, 17 Feb 2008) | 2 lines
  #2131: note that codecs.open() always opens files in binary mode.
........
											
										 
											2008-02-17 13:31:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |     [handler_hand1] | 
					
						
							|  |  |  |     class=StreamHandler | 
					
						
							|  |  |  |     level=NOTSET | 
					
						
							|  |  |  |     formatter=form1 | 
					
						
							|  |  |  |     args=(sys.stdout,) | 
					
						
							| 
									
										
											  
											
												Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60873 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r60850 | amaury.forgeotdarc | 2008-02-16 01:16:50 +0100 (Sat, 16 Feb 2008) | 3 lines
  mmap.PROT_READ does not exists on win32;
  Skip this test created by r60830.
........
  r60851 | raymond.hettinger | 2008-02-16 02:22:54 +0100 (Sat, 16 Feb 2008) | 1 line
  Add __all__ to logging module.
........
  r60855 | georg.brandl | 2008-02-16 10:37:32 +0100 (Sat, 16 Feb 2008) | 2 lines
  #2120: broken links in advocacy document.
........
  r60860 | amaury.forgeotdarc | 2008-02-16 15:34:57 +0100 (Sat, 16 Feb 2008) | 23 lines
  Crashers of the day: Py_CLEAR must be used when there is a chance that the
  function can be called recursively.
  This was discussed in issue1020188.
  In python codebase, all occurrences of Py_[X]DECREF(xxx->yyy) are suspect,
  except when they appear in tp_new or tp_dealloc functions, or when
  the member cannot be of a user-defined class.
  Note that tp_init is not safe.
  I do have a (crashing) example for every changed line.
  Is it worth adding them to the test suite?
  Example:
  class SpecialStr(str):
      def __del__(self):
          s.close()
  import cStringIO
  s = cStringIO.StringIO(SpecialStr("text"))
  s.close() # Segfault
........
  r60871 | amaury.forgeotdarc | 2008-02-16 21:55:24 +0100 (Sat, 16 Feb 2008) | 3 lines
  Prevent a crash with nested scopes, again caused by calling Py_DECREF when the pointer
  is still present in the containing structure.
........
  r60872 | brett.cannon | 2008-02-17 02:59:18 +0100 (Sun, 17 Feb 2008) | 4 lines
  Move test_logging over to doctest.
  Thanks to Christopher White from GHOP.
........
  r60873 | georg.brandl | 2008-02-17 12:33:38 +0100 (Sun, 17 Feb 2008) | 2 lines
  #2131: note that codecs.open() always opens files in binary mode.
........
											
										 
											2008-02-17 13:31:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |     [formatter_form1] | 
					
						
							|  |  |  |     format=%(levelname)s ++ %(message)s | 
					
						
							|  |  |  |     datefmt= | 
					
						
							|  |  |  |     """
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60873 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r60850 | amaury.forgeotdarc | 2008-02-16 01:16:50 +0100 (Sat, 16 Feb 2008) | 3 lines
  mmap.PROT_READ does not exists on win32;
  Skip this test created by r60830.
........
  r60851 | raymond.hettinger | 2008-02-16 02:22:54 +0100 (Sat, 16 Feb 2008) | 1 line
  Add __all__ to logging module.
........
  r60855 | georg.brandl | 2008-02-16 10:37:32 +0100 (Sat, 16 Feb 2008) | 2 lines
  #2120: broken links in advocacy document.
........
  r60860 | amaury.forgeotdarc | 2008-02-16 15:34:57 +0100 (Sat, 16 Feb 2008) | 23 lines
  Crashers of the day: Py_CLEAR must be used when there is a chance that the
  function can be called recursively.
  This was discussed in issue1020188.
  In python codebase, all occurrences of Py_[X]DECREF(xxx->yyy) are suspect,
  except when they appear in tp_new or tp_dealloc functions, or when
  the member cannot be of a user-defined class.
  Note that tp_init is not safe.
  I do have a (crashing) example for every changed line.
  Is it worth adding them to the test suite?
  Example:
  class SpecialStr(str):
      def __del__(self):
          s.close()
  import cStringIO
  s = cStringIO.StringIO(SpecialStr("text"))
  s.close() # Segfault
........
  r60871 | amaury.forgeotdarc | 2008-02-16 21:55:24 +0100 (Sat, 16 Feb 2008) | 3 lines
  Prevent a crash with nested scopes, again caused by calling Py_DECREF when the pointer
  is still present in the containing structure.
........
  r60872 | brett.cannon | 2008-02-17 02:59:18 +0100 (Sun, 17 Feb 2008) | 4 lines
  Move test_logging over to doctest.
  Thanks to Christopher White from GHOP.
........
  r60873 | georg.brandl | 2008-02-17 12:33:38 +0100 (Sun, 17 Feb 2008) | 2 lines
  #2131: note that codecs.open() always opens files in binary mode.
........
											
										 
											2008-02-17 13:31:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |     # config1 adds a little to the standard configuration. | 
					
						
							|  |  |  |     config1 = """
 | 
					
						
							|  |  |  |     [loggers] | 
					
						
							|  |  |  |     keys=root,parser | 
					
						
							| 
									
										
											  
											
												Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60873 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r60850 | amaury.forgeotdarc | 2008-02-16 01:16:50 +0100 (Sat, 16 Feb 2008) | 3 lines
  mmap.PROT_READ does not exists on win32;
  Skip this test created by r60830.
........
  r60851 | raymond.hettinger | 2008-02-16 02:22:54 +0100 (Sat, 16 Feb 2008) | 1 line
  Add __all__ to logging module.
........
  r60855 | georg.brandl | 2008-02-16 10:37:32 +0100 (Sat, 16 Feb 2008) | 2 lines
  #2120: broken links in advocacy document.
........
  r60860 | amaury.forgeotdarc | 2008-02-16 15:34:57 +0100 (Sat, 16 Feb 2008) | 23 lines
  Crashers of the day: Py_CLEAR must be used when there is a chance that the
  function can be called recursively.
  This was discussed in issue1020188.
  In python codebase, all occurrences of Py_[X]DECREF(xxx->yyy) are suspect,
  except when they appear in tp_new or tp_dealloc functions, or when
  the member cannot be of a user-defined class.
  Note that tp_init is not safe.
  I do have a (crashing) example for every changed line.
  Is it worth adding them to the test suite?
  Example:
  class SpecialStr(str):
      def __del__(self):
          s.close()
  import cStringIO
  s = cStringIO.StringIO(SpecialStr("text"))
  s.close() # Segfault
........
  r60871 | amaury.forgeotdarc | 2008-02-16 21:55:24 +0100 (Sat, 16 Feb 2008) | 3 lines
  Prevent a crash with nested scopes, again caused by calling Py_DECREF when the pointer
  is still present in the containing structure.
........
  r60872 | brett.cannon | 2008-02-17 02:59:18 +0100 (Sun, 17 Feb 2008) | 4 lines
  Move test_logging over to doctest.
  Thanks to Christopher White from GHOP.
........
  r60873 | georg.brandl | 2008-02-17 12:33:38 +0100 (Sun, 17 Feb 2008) | 2 lines
  #2131: note that codecs.open() always opens files in binary mode.
........
											
										 
											2008-02-17 13:31:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |     [handlers] | 
					
						
							|  |  |  |     keys=hand1 | 
					
						
							| 
									
										
											  
											
												Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60873 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r60850 | amaury.forgeotdarc | 2008-02-16 01:16:50 +0100 (Sat, 16 Feb 2008) | 3 lines
  mmap.PROT_READ does not exists on win32;
  Skip this test created by r60830.
........
  r60851 | raymond.hettinger | 2008-02-16 02:22:54 +0100 (Sat, 16 Feb 2008) | 1 line
  Add __all__ to logging module.
........
  r60855 | georg.brandl | 2008-02-16 10:37:32 +0100 (Sat, 16 Feb 2008) | 2 lines
  #2120: broken links in advocacy document.
........
  r60860 | amaury.forgeotdarc | 2008-02-16 15:34:57 +0100 (Sat, 16 Feb 2008) | 23 lines
  Crashers of the day: Py_CLEAR must be used when there is a chance that the
  function can be called recursively.
  This was discussed in issue1020188.
  In python codebase, all occurrences of Py_[X]DECREF(xxx->yyy) are suspect,
  except when they appear in tp_new or tp_dealloc functions, or when
  the member cannot be of a user-defined class.
  Note that tp_init is not safe.
  I do have a (crashing) example for every changed line.
  Is it worth adding them to the test suite?
  Example:
  class SpecialStr(str):
      def __del__(self):
          s.close()
  import cStringIO
  s = cStringIO.StringIO(SpecialStr("text"))
  s.close() # Segfault
........
  r60871 | amaury.forgeotdarc | 2008-02-16 21:55:24 +0100 (Sat, 16 Feb 2008) | 3 lines
  Prevent a crash with nested scopes, again caused by calling Py_DECREF when the pointer
  is still present in the containing structure.
........
  r60872 | brett.cannon | 2008-02-17 02:59:18 +0100 (Sun, 17 Feb 2008) | 4 lines
  Move test_logging over to doctest.
  Thanks to Christopher White from GHOP.
........
  r60873 | georg.brandl | 2008-02-17 12:33:38 +0100 (Sun, 17 Feb 2008) | 2 lines
  #2131: note that codecs.open() always opens files in binary mode.
........
											
										 
											2008-02-17 13:31:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |     [formatters] | 
					
						
							|  |  |  |     keys=form1 | 
					
						
							| 
									
										
											  
											
												Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60873 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r60850 | amaury.forgeotdarc | 2008-02-16 01:16:50 +0100 (Sat, 16 Feb 2008) | 3 lines
  mmap.PROT_READ does not exists on win32;
  Skip this test created by r60830.
........
  r60851 | raymond.hettinger | 2008-02-16 02:22:54 +0100 (Sat, 16 Feb 2008) | 1 line
  Add __all__ to logging module.
........
  r60855 | georg.brandl | 2008-02-16 10:37:32 +0100 (Sat, 16 Feb 2008) | 2 lines
  #2120: broken links in advocacy document.
........
  r60860 | amaury.forgeotdarc | 2008-02-16 15:34:57 +0100 (Sat, 16 Feb 2008) | 23 lines
  Crashers of the day: Py_CLEAR must be used when there is a chance that the
  function can be called recursively.
  This was discussed in issue1020188.
  In python codebase, all occurrences of Py_[X]DECREF(xxx->yyy) are suspect,
  except when they appear in tp_new or tp_dealloc functions, or when
  the member cannot be of a user-defined class.
  Note that tp_init is not safe.
  I do have a (crashing) example for every changed line.
  Is it worth adding them to the test suite?
  Example:
  class SpecialStr(str):
      def __del__(self):
          s.close()
  import cStringIO
  s = cStringIO.StringIO(SpecialStr("text"))
  s.close() # Segfault
........
  r60871 | amaury.forgeotdarc | 2008-02-16 21:55:24 +0100 (Sat, 16 Feb 2008) | 3 lines
  Prevent a crash with nested scopes, again caused by calling Py_DECREF when the pointer
  is still present in the containing structure.
........
  r60872 | brett.cannon | 2008-02-17 02:59:18 +0100 (Sun, 17 Feb 2008) | 4 lines
  Move test_logging over to doctest.
  Thanks to Christopher White from GHOP.
........
  r60873 | georg.brandl | 2008-02-17 12:33:38 +0100 (Sun, 17 Feb 2008) | 2 lines
  #2131: note that codecs.open() always opens files in binary mode.
........
											
										 
											2008-02-17 13:31:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |     [logger_root] | 
					
						
							|  |  |  |     level=WARNING | 
					
						
							|  |  |  |     handlers= | 
					
						
							| 
									
										
											  
											
												Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60873 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r60850 | amaury.forgeotdarc | 2008-02-16 01:16:50 +0100 (Sat, 16 Feb 2008) | 3 lines
  mmap.PROT_READ does not exists on win32;
  Skip this test created by r60830.
........
  r60851 | raymond.hettinger | 2008-02-16 02:22:54 +0100 (Sat, 16 Feb 2008) | 1 line
  Add __all__ to logging module.
........
  r60855 | georg.brandl | 2008-02-16 10:37:32 +0100 (Sat, 16 Feb 2008) | 2 lines
  #2120: broken links in advocacy document.
........
  r60860 | amaury.forgeotdarc | 2008-02-16 15:34:57 +0100 (Sat, 16 Feb 2008) | 23 lines
  Crashers of the day: Py_CLEAR must be used when there is a chance that the
  function can be called recursively.
  This was discussed in issue1020188.
  In python codebase, all occurrences of Py_[X]DECREF(xxx->yyy) are suspect,
  except when they appear in tp_new or tp_dealloc functions, or when
  the member cannot be of a user-defined class.
  Note that tp_init is not safe.
  I do have a (crashing) example for every changed line.
  Is it worth adding them to the test suite?
  Example:
  class SpecialStr(str):
      def __del__(self):
          s.close()
  import cStringIO
  s = cStringIO.StringIO(SpecialStr("text"))
  s.close() # Segfault
........
  r60871 | amaury.forgeotdarc | 2008-02-16 21:55:24 +0100 (Sat, 16 Feb 2008) | 3 lines
  Prevent a crash with nested scopes, again caused by calling Py_DECREF when the pointer
  is still present in the containing structure.
........
  r60872 | brett.cannon | 2008-02-17 02:59:18 +0100 (Sun, 17 Feb 2008) | 4 lines
  Move test_logging over to doctest.
  Thanks to Christopher White from GHOP.
........
  r60873 | georg.brandl | 2008-02-17 12:33:38 +0100 (Sun, 17 Feb 2008) | 2 lines
  #2131: note that codecs.open() always opens files in binary mode.
........
											
										 
											2008-02-17 13:31:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |     [logger_parser] | 
					
						
							|  |  |  |     level=DEBUG | 
					
						
							|  |  |  |     handlers=hand1 | 
					
						
							|  |  |  |     propagate=1 | 
					
						
							|  |  |  |     qualname=compiler.parser | 
					
						
							| 
									
										
											  
											
												Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60873 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r60850 | amaury.forgeotdarc | 2008-02-16 01:16:50 +0100 (Sat, 16 Feb 2008) | 3 lines
  mmap.PROT_READ does not exists on win32;
  Skip this test created by r60830.
........
  r60851 | raymond.hettinger | 2008-02-16 02:22:54 +0100 (Sat, 16 Feb 2008) | 1 line
  Add __all__ to logging module.
........
  r60855 | georg.brandl | 2008-02-16 10:37:32 +0100 (Sat, 16 Feb 2008) | 2 lines
  #2120: broken links in advocacy document.
........
  r60860 | amaury.forgeotdarc | 2008-02-16 15:34:57 +0100 (Sat, 16 Feb 2008) | 23 lines
  Crashers of the day: Py_CLEAR must be used when there is a chance that the
  function can be called recursively.
  This was discussed in issue1020188.
  In python codebase, all occurrences of Py_[X]DECREF(xxx->yyy) are suspect,
  except when they appear in tp_new or tp_dealloc functions, or when
  the member cannot be of a user-defined class.
  Note that tp_init is not safe.
  I do have a (crashing) example for every changed line.
  Is it worth adding them to the test suite?
  Example:
  class SpecialStr(str):
      def __del__(self):
          s.close()
  import cStringIO
  s = cStringIO.StringIO(SpecialStr("text"))
  s.close() # Segfault
........
  r60871 | amaury.forgeotdarc | 2008-02-16 21:55:24 +0100 (Sat, 16 Feb 2008) | 3 lines
  Prevent a crash with nested scopes, again caused by calling Py_DECREF when the pointer
  is still present in the containing structure.
........
  r60872 | brett.cannon | 2008-02-17 02:59:18 +0100 (Sun, 17 Feb 2008) | 4 lines
  Move test_logging over to doctest.
  Thanks to Christopher White from GHOP.
........
  r60873 | georg.brandl | 2008-02-17 12:33:38 +0100 (Sun, 17 Feb 2008) | 2 lines
  #2131: note that codecs.open() always opens files in binary mode.
........
											
										 
											2008-02-17 13:31:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |     [handler_hand1] | 
					
						
							|  |  |  |     class=StreamHandler | 
					
						
							|  |  |  |     level=NOTSET | 
					
						
							|  |  |  |     formatter=form1 | 
					
						
							|  |  |  |     args=(sys.stdout,) | 
					
						
							| 
									
										
											  
											
												Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60873 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r60850 | amaury.forgeotdarc | 2008-02-16 01:16:50 +0100 (Sat, 16 Feb 2008) | 3 lines
  mmap.PROT_READ does not exists on win32;
  Skip this test created by r60830.
........
  r60851 | raymond.hettinger | 2008-02-16 02:22:54 +0100 (Sat, 16 Feb 2008) | 1 line
  Add __all__ to logging module.
........
  r60855 | georg.brandl | 2008-02-16 10:37:32 +0100 (Sat, 16 Feb 2008) | 2 lines
  #2120: broken links in advocacy document.
........
  r60860 | amaury.forgeotdarc | 2008-02-16 15:34:57 +0100 (Sat, 16 Feb 2008) | 23 lines
  Crashers of the day: Py_CLEAR must be used when there is a chance that the
  function can be called recursively.
  This was discussed in issue1020188.
  In python codebase, all occurrences of Py_[X]DECREF(xxx->yyy) are suspect,
  except when they appear in tp_new or tp_dealloc functions, or when
  the member cannot be of a user-defined class.
  Note that tp_init is not safe.
  I do have a (crashing) example for every changed line.
  Is it worth adding them to the test suite?
  Example:
  class SpecialStr(str):
      def __del__(self):
          s.close()
  import cStringIO
  s = cStringIO.StringIO(SpecialStr("text"))
  s.close() # Segfault
........
  r60871 | amaury.forgeotdarc | 2008-02-16 21:55:24 +0100 (Sat, 16 Feb 2008) | 3 lines
  Prevent a crash with nested scopes, again caused by calling Py_DECREF when the pointer
  is still present in the containing structure.
........
  r60872 | brett.cannon | 2008-02-17 02:59:18 +0100 (Sun, 17 Feb 2008) | 4 lines
  Move test_logging over to doctest.
  Thanks to Christopher White from GHOP.
........
  r60873 | georg.brandl | 2008-02-17 12:33:38 +0100 (Sun, 17 Feb 2008) | 2 lines
  #2131: note that codecs.open() always opens files in binary mode.
........
											
										 
											2008-02-17 13:31:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |     [formatter_form1] | 
					
						
							|  |  |  |     format=%(levelname)s ++ %(message)s | 
					
						
							|  |  |  |     datefmt= | 
					
						
							|  |  |  |     """
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60873 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r60850 | amaury.forgeotdarc | 2008-02-16 01:16:50 +0100 (Sat, 16 Feb 2008) | 3 lines
  mmap.PROT_READ does not exists on win32;
  Skip this test created by r60830.
........
  r60851 | raymond.hettinger | 2008-02-16 02:22:54 +0100 (Sat, 16 Feb 2008) | 1 line
  Add __all__ to logging module.
........
  r60855 | georg.brandl | 2008-02-16 10:37:32 +0100 (Sat, 16 Feb 2008) | 2 lines
  #2120: broken links in advocacy document.
........
  r60860 | amaury.forgeotdarc | 2008-02-16 15:34:57 +0100 (Sat, 16 Feb 2008) | 23 lines
  Crashers of the day: Py_CLEAR must be used when there is a chance that the
  function can be called recursively.
  This was discussed in issue1020188.
  In python codebase, all occurrences of Py_[X]DECREF(xxx->yyy) are suspect,
  except when they appear in tp_new or tp_dealloc functions, or when
  the member cannot be of a user-defined class.
  Note that tp_init is not safe.
  I do have a (crashing) example for every changed line.
  Is it worth adding them to the test suite?
  Example:
  class SpecialStr(str):
      def __del__(self):
          s.close()
  import cStringIO
  s = cStringIO.StringIO(SpecialStr("text"))
  s.close() # Segfault
........
  r60871 | amaury.forgeotdarc | 2008-02-16 21:55:24 +0100 (Sat, 16 Feb 2008) | 3 lines
  Prevent a crash with nested scopes, again caused by calling Py_DECREF when the pointer
  is still present in the containing structure.
........
  r60872 | brett.cannon | 2008-02-17 02:59:18 +0100 (Sun, 17 Feb 2008) | 4 lines
  Move test_logging over to doctest.
  Thanks to Christopher White from GHOP.
........
  r60873 | georg.brandl | 2008-02-17 12:33:38 +0100 (Sun, 17 Feb 2008) | 2 lines
  #2131: note that codecs.open() always opens files in binary mode.
........
											
										 
											2008-02-17 13:31:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-03-07 17:49:33 +00:00
										 |  |  |     # config1a moves the handler to the root. | 
					
						
							|  |  |  |     config1a = """
 | 
					
						
							|  |  |  |     [loggers] | 
					
						
							|  |  |  |     keys=root,parser | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     [handlers] | 
					
						
							|  |  |  |     keys=hand1 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     [formatters] | 
					
						
							|  |  |  |     keys=form1 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     [logger_root] | 
					
						
							|  |  |  |     level=WARNING | 
					
						
							|  |  |  |     handlers=hand1 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     [logger_parser] | 
					
						
							|  |  |  |     level=DEBUG | 
					
						
							|  |  |  |     handlers= | 
					
						
							|  |  |  |     propagate=1 | 
					
						
							|  |  |  |     qualname=compiler.parser | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     [handler_hand1] | 
					
						
							|  |  |  |     class=StreamHandler | 
					
						
							|  |  |  |     level=NOTSET | 
					
						
							|  |  |  |     formatter=form1 | 
					
						
							|  |  |  |     args=(sys.stdout,) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     [formatter_form1] | 
					
						
							|  |  |  |     format=%(levelname)s ++ %(message)s | 
					
						
							|  |  |  |     datefmt= | 
					
						
							|  |  |  |     """
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |     # config2 has a subtle configuration error that should be reported | 
					
						
							|  |  |  |     config2 = config1.replace("sys.stdout", "sys.stbout") | 
					
						
							| 
									
										
											  
											
												Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60873 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r60850 | amaury.forgeotdarc | 2008-02-16 01:16:50 +0100 (Sat, 16 Feb 2008) | 3 lines
  mmap.PROT_READ does not exists on win32;
  Skip this test created by r60830.
........
  r60851 | raymond.hettinger | 2008-02-16 02:22:54 +0100 (Sat, 16 Feb 2008) | 1 line
  Add __all__ to logging module.
........
  r60855 | georg.brandl | 2008-02-16 10:37:32 +0100 (Sat, 16 Feb 2008) | 2 lines
  #2120: broken links in advocacy document.
........
  r60860 | amaury.forgeotdarc | 2008-02-16 15:34:57 +0100 (Sat, 16 Feb 2008) | 23 lines
  Crashers of the day: Py_CLEAR must be used when there is a chance that the
  function can be called recursively.
  This was discussed in issue1020188.
  In python codebase, all occurrences of Py_[X]DECREF(xxx->yyy) are suspect,
  except when they appear in tp_new or tp_dealloc functions, or when
  the member cannot be of a user-defined class.
  Note that tp_init is not safe.
  I do have a (crashing) example for every changed line.
  Is it worth adding them to the test suite?
  Example:
  class SpecialStr(str):
      def __del__(self):
          s.close()
  import cStringIO
  s = cStringIO.StringIO(SpecialStr("text"))
  s.close() # Segfault
........
  r60871 | amaury.forgeotdarc | 2008-02-16 21:55:24 +0100 (Sat, 16 Feb 2008) | 3 lines
  Prevent a crash with nested scopes, again caused by calling Py_DECREF when the pointer
  is still present in the containing structure.
........
  r60872 | brett.cannon | 2008-02-17 02:59:18 +0100 (Sun, 17 Feb 2008) | 4 lines
  Move test_logging over to doctest.
  Thanks to Christopher White from GHOP.
........
  r60873 | georg.brandl | 2008-02-17 12:33:38 +0100 (Sun, 17 Feb 2008) | 2 lines
  #2131: note that codecs.open() always opens files in binary mode.
........
											
										 
											2008-02-17 13:31:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |     # config3 has a less subtle configuration error | 
					
						
							|  |  |  |     config3 = config1.replace("formatter=form1", "formatter=misspelled_name") | 
					
						
							| 
									
										
											  
											
												Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60873 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r60850 | amaury.forgeotdarc | 2008-02-16 01:16:50 +0100 (Sat, 16 Feb 2008) | 3 lines
  mmap.PROT_READ does not exists on win32;
  Skip this test created by r60830.
........
  r60851 | raymond.hettinger | 2008-02-16 02:22:54 +0100 (Sat, 16 Feb 2008) | 1 line
  Add __all__ to logging module.
........
  r60855 | georg.brandl | 2008-02-16 10:37:32 +0100 (Sat, 16 Feb 2008) | 2 lines
  #2120: broken links in advocacy document.
........
  r60860 | amaury.forgeotdarc | 2008-02-16 15:34:57 +0100 (Sat, 16 Feb 2008) | 23 lines
  Crashers of the day: Py_CLEAR must be used when there is a chance that the
  function can be called recursively.
  This was discussed in issue1020188.
  In python codebase, all occurrences of Py_[X]DECREF(xxx->yyy) are suspect,
  except when they appear in tp_new or tp_dealloc functions, or when
  the member cannot be of a user-defined class.
  Note that tp_init is not safe.
  I do have a (crashing) example for every changed line.
  Is it worth adding them to the test suite?
  Example:
  class SpecialStr(str):
      def __del__(self):
          s.close()
  import cStringIO
  s = cStringIO.StringIO(SpecialStr("text"))
  s.close() # Segfault
........
  r60871 | amaury.forgeotdarc | 2008-02-16 21:55:24 +0100 (Sat, 16 Feb 2008) | 3 lines
  Prevent a crash with nested scopes, again caused by calling Py_DECREF when the pointer
  is still present in the containing structure.
........
  r60872 | brett.cannon | 2008-02-17 02:59:18 +0100 (Sun, 17 Feb 2008) | 4 lines
  Move test_logging over to doctest.
  Thanks to Christopher White from GHOP.
........
  r60873 | georg.brandl | 2008-02-17 12:33:38 +0100 (Sun, 17 Feb 2008) | 2 lines
  #2131: note that codecs.open() always opens files in binary mode.
........
											
										 
											2008-02-17 13:31:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |     # config4 specifies a custom formatter class to be loaded | 
					
						
							|  |  |  |     config4 = """
 | 
					
						
							|  |  |  |     [loggers] | 
					
						
							|  |  |  |     keys=root | 
					
						
							| 
									
										
											  
											
												Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60873 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r60850 | amaury.forgeotdarc | 2008-02-16 01:16:50 +0100 (Sat, 16 Feb 2008) | 3 lines
  mmap.PROT_READ does not exists on win32;
  Skip this test created by r60830.
........
  r60851 | raymond.hettinger | 2008-02-16 02:22:54 +0100 (Sat, 16 Feb 2008) | 1 line
  Add __all__ to logging module.
........
  r60855 | georg.brandl | 2008-02-16 10:37:32 +0100 (Sat, 16 Feb 2008) | 2 lines
  #2120: broken links in advocacy document.
........
  r60860 | amaury.forgeotdarc | 2008-02-16 15:34:57 +0100 (Sat, 16 Feb 2008) | 23 lines
  Crashers of the day: Py_CLEAR must be used when there is a chance that the
  function can be called recursively.
  This was discussed in issue1020188.
  In python codebase, all occurrences of Py_[X]DECREF(xxx->yyy) are suspect,
  except when they appear in tp_new or tp_dealloc functions, or when
  the member cannot be of a user-defined class.
  Note that tp_init is not safe.
  I do have a (crashing) example for every changed line.
  Is it worth adding them to the test suite?
  Example:
  class SpecialStr(str):
      def __del__(self):
          s.close()
  import cStringIO
  s = cStringIO.StringIO(SpecialStr("text"))
  s.close() # Segfault
........
  r60871 | amaury.forgeotdarc | 2008-02-16 21:55:24 +0100 (Sat, 16 Feb 2008) | 3 lines
  Prevent a crash with nested scopes, again caused by calling Py_DECREF when the pointer
  is still present in the containing structure.
........
  r60872 | brett.cannon | 2008-02-17 02:59:18 +0100 (Sun, 17 Feb 2008) | 4 lines
  Move test_logging over to doctest.
  Thanks to Christopher White from GHOP.
........
  r60873 | georg.brandl | 2008-02-17 12:33:38 +0100 (Sun, 17 Feb 2008) | 2 lines
  #2131: note that codecs.open() always opens files in binary mode.
........
											
										 
											2008-02-17 13:31:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |     [handlers] | 
					
						
							|  |  |  |     keys=hand1 | 
					
						
							| 
									
										
											  
											
												Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60873 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r60850 | amaury.forgeotdarc | 2008-02-16 01:16:50 +0100 (Sat, 16 Feb 2008) | 3 lines
  mmap.PROT_READ does not exists on win32;
  Skip this test created by r60830.
........
  r60851 | raymond.hettinger | 2008-02-16 02:22:54 +0100 (Sat, 16 Feb 2008) | 1 line
  Add __all__ to logging module.
........
  r60855 | georg.brandl | 2008-02-16 10:37:32 +0100 (Sat, 16 Feb 2008) | 2 lines
  #2120: broken links in advocacy document.
........
  r60860 | amaury.forgeotdarc | 2008-02-16 15:34:57 +0100 (Sat, 16 Feb 2008) | 23 lines
  Crashers of the day: Py_CLEAR must be used when there is a chance that the
  function can be called recursively.
  This was discussed in issue1020188.
  In python codebase, all occurrences of Py_[X]DECREF(xxx->yyy) are suspect,
  except when they appear in tp_new or tp_dealloc functions, or when
  the member cannot be of a user-defined class.
  Note that tp_init is not safe.
  I do have a (crashing) example for every changed line.
  Is it worth adding them to the test suite?
  Example:
  class SpecialStr(str):
      def __del__(self):
          s.close()
  import cStringIO
  s = cStringIO.StringIO(SpecialStr("text"))
  s.close() # Segfault
........
  r60871 | amaury.forgeotdarc | 2008-02-16 21:55:24 +0100 (Sat, 16 Feb 2008) | 3 lines
  Prevent a crash with nested scopes, again caused by calling Py_DECREF when the pointer
  is still present in the containing structure.
........
  r60872 | brett.cannon | 2008-02-17 02:59:18 +0100 (Sun, 17 Feb 2008) | 4 lines
  Move test_logging over to doctest.
  Thanks to Christopher White from GHOP.
........
  r60873 | georg.brandl | 2008-02-17 12:33:38 +0100 (Sun, 17 Feb 2008) | 2 lines
  #2131: note that codecs.open() always opens files in binary mode.
........
											
										 
											2008-02-17 13:31:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |     [formatters] | 
					
						
							|  |  |  |     keys=form1 | 
					
						
							| 
									
										
										
										
											2003-01-02 14:56:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |     [logger_root] | 
					
						
							|  |  |  |     level=NOTSET | 
					
						
							|  |  |  |     handlers=hand1 | 
					
						
							| 
									
										
										
										
											2003-01-02 14:56:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |     [handler_hand1] | 
					
						
							|  |  |  |     class=StreamHandler | 
					
						
							|  |  |  |     level=NOTSET | 
					
						
							|  |  |  |     formatter=form1 | 
					
						
							|  |  |  |     args=(sys.stdout,) | 
					
						
							| 
									
										
											  
											
												Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60873 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r60850 | amaury.forgeotdarc | 2008-02-16 01:16:50 +0100 (Sat, 16 Feb 2008) | 3 lines
  mmap.PROT_READ does not exists on win32;
  Skip this test created by r60830.
........
  r60851 | raymond.hettinger | 2008-02-16 02:22:54 +0100 (Sat, 16 Feb 2008) | 1 line
  Add __all__ to logging module.
........
  r60855 | georg.brandl | 2008-02-16 10:37:32 +0100 (Sat, 16 Feb 2008) | 2 lines
  #2120: broken links in advocacy document.
........
  r60860 | amaury.forgeotdarc | 2008-02-16 15:34:57 +0100 (Sat, 16 Feb 2008) | 23 lines
  Crashers of the day: Py_CLEAR must be used when there is a chance that the
  function can be called recursively.
  This was discussed in issue1020188.
  In python codebase, all occurrences of Py_[X]DECREF(xxx->yyy) are suspect,
  except when they appear in tp_new or tp_dealloc functions, or when
  the member cannot be of a user-defined class.
  Note that tp_init is not safe.
  I do have a (crashing) example for every changed line.
  Is it worth adding them to the test suite?
  Example:
  class SpecialStr(str):
      def __del__(self):
          s.close()
  import cStringIO
  s = cStringIO.StringIO(SpecialStr("text"))
  s.close() # Segfault
........
  r60871 | amaury.forgeotdarc | 2008-02-16 21:55:24 +0100 (Sat, 16 Feb 2008) | 3 lines
  Prevent a crash with nested scopes, again caused by calling Py_DECREF when the pointer
  is still present in the containing structure.
........
  r60872 | brett.cannon | 2008-02-17 02:59:18 +0100 (Sun, 17 Feb 2008) | 4 lines
  Move test_logging over to doctest.
  Thanks to Christopher White from GHOP.
........
  r60873 | georg.brandl | 2008-02-17 12:33:38 +0100 (Sun, 17 Feb 2008) | 2 lines
  #2131: note that codecs.open() always opens files in binary mode.
........
											
										 
											2008-02-17 13:31:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |     [formatter_form1] | 
					
						
							|  |  |  |     class=""" + __name__ + """.ExceptionFormatter | 
					
						
							|  |  |  |     format=%(levelname)s:%(name)s:%(message)s | 
					
						
							|  |  |  |     datefmt= | 
					
						
							|  |  |  |     """
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60873 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r60850 | amaury.forgeotdarc | 2008-02-16 01:16:50 +0100 (Sat, 16 Feb 2008) | 3 lines
  mmap.PROT_READ does not exists on win32;
  Skip this test created by r60830.
........
  r60851 | raymond.hettinger | 2008-02-16 02:22:54 +0100 (Sat, 16 Feb 2008) | 1 line
  Add __all__ to logging module.
........
  r60855 | georg.brandl | 2008-02-16 10:37:32 +0100 (Sat, 16 Feb 2008) | 2 lines
  #2120: broken links in advocacy document.
........
  r60860 | amaury.forgeotdarc | 2008-02-16 15:34:57 +0100 (Sat, 16 Feb 2008) | 23 lines
  Crashers of the day: Py_CLEAR must be used when there is a chance that the
  function can be called recursively.
  This was discussed in issue1020188.
  In python codebase, all occurrences of Py_[X]DECREF(xxx->yyy) are suspect,
  except when they appear in tp_new or tp_dealloc functions, or when
  the member cannot be of a user-defined class.
  Note that tp_init is not safe.
  I do have a (crashing) example for every changed line.
  Is it worth adding them to the test suite?
  Example:
  class SpecialStr(str):
      def __del__(self):
          s.close()
  import cStringIO
  s = cStringIO.StringIO(SpecialStr("text"))
  s.close() # Segfault
........
  r60871 | amaury.forgeotdarc | 2008-02-16 21:55:24 +0100 (Sat, 16 Feb 2008) | 3 lines
  Prevent a crash with nested scopes, again caused by calling Py_DECREF when the pointer
  is still present in the containing structure.
........
  r60872 | brett.cannon | 2008-02-17 02:59:18 +0100 (Sun, 17 Feb 2008) | 4 lines
  Move test_logging over to doctest.
  Thanks to Christopher White from GHOP.
........
  r60873 | georg.brandl | 2008-02-17 12:33:38 +0100 (Sun, 17 Feb 2008) | 2 lines
  #2131: note that codecs.open() always opens files in binary mode.
........
											
										 
											2008-02-17 13:31:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 65012,65035,65037-65040,65048,65057,65077,65091-65095,65097-65099,65127-65128,65131,65133-65136,65139,65149-65151,65155,65158-65159,65176-65178,65183-65184,65187-65190,65192,65194 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r65012 | jesse.noller | 2008-07-16 15:24:06 +0200 (Wed, 16 Jul 2008) | 2 lines
  Apply patch for issue 3090: ARCHFLAGS parsing incorrect
........
  r65035 | georg.brandl | 2008-07-16 23:19:28 +0200 (Wed, 16 Jul 2008) | 2 lines
  #3045: fix pydoc behavior for TEMP path with spaces.
........
  r65037 | georg.brandl | 2008-07-16 23:31:41 +0200 (Wed, 16 Jul 2008) | 2 lines
  #1608818: errno can get set by every call to readdir().
........
  r65038 | georg.brandl | 2008-07-17 00:04:20 +0200 (Thu, 17 Jul 2008) | 2 lines
  #3305: self->stream can be NULL.
........
  r65039 | georg.brandl | 2008-07-17 00:09:17 +0200 (Thu, 17 Jul 2008) | 2 lines
  #3345: fix docstring.
........
  r65040 | georg.brandl | 2008-07-17 00:33:18 +0200 (Thu, 17 Jul 2008) | 2 lines
  #3312: fix two sqlite3 crashes.
........
  r65048 | georg.brandl | 2008-07-17 01:35:54 +0200 (Thu, 17 Jul 2008) | 2 lines
  #3388: add a paragraph about using "with" for file objects.
........
  r65057 | gregory.p.smith | 2008-07-17 05:13:05 +0200 (Thu, 17 Jul 2008) | 2 lines
  news note for r63052
........
  r65077 | jesse.noller | 2008-07-17 23:01:05 +0200 (Thu, 17 Jul 2008) | 3 lines
  Fix issue 3395, update _debugInfo to be _debug_info
........
  r65091 | ronald.oussoren | 2008-07-18 07:48:03 +0200 (Fri, 18 Jul 2008) | 2 lines
  Last bit of a fix for issue3381 (addon for my patch in r65061)
........
  r65092 | vinay.sajip | 2008-07-18 10:59:06 +0200 (Fri, 18 Jul 2008) | 1 line
  Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
  r65093 | vinay.sajip | 2008-07-18 11:00:00 +0200 (Fri, 18 Jul 2008) | 1 line
  Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
  r65094 | vinay.sajip | 2008-07-18 11:00:35 +0200 (Fri, 18 Jul 2008) | 1 line
  Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
  r65095 | vinay.sajip | 2008-07-18 11:01:10 +0200 (Fri, 18 Jul 2008) | 1 line
  Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
  r65097 | georg.brandl | 2008-07-18 12:20:59 +0200 (Fri, 18 Jul 2008) | 2 lines
  Remove duplicate entry in __all__.
........
  r65098 | georg.brandl | 2008-07-18 12:29:30 +0200 (Fri, 18 Jul 2008) | 2 lines
  Correct attribute name.
........
  r65099 | georg.brandl | 2008-07-18 13:15:06 +0200 (Fri, 18 Jul 2008) | 3 lines
  Document the different meaning of precision for {:f} and {:g}.
  Also document how inf and nan are formatted. #3404.
........
  r65127 | raymond.hettinger | 2008-07-19 02:42:03 +0200 (Sat, 19 Jul 2008) | 1 line
  Improve accuracy of gamma test function
........
  r65128 | raymond.hettinger | 2008-07-19 02:43:00 +0200 (Sat, 19 Jul 2008) | 1 line
  Add recipe to the itertools docs.
........
  r65131 | georg.brandl | 2008-07-19 12:08:55 +0200 (Sat, 19 Jul 2008) | 2 lines
  #3378: in case of no memory, don't leak even more memory. :)
........
  r65133 | georg.brandl | 2008-07-19 14:39:10 +0200 (Sat, 19 Jul 2008) | 3 lines
  #3302: fix segfaults when passing None for arguments that can't
  be NULL for the C functions.
........
  r65134 | georg.brandl | 2008-07-19 14:46:12 +0200 (Sat, 19 Jul 2008) | 2 lines
  #3303: fix crash with invalid Py_DECREF in strcoll().
........
  r65135 | georg.brandl | 2008-07-19 15:00:22 +0200 (Sat, 19 Jul 2008) | 3 lines
  #3319: don't raise ZeroDivisionError if number of rounds is so
  low that benchtime is zero.
........
  r65136 | georg.brandl | 2008-07-19 15:09:42 +0200 (Sat, 19 Jul 2008) | 3 lines
  #3323: mention that if inheriting from a class without __slots__,
  the subclass will have a __dict__ available too.
........
  r65139 | georg.brandl | 2008-07-19 15:48:44 +0200 (Sat, 19 Jul 2008) | 2 lines
  Add ordering info for findall and finditer.
........
  r65149 | raymond.hettinger | 2008-07-20 01:21:57 +0200 (Sun, 20 Jul 2008) | 1 line
  Fix compress() recipe in docs to use itertools.
........
  r65150 | raymond.hettinger | 2008-07-20 01:58:47 +0200 (Sun, 20 Jul 2008) | 1 line
  Clean-up itertools docs and recipes.
........
  r65151 | gregory.p.smith | 2008-07-20 02:22:08 +0200 (Sun, 20 Jul 2008) | 9 lines
  fix issue3120 - don't truncate handles on 64-bit Windows.
  This is still messy, realistically PC/_subprocess.c should never cast pointers
  to python numbers and back at all.
  I don't have a 64-bit windows build environment because microsoft apparently
  thinks that should cost money.  Time to watch the buildbots.  It builds and
  passes tests on 32-bit windows.
........
  r65155 | georg.brandl | 2008-07-20 13:50:29 +0200 (Sun, 20 Jul 2008) | 2 lines
  #926501: add info where to put the docstring.
........
  r65158 | neal.norwitz | 2008-07-20 21:35:23 +0200 (Sun, 20 Jul 2008) | 1 line
  Fix a couple of names in error messages that were wrong
........
  r65159 | neal.norwitz | 2008-07-20 22:39:36 +0200 (Sun, 20 Jul 2008) | 1 line
  Fix misspeeld method name (negative)
........
  r65176 | amaury.forgeotdarc | 2008-07-21 23:36:24 +0200 (Mon, 21 Jul 2008) | 4 lines
  Increment version number in NEWS file, and move items that were added after 2.6b2.
  (I thought there was a script to automate this kind of updates)
........
  r65177 | amaury.forgeotdarc | 2008-07-22 00:00:38 +0200 (Tue, 22 Jul 2008) | 5 lines
  Issue2378: pdb would delete free variables when stepping into a class statement.
  The problem was introduced by r53954, the correction is to restore the symmetry between
  PyFrame_FastToLocals and PyFrame_LocalsToFast
........
  r65178 | benjamin.peterson | 2008-07-22 00:05:34 +0200 (Tue, 22 Jul 2008) | 1 line
  don't use assert statement
........
  r65183 | ronald.oussoren | 2008-07-22 09:06:00 +0200 (Tue, 22 Jul 2008) | 2 lines
  Fix buglet in fix for issue3381
........
  r65184 | ronald.oussoren | 2008-07-22 09:06:33 +0200 (Tue, 22 Jul 2008) | 2 lines
  Fix build issue on OSX 10.4, somehow this wasn't committed before.
........
  r65187 | raymond.hettinger | 2008-07-22 20:54:02 +0200 (Tue, 22 Jul 2008) | 1 line
  Remove out-of-date section on Exact/Inexact.
........
  r65188 | raymond.hettinger | 2008-07-22 21:00:47 +0200 (Tue, 22 Jul 2008) | 1 line
  Tuples now have both count() and index().
........
  r65189 | raymond.hettinger | 2008-07-22 21:03:05 +0200 (Tue, 22 Jul 2008) | 1 line
  Fix credits for math.sum()
........
  r65190 | raymond.hettinger | 2008-07-22 21:18:50 +0200 (Tue, 22 Jul 2008) | 1 line
  One more attribution.
........
  r65192 | benjamin.peterson | 2008-07-23 01:44:37 +0200 (Wed, 23 Jul 2008) | 1 line
  remove unneeded import
........
  r65194 | benjamin.peterson | 2008-07-23 15:25:06 +0200 (Wed, 23 Jul 2008) | 1 line
  use isinstance
........
											
										 
											2008-07-23 16:10:53 +00:00
										 |  |  |     # config5 specifies a custom handler class to be loaded | 
					
						
							|  |  |  |     config5 = config1.replace('class=StreamHandler', 'class=logging.StreamHandler') | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 66141,66145,66150,66180,66211,66217,66219,66226,66231,66244,66246,66249-66250,66264,66268,66272,66294,66306 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r66141 | gregory.p.smith | 2008-09-02 00:29:51 -0500 (Tue, 02 Sep 2008) | 3 lines
  Issue #3678: Correctly pass LDFLAGS and LDLAST to the linker on shared
  library targets in the Makefile.
........
  r66145 | marc-andre.lemburg | 2008-09-02 05:32:34 -0500 (Tue, 02 Sep 2008) | 5 lines
  Add quotes around the file name to avoid issues with spaces.
  Closes #3719.
........
  r66150 | marc-andre.lemburg | 2008-09-02 07:11:19 -0500 (Tue, 02 Sep 2008) | 3 lines
  Add news item for #3719.
........
  r66180 | vinay.sajip | 2008-09-03 04:20:05 -0500 (Wed, 03 Sep 2008) | 1 line
  Issue #3726: Allowed spaces in separators in logging configuration files.
........
  r66211 | vinay.sajip | 2008-09-04 02:31:21 -0500 (Thu, 04 Sep 2008) | 1 line
  Issue #3772: Fixed regression problem in StreamHandler.emit().
........
  r66217 | andrew.kuchling | 2008-09-04 08:26:24 -0500 (Thu, 04 Sep 2008) | 1 line
  #3671: various corrections and markup fixes noted by Kent Johnson
........
  r66219 | hirokazu.yamamoto | 2008-09-04 09:25:30 -0500 (Thu, 04 Sep 2008) | 1 line
  Added NEWS
........
  r66226 | benjamin.peterson | 2008-09-04 18:31:27 -0500 (Thu, 04 Sep 2008) | 1 line
  flesh out the documentation on using 2to3
........
  r66231 | andrew.kuchling | 2008-09-05 10:15:56 -0500 (Fri, 05 Sep 2008) | 1 line
  #3671: Typo fix
........
  r66244 | jesse.noller | 2008-09-05 20:20:11 -0500 (Fri, 05 Sep 2008) | 2 lines
  Fix typo in multiprocessing doc, cancel_join_thread was missing _thread
........
  r66246 | benjamin.peterson | 2008-09-05 22:00:00 -0500 (Fri, 05 Sep 2008) | 1 line
  actually tell the name of the flag to use
........
  r66249 | andrew.kuchling | 2008-09-06 07:50:05 -0500 (Sat, 06 Sep 2008) | 1 line
  Various corrections
........
  r66250 | andrew.kuchling | 2008-09-06 08:04:02 -0500 (Sat, 06 Sep 2008) | 1 line
  #3040: include 'dest' argument in example; trim some trailing whitespace
........
  r66264 | benjamin.peterson | 2008-09-06 14:42:39 -0500 (Sat, 06 Sep 2008) | 1 line
  docs are pretty good about new-style classes these days
........
  r66268 | andrew.kuchling | 2008-09-06 15:28:01 -0500 (Sat, 06 Sep 2008) | 1 line
  #3669 from Robert Lehmann: simplify use of iterator in example
........
  r66272 | andrew.kuchling | 2008-09-06 16:26:02 -0500 (Sat, 06 Sep 2008) | 1 line
  #1317: describe the does_esmtp, ehlo_resp, esmtp_features, and helo_resp attributes
........
  r66294 | georg.brandl | 2008-09-07 12:00:17 -0500 (Sun, 07 Sep 2008) | 2 lines
  Add a new howto about Python and the web, by Marek Kubica.
........
  r66306 | mark.summerfield | 2008-09-08 09:45:37 -0500 (Mon, 08 Sep 2008) | 3 lines
  Added xrefs to each other.
........
											
										 
											2008-09-08 23:05:23 +00:00
										 |  |  |     # config6 uses ', ' delimiters in the handlers and formatters sections | 
					
						
							|  |  |  |     config6 = """
 | 
					
						
							|  |  |  |     [loggers] | 
					
						
							|  |  |  |     keys=root,parser | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     [handlers] | 
					
						
							|  |  |  |     keys=hand1, hand2 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     [formatters] | 
					
						
							|  |  |  |     keys=form1, form2 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     [logger_root] | 
					
						
							|  |  |  |     level=WARNING | 
					
						
							|  |  |  |     handlers= | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     [logger_parser] | 
					
						
							|  |  |  |     level=DEBUG | 
					
						
							|  |  |  |     handlers=hand1 | 
					
						
							|  |  |  |     propagate=1 | 
					
						
							|  |  |  |     qualname=compiler.parser | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     [handler_hand1] | 
					
						
							|  |  |  |     class=StreamHandler | 
					
						
							|  |  |  |     level=NOTSET | 
					
						
							|  |  |  |     formatter=form1 | 
					
						
							|  |  |  |     args=(sys.stdout,) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     [handler_hand2] | 
					
						
							| 
									
										
										
											
												Merged revisions 66337,66347,66350,66352,66358 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r66337 | vinay.sajip | 2008-09-09 08:42:08 -0500 (Tue, 09 Sep 2008) | 1 line
  Issue #3809: Fixed spurious 'test.blah' file left behind by test_logging.
........
  r66347 | georg.brandl | 2008-09-09 14:26:00 -0500 (Tue, 09 Sep 2008) | 2 lines
  Fix varname in docstring. #3822.
........
  r66350 | georg.brandl | 2008-09-09 15:28:31 -0500 (Tue, 09 Sep 2008) | 2 lines
  #3472: update Mac-bundled Python version info.
........
  r66352 | benjamin.peterson | 2008-09-09 15:55:01 -0500 (Tue, 09 Sep 2008) | 4 lines
  Fix #3634 invalid return value from _weakref.ref(Exception).__init__
  Reviewers: Amaury, Antoine, Benjamin
........
  r66358 | benjamin.peterson | 2008-09-09 18:16:48 -0500 (Tue, 09 Sep 2008) | 1 line
  use the latest pygments version
........
											
										 
											2008-09-10 21:57:34 +00:00
										 |  |  |     class=StreamHandler | 
					
						
							| 
									
										
											  
											
												Merged revisions 66141,66145,66150,66180,66211,66217,66219,66226,66231,66244,66246,66249-66250,66264,66268,66272,66294,66306 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r66141 | gregory.p.smith | 2008-09-02 00:29:51 -0500 (Tue, 02 Sep 2008) | 3 lines
  Issue #3678: Correctly pass LDFLAGS and LDLAST to the linker on shared
  library targets in the Makefile.
........
  r66145 | marc-andre.lemburg | 2008-09-02 05:32:34 -0500 (Tue, 02 Sep 2008) | 5 lines
  Add quotes around the file name to avoid issues with spaces.
  Closes #3719.
........
  r66150 | marc-andre.lemburg | 2008-09-02 07:11:19 -0500 (Tue, 02 Sep 2008) | 3 lines
  Add news item for #3719.
........
  r66180 | vinay.sajip | 2008-09-03 04:20:05 -0500 (Wed, 03 Sep 2008) | 1 line
  Issue #3726: Allowed spaces in separators in logging configuration files.
........
  r66211 | vinay.sajip | 2008-09-04 02:31:21 -0500 (Thu, 04 Sep 2008) | 1 line
  Issue #3772: Fixed regression problem in StreamHandler.emit().
........
  r66217 | andrew.kuchling | 2008-09-04 08:26:24 -0500 (Thu, 04 Sep 2008) | 1 line
  #3671: various corrections and markup fixes noted by Kent Johnson
........
  r66219 | hirokazu.yamamoto | 2008-09-04 09:25:30 -0500 (Thu, 04 Sep 2008) | 1 line
  Added NEWS
........
  r66226 | benjamin.peterson | 2008-09-04 18:31:27 -0500 (Thu, 04 Sep 2008) | 1 line
  flesh out the documentation on using 2to3
........
  r66231 | andrew.kuchling | 2008-09-05 10:15:56 -0500 (Fri, 05 Sep 2008) | 1 line
  #3671: Typo fix
........
  r66244 | jesse.noller | 2008-09-05 20:20:11 -0500 (Fri, 05 Sep 2008) | 2 lines
  Fix typo in multiprocessing doc, cancel_join_thread was missing _thread
........
  r66246 | benjamin.peterson | 2008-09-05 22:00:00 -0500 (Fri, 05 Sep 2008) | 1 line
  actually tell the name of the flag to use
........
  r66249 | andrew.kuchling | 2008-09-06 07:50:05 -0500 (Sat, 06 Sep 2008) | 1 line
  Various corrections
........
  r66250 | andrew.kuchling | 2008-09-06 08:04:02 -0500 (Sat, 06 Sep 2008) | 1 line
  #3040: include 'dest' argument in example; trim some trailing whitespace
........
  r66264 | benjamin.peterson | 2008-09-06 14:42:39 -0500 (Sat, 06 Sep 2008) | 1 line
  docs are pretty good about new-style classes these days
........
  r66268 | andrew.kuchling | 2008-09-06 15:28:01 -0500 (Sat, 06 Sep 2008) | 1 line
  #3669 from Robert Lehmann: simplify use of iterator in example
........
  r66272 | andrew.kuchling | 2008-09-06 16:26:02 -0500 (Sat, 06 Sep 2008) | 1 line
  #1317: describe the does_esmtp, ehlo_resp, esmtp_features, and helo_resp attributes
........
  r66294 | georg.brandl | 2008-09-07 12:00:17 -0500 (Sun, 07 Sep 2008) | 2 lines
  Add a new howto about Python and the web, by Marek Kubica.
........
  r66306 | mark.summerfield | 2008-09-08 09:45:37 -0500 (Mon, 08 Sep 2008) | 3 lines
  Added xrefs to each other.
........
											
										 
											2008-09-08 23:05:23 +00:00
										 |  |  |     level=NOTSET | 
					
						
							|  |  |  |     formatter=form1 | 
					
						
							| 
									
										
										
											
												Merged revisions 66337,66347,66350,66352,66358 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r66337 | vinay.sajip | 2008-09-09 08:42:08 -0500 (Tue, 09 Sep 2008) | 1 line
  Issue #3809: Fixed spurious 'test.blah' file left behind by test_logging.
........
  r66347 | georg.brandl | 2008-09-09 14:26:00 -0500 (Tue, 09 Sep 2008) | 2 lines
  Fix varname in docstring. #3822.
........
  r66350 | georg.brandl | 2008-09-09 15:28:31 -0500 (Tue, 09 Sep 2008) | 2 lines
  #3472: update Mac-bundled Python version info.
........
  r66352 | benjamin.peterson | 2008-09-09 15:55:01 -0500 (Tue, 09 Sep 2008) | 4 lines
  Fix #3634 invalid return value from _weakref.ref(Exception).__init__
  Reviewers: Amaury, Antoine, Benjamin
........
  r66358 | benjamin.peterson | 2008-09-09 18:16:48 -0500 (Tue, 09 Sep 2008) | 1 line
  use the latest pygments version
........
											
										 
											2008-09-10 21:57:34 +00:00
										 |  |  |     args=(sys.stderr,) | 
					
						
							| 
									
										
											  
											
												Merged revisions 66141,66145,66150,66180,66211,66217,66219,66226,66231,66244,66246,66249-66250,66264,66268,66272,66294,66306 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r66141 | gregory.p.smith | 2008-09-02 00:29:51 -0500 (Tue, 02 Sep 2008) | 3 lines
  Issue #3678: Correctly pass LDFLAGS and LDLAST to the linker on shared
  library targets in the Makefile.
........
  r66145 | marc-andre.lemburg | 2008-09-02 05:32:34 -0500 (Tue, 02 Sep 2008) | 5 lines
  Add quotes around the file name to avoid issues with spaces.
  Closes #3719.
........
  r66150 | marc-andre.lemburg | 2008-09-02 07:11:19 -0500 (Tue, 02 Sep 2008) | 3 lines
  Add news item for #3719.
........
  r66180 | vinay.sajip | 2008-09-03 04:20:05 -0500 (Wed, 03 Sep 2008) | 1 line
  Issue #3726: Allowed spaces in separators in logging configuration files.
........
  r66211 | vinay.sajip | 2008-09-04 02:31:21 -0500 (Thu, 04 Sep 2008) | 1 line
  Issue #3772: Fixed regression problem in StreamHandler.emit().
........
  r66217 | andrew.kuchling | 2008-09-04 08:26:24 -0500 (Thu, 04 Sep 2008) | 1 line
  #3671: various corrections and markup fixes noted by Kent Johnson
........
  r66219 | hirokazu.yamamoto | 2008-09-04 09:25:30 -0500 (Thu, 04 Sep 2008) | 1 line
  Added NEWS
........
  r66226 | benjamin.peterson | 2008-09-04 18:31:27 -0500 (Thu, 04 Sep 2008) | 1 line
  flesh out the documentation on using 2to3
........
  r66231 | andrew.kuchling | 2008-09-05 10:15:56 -0500 (Fri, 05 Sep 2008) | 1 line
  #3671: Typo fix
........
  r66244 | jesse.noller | 2008-09-05 20:20:11 -0500 (Fri, 05 Sep 2008) | 2 lines
  Fix typo in multiprocessing doc, cancel_join_thread was missing _thread
........
  r66246 | benjamin.peterson | 2008-09-05 22:00:00 -0500 (Fri, 05 Sep 2008) | 1 line
  actually tell the name of the flag to use
........
  r66249 | andrew.kuchling | 2008-09-06 07:50:05 -0500 (Sat, 06 Sep 2008) | 1 line
  Various corrections
........
  r66250 | andrew.kuchling | 2008-09-06 08:04:02 -0500 (Sat, 06 Sep 2008) | 1 line
  #3040: include 'dest' argument in example; trim some trailing whitespace
........
  r66264 | benjamin.peterson | 2008-09-06 14:42:39 -0500 (Sat, 06 Sep 2008) | 1 line
  docs are pretty good about new-style classes these days
........
  r66268 | andrew.kuchling | 2008-09-06 15:28:01 -0500 (Sat, 06 Sep 2008) | 1 line
  #3669 from Robert Lehmann: simplify use of iterator in example
........
  r66272 | andrew.kuchling | 2008-09-06 16:26:02 -0500 (Sat, 06 Sep 2008) | 1 line
  #1317: describe the does_esmtp, ehlo_resp, esmtp_features, and helo_resp attributes
........
  r66294 | georg.brandl | 2008-09-07 12:00:17 -0500 (Sun, 07 Sep 2008) | 2 lines
  Add a new howto about Python and the web, by Marek Kubica.
........
  r66306 | mark.summerfield | 2008-09-08 09:45:37 -0500 (Mon, 08 Sep 2008) | 3 lines
  Added xrefs to each other.
........
											
										 
											2008-09-08 23:05:23 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     [formatter_form1] | 
					
						
							|  |  |  |     format=%(levelname)s ++ %(message)s | 
					
						
							|  |  |  |     datefmt= | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     [formatter_form2] | 
					
						
							|  |  |  |     format=%(message)s | 
					
						
							|  |  |  |     datefmt= | 
					
						
							|  |  |  |     """
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-03-07 17:49:33 +00:00
										 |  |  |     # config7 adds a compiler logger. | 
					
						
							|  |  |  |     config7 = """
 | 
					
						
							|  |  |  |     [loggers] | 
					
						
							|  |  |  |     keys=root,parser,compiler | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     [handlers] | 
					
						
							|  |  |  |     keys=hand1 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     [formatters] | 
					
						
							|  |  |  |     keys=form1 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     [logger_root] | 
					
						
							|  |  |  |     level=WARNING | 
					
						
							|  |  |  |     handlers=hand1 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     [logger_compiler] | 
					
						
							|  |  |  |     level=DEBUG | 
					
						
							|  |  |  |     handlers= | 
					
						
							|  |  |  |     propagate=1 | 
					
						
							|  |  |  |     qualname=compiler | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     [logger_parser] | 
					
						
							|  |  |  |     level=DEBUG | 
					
						
							|  |  |  |     handlers= | 
					
						
							|  |  |  |     propagate=1 | 
					
						
							|  |  |  |     qualname=compiler.parser | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     [handler_hand1] | 
					
						
							|  |  |  |     class=StreamHandler | 
					
						
							|  |  |  |     level=NOTSET | 
					
						
							|  |  |  |     formatter=form1 | 
					
						
							|  |  |  |     args=(sys.stdout,) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     [formatter_form1] | 
					
						
							|  |  |  |     format=%(levelname)s ++ %(message)s | 
					
						
							|  |  |  |     datefmt= | 
					
						
							|  |  |  |     """
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |     def apply_config(self, conf): | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  |         file = io.StringIO(textwrap.dedent(conf)) | 
					
						
							|  |  |  |         logging.config.fileConfig(file) | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_config0_ok(self): | 
					
						
							|  |  |  |         # A simple config file which overrides the default settings. | 
					
						
							|  |  |  |         with captured_stdout() as output: | 
					
						
							|  |  |  |             self.apply_config(self.config0) | 
					
						
							|  |  |  |             logger = logging.getLogger() | 
					
						
							|  |  |  |             # Won't output anything | 
					
						
							|  |  |  |             logger.info(self.next_message()) | 
					
						
							|  |  |  |             # Outputs a message | 
					
						
							|  |  |  |             logger.error(self.next_message()) | 
					
						
							| 
									
										
										
										
											2009-07-01 00:43:10 +00:00
										 |  |  |             self.assert_log_lines([ | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |                 ('ERROR', '2'), | 
					
						
							|  |  |  |             ], stream=output) | 
					
						
							|  |  |  |             # Original logger output is empty. | 
					
						
							| 
									
										
										
										
											2009-07-01 00:43:10 +00:00
										 |  |  |             self.assert_log_lines([]) | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 65012,65035,65037-65040,65048,65057,65077,65091-65095,65097-65099,65127-65128,65131,65133-65136,65139,65149-65151,65155,65158-65159,65176-65178,65183-65184,65187-65190,65192,65194 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r65012 | jesse.noller | 2008-07-16 15:24:06 +0200 (Wed, 16 Jul 2008) | 2 lines
  Apply patch for issue 3090: ARCHFLAGS parsing incorrect
........
  r65035 | georg.brandl | 2008-07-16 23:19:28 +0200 (Wed, 16 Jul 2008) | 2 lines
  #3045: fix pydoc behavior for TEMP path with spaces.
........
  r65037 | georg.brandl | 2008-07-16 23:31:41 +0200 (Wed, 16 Jul 2008) | 2 lines
  #1608818: errno can get set by every call to readdir().
........
  r65038 | georg.brandl | 2008-07-17 00:04:20 +0200 (Thu, 17 Jul 2008) | 2 lines
  #3305: self->stream can be NULL.
........
  r65039 | georg.brandl | 2008-07-17 00:09:17 +0200 (Thu, 17 Jul 2008) | 2 lines
  #3345: fix docstring.
........
  r65040 | georg.brandl | 2008-07-17 00:33:18 +0200 (Thu, 17 Jul 2008) | 2 lines
  #3312: fix two sqlite3 crashes.
........
  r65048 | georg.brandl | 2008-07-17 01:35:54 +0200 (Thu, 17 Jul 2008) | 2 lines
  #3388: add a paragraph about using "with" for file objects.
........
  r65057 | gregory.p.smith | 2008-07-17 05:13:05 +0200 (Thu, 17 Jul 2008) | 2 lines
  news note for r63052
........
  r65077 | jesse.noller | 2008-07-17 23:01:05 +0200 (Thu, 17 Jul 2008) | 3 lines
  Fix issue 3395, update _debugInfo to be _debug_info
........
  r65091 | ronald.oussoren | 2008-07-18 07:48:03 +0200 (Fri, 18 Jul 2008) | 2 lines
  Last bit of a fix for issue3381 (addon for my patch in r65061)
........
  r65092 | vinay.sajip | 2008-07-18 10:59:06 +0200 (Fri, 18 Jul 2008) | 1 line
  Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
  r65093 | vinay.sajip | 2008-07-18 11:00:00 +0200 (Fri, 18 Jul 2008) | 1 line
  Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
  r65094 | vinay.sajip | 2008-07-18 11:00:35 +0200 (Fri, 18 Jul 2008) | 1 line
  Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
  r65095 | vinay.sajip | 2008-07-18 11:01:10 +0200 (Fri, 18 Jul 2008) | 1 line
  Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
  r65097 | georg.brandl | 2008-07-18 12:20:59 +0200 (Fri, 18 Jul 2008) | 2 lines
  Remove duplicate entry in __all__.
........
  r65098 | georg.brandl | 2008-07-18 12:29:30 +0200 (Fri, 18 Jul 2008) | 2 lines
  Correct attribute name.
........
  r65099 | georg.brandl | 2008-07-18 13:15:06 +0200 (Fri, 18 Jul 2008) | 3 lines
  Document the different meaning of precision for {:f} and {:g}.
  Also document how inf and nan are formatted. #3404.
........
  r65127 | raymond.hettinger | 2008-07-19 02:42:03 +0200 (Sat, 19 Jul 2008) | 1 line
  Improve accuracy of gamma test function
........
  r65128 | raymond.hettinger | 2008-07-19 02:43:00 +0200 (Sat, 19 Jul 2008) | 1 line
  Add recipe to the itertools docs.
........
  r65131 | georg.brandl | 2008-07-19 12:08:55 +0200 (Sat, 19 Jul 2008) | 2 lines
  #3378: in case of no memory, don't leak even more memory. :)
........
  r65133 | georg.brandl | 2008-07-19 14:39:10 +0200 (Sat, 19 Jul 2008) | 3 lines
  #3302: fix segfaults when passing None for arguments that can't
  be NULL for the C functions.
........
  r65134 | georg.brandl | 2008-07-19 14:46:12 +0200 (Sat, 19 Jul 2008) | 2 lines
  #3303: fix crash with invalid Py_DECREF in strcoll().
........
  r65135 | georg.brandl | 2008-07-19 15:00:22 +0200 (Sat, 19 Jul 2008) | 3 lines
  #3319: don't raise ZeroDivisionError if number of rounds is so
  low that benchtime is zero.
........
  r65136 | georg.brandl | 2008-07-19 15:09:42 +0200 (Sat, 19 Jul 2008) | 3 lines
  #3323: mention that if inheriting from a class without __slots__,
  the subclass will have a __dict__ available too.
........
  r65139 | georg.brandl | 2008-07-19 15:48:44 +0200 (Sat, 19 Jul 2008) | 2 lines
  Add ordering info for findall and finditer.
........
  r65149 | raymond.hettinger | 2008-07-20 01:21:57 +0200 (Sun, 20 Jul 2008) | 1 line
  Fix compress() recipe in docs to use itertools.
........
  r65150 | raymond.hettinger | 2008-07-20 01:58:47 +0200 (Sun, 20 Jul 2008) | 1 line
  Clean-up itertools docs and recipes.
........
  r65151 | gregory.p.smith | 2008-07-20 02:22:08 +0200 (Sun, 20 Jul 2008) | 9 lines
  fix issue3120 - don't truncate handles on 64-bit Windows.
  This is still messy, realistically PC/_subprocess.c should never cast pointers
  to python numbers and back at all.
  I don't have a 64-bit windows build environment because microsoft apparently
  thinks that should cost money.  Time to watch the buildbots.  It builds and
  passes tests on 32-bit windows.
........
  r65155 | georg.brandl | 2008-07-20 13:50:29 +0200 (Sun, 20 Jul 2008) | 2 lines
  #926501: add info where to put the docstring.
........
  r65158 | neal.norwitz | 2008-07-20 21:35:23 +0200 (Sun, 20 Jul 2008) | 1 line
  Fix a couple of names in error messages that were wrong
........
  r65159 | neal.norwitz | 2008-07-20 22:39:36 +0200 (Sun, 20 Jul 2008) | 1 line
  Fix misspeeld method name (negative)
........
  r65176 | amaury.forgeotdarc | 2008-07-21 23:36:24 +0200 (Mon, 21 Jul 2008) | 4 lines
  Increment version number in NEWS file, and move items that were added after 2.6b2.
  (I thought there was a script to automate this kind of updates)
........
  r65177 | amaury.forgeotdarc | 2008-07-22 00:00:38 +0200 (Tue, 22 Jul 2008) | 5 lines
  Issue2378: pdb would delete free variables when stepping into a class statement.
  The problem was introduced by r53954, the correction is to restore the symmetry between
  PyFrame_FastToLocals and PyFrame_LocalsToFast
........
  r65178 | benjamin.peterson | 2008-07-22 00:05:34 +0200 (Tue, 22 Jul 2008) | 1 line
  don't use assert statement
........
  r65183 | ronald.oussoren | 2008-07-22 09:06:00 +0200 (Tue, 22 Jul 2008) | 2 lines
  Fix buglet in fix for issue3381
........
  r65184 | ronald.oussoren | 2008-07-22 09:06:33 +0200 (Tue, 22 Jul 2008) | 2 lines
  Fix build issue on OSX 10.4, somehow this wasn't committed before.
........
  r65187 | raymond.hettinger | 2008-07-22 20:54:02 +0200 (Tue, 22 Jul 2008) | 1 line
  Remove out-of-date section on Exact/Inexact.
........
  r65188 | raymond.hettinger | 2008-07-22 21:00:47 +0200 (Tue, 22 Jul 2008) | 1 line
  Tuples now have both count() and index().
........
  r65189 | raymond.hettinger | 2008-07-22 21:03:05 +0200 (Tue, 22 Jul 2008) | 1 line
  Fix credits for math.sum()
........
  r65190 | raymond.hettinger | 2008-07-22 21:18:50 +0200 (Tue, 22 Jul 2008) | 1 line
  One more attribution.
........
  r65192 | benjamin.peterson | 2008-07-23 01:44:37 +0200 (Wed, 23 Jul 2008) | 1 line
  remove unneeded import
........
  r65194 | benjamin.peterson | 2008-07-23 15:25:06 +0200 (Wed, 23 Jul 2008) | 1 line
  use isinstance
........
											
										 
											2008-07-23 16:10:53 +00:00
										 |  |  |     def test_config1_ok(self, config=config1): | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |         # A config file defining a sub-parser as well. | 
					
						
							|  |  |  |         with captured_stdout() as output: | 
					
						
							| 
									
										
											  
											
												Merged revisions 65012,65035,65037-65040,65048,65057,65077,65091-65095,65097-65099,65127-65128,65131,65133-65136,65139,65149-65151,65155,65158-65159,65176-65178,65183-65184,65187-65190,65192,65194 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r65012 | jesse.noller | 2008-07-16 15:24:06 +0200 (Wed, 16 Jul 2008) | 2 lines
  Apply patch for issue 3090: ARCHFLAGS parsing incorrect
........
  r65035 | georg.brandl | 2008-07-16 23:19:28 +0200 (Wed, 16 Jul 2008) | 2 lines
  #3045: fix pydoc behavior for TEMP path with spaces.
........
  r65037 | georg.brandl | 2008-07-16 23:31:41 +0200 (Wed, 16 Jul 2008) | 2 lines
  #1608818: errno can get set by every call to readdir().
........
  r65038 | georg.brandl | 2008-07-17 00:04:20 +0200 (Thu, 17 Jul 2008) | 2 lines
  #3305: self->stream can be NULL.
........
  r65039 | georg.brandl | 2008-07-17 00:09:17 +0200 (Thu, 17 Jul 2008) | 2 lines
  #3345: fix docstring.
........
  r65040 | georg.brandl | 2008-07-17 00:33:18 +0200 (Thu, 17 Jul 2008) | 2 lines
  #3312: fix two sqlite3 crashes.
........
  r65048 | georg.brandl | 2008-07-17 01:35:54 +0200 (Thu, 17 Jul 2008) | 2 lines
  #3388: add a paragraph about using "with" for file objects.
........
  r65057 | gregory.p.smith | 2008-07-17 05:13:05 +0200 (Thu, 17 Jul 2008) | 2 lines
  news note for r63052
........
  r65077 | jesse.noller | 2008-07-17 23:01:05 +0200 (Thu, 17 Jul 2008) | 3 lines
  Fix issue 3395, update _debugInfo to be _debug_info
........
  r65091 | ronald.oussoren | 2008-07-18 07:48:03 +0200 (Fri, 18 Jul 2008) | 2 lines
  Last bit of a fix for issue3381 (addon for my patch in r65061)
........
  r65092 | vinay.sajip | 2008-07-18 10:59:06 +0200 (Fri, 18 Jul 2008) | 1 line
  Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
  r65093 | vinay.sajip | 2008-07-18 11:00:00 +0200 (Fri, 18 Jul 2008) | 1 line
  Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
  r65094 | vinay.sajip | 2008-07-18 11:00:35 +0200 (Fri, 18 Jul 2008) | 1 line
  Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
  r65095 | vinay.sajip | 2008-07-18 11:01:10 +0200 (Fri, 18 Jul 2008) | 1 line
  Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
  r65097 | georg.brandl | 2008-07-18 12:20:59 +0200 (Fri, 18 Jul 2008) | 2 lines
  Remove duplicate entry in __all__.
........
  r65098 | georg.brandl | 2008-07-18 12:29:30 +0200 (Fri, 18 Jul 2008) | 2 lines
  Correct attribute name.
........
  r65099 | georg.brandl | 2008-07-18 13:15:06 +0200 (Fri, 18 Jul 2008) | 3 lines
  Document the different meaning of precision for {:f} and {:g}.
  Also document how inf and nan are formatted. #3404.
........
  r65127 | raymond.hettinger | 2008-07-19 02:42:03 +0200 (Sat, 19 Jul 2008) | 1 line
  Improve accuracy of gamma test function
........
  r65128 | raymond.hettinger | 2008-07-19 02:43:00 +0200 (Sat, 19 Jul 2008) | 1 line
  Add recipe to the itertools docs.
........
  r65131 | georg.brandl | 2008-07-19 12:08:55 +0200 (Sat, 19 Jul 2008) | 2 lines
  #3378: in case of no memory, don't leak even more memory. :)
........
  r65133 | georg.brandl | 2008-07-19 14:39:10 +0200 (Sat, 19 Jul 2008) | 3 lines
  #3302: fix segfaults when passing None for arguments that can't
  be NULL for the C functions.
........
  r65134 | georg.brandl | 2008-07-19 14:46:12 +0200 (Sat, 19 Jul 2008) | 2 lines
  #3303: fix crash with invalid Py_DECREF in strcoll().
........
  r65135 | georg.brandl | 2008-07-19 15:00:22 +0200 (Sat, 19 Jul 2008) | 3 lines
  #3319: don't raise ZeroDivisionError if number of rounds is so
  low that benchtime is zero.
........
  r65136 | georg.brandl | 2008-07-19 15:09:42 +0200 (Sat, 19 Jul 2008) | 3 lines
  #3323: mention that if inheriting from a class without __slots__,
  the subclass will have a __dict__ available too.
........
  r65139 | georg.brandl | 2008-07-19 15:48:44 +0200 (Sat, 19 Jul 2008) | 2 lines
  Add ordering info for findall and finditer.
........
  r65149 | raymond.hettinger | 2008-07-20 01:21:57 +0200 (Sun, 20 Jul 2008) | 1 line
  Fix compress() recipe in docs to use itertools.
........
  r65150 | raymond.hettinger | 2008-07-20 01:58:47 +0200 (Sun, 20 Jul 2008) | 1 line
  Clean-up itertools docs and recipes.
........
  r65151 | gregory.p.smith | 2008-07-20 02:22:08 +0200 (Sun, 20 Jul 2008) | 9 lines
  fix issue3120 - don't truncate handles on 64-bit Windows.
  This is still messy, realistically PC/_subprocess.c should never cast pointers
  to python numbers and back at all.
  I don't have a 64-bit windows build environment because microsoft apparently
  thinks that should cost money.  Time to watch the buildbots.  It builds and
  passes tests on 32-bit windows.
........
  r65155 | georg.brandl | 2008-07-20 13:50:29 +0200 (Sun, 20 Jul 2008) | 2 lines
  #926501: add info where to put the docstring.
........
  r65158 | neal.norwitz | 2008-07-20 21:35:23 +0200 (Sun, 20 Jul 2008) | 1 line
  Fix a couple of names in error messages that were wrong
........
  r65159 | neal.norwitz | 2008-07-20 22:39:36 +0200 (Sun, 20 Jul 2008) | 1 line
  Fix misspeeld method name (negative)
........
  r65176 | amaury.forgeotdarc | 2008-07-21 23:36:24 +0200 (Mon, 21 Jul 2008) | 4 lines
  Increment version number in NEWS file, and move items that were added after 2.6b2.
  (I thought there was a script to automate this kind of updates)
........
  r65177 | amaury.forgeotdarc | 2008-07-22 00:00:38 +0200 (Tue, 22 Jul 2008) | 5 lines
  Issue2378: pdb would delete free variables when stepping into a class statement.
  The problem was introduced by r53954, the correction is to restore the symmetry between
  PyFrame_FastToLocals and PyFrame_LocalsToFast
........
  r65178 | benjamin.peterson | 2008-07-22 00:05:34 +0200 (Tue, 22 Jul 2008) | 1 line
  don't use assert statement
........
  r65183 | ronald.oussoren | 2008-07-22 09:06:00 +0200 (Tue, 22 Jul 2008) | 2 lines
  Fix buglet in fix for issue3381
........
  r65184 | ronald.oussoren | 2008-07-22 09:06:33 +0200 (Tue, 22 Jul 2008) | 2 lines
  Fix build issue on OSX 10.4, somehow this wasn't committed before.
........
  r65187 | raymond.hettinger | 2008-07-22 20:54:02 +0200 (Tue, 22 Jul 2008) | 1 line
  Remove out-of-date section on Exact/Inexact.
........
  r65188 | raymond.hettinger | 2008-07-22 21:00:47 +0200 (Tue, 22 Jul 2008) | 1 line
  Tuples now have both count() and index().
........
  r65189 | raymond.hettinger | 2008-07-22 21:03:05 +0200 (Tue, 22 Jul 2008) | 1 line
  Fix credits for math.sum()
........
  r65190 | raymond.hettinger | 2008-07-22 21:18:50 +0200 (Tue, 22 Jul 2008) | 1 line
  One more attribution.
........
  r65192 | benjamin.peterson | 2008-07-23 01:44:37 +0200 (Wed, 23 Jul 2008) | 1 line
  remove unneeded import
........
  r65194 | benjamin.peterson | 2008-07-23 15:25:06 +0200 (Wed, 23 Jul 2008) | 1 line
  use isinstance
........
											
										 
											2008-07-23 16:10:53 +00:00
										 |  |  |             self.apply_config(config) | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |             logger = logging.getLogger("compiler.parser") | 
					
						
							|  |  |  |             # Both will output a message | 
					
						
							|  |  |  |             logger.info(self.next_message()) | 
					
						
							|  |  |  |             logger.error(self.next_message()) | 
					
						
							| 
									
										
										
										
											2009-07-01 00:43:10 +00:00
										 |  |  |             self.assert_log_lines([ | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |                 ('INFO', '1'), | 
					
						
							|  |  |  |                 ('ERROR', '2'), | 
					
						
							|  |  |  |             ], stream=output) | 
					
						
							|  |  |  |             # Original logger output is empty. | 
					
						
							| 
									
										
										
										
											2009-07-01 00:43:10 +00:00
										 |  |  |             self.assert_log_lines([]) | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_config2_failure(self): | 
					
						
							|  |  |  |         # A simple config file which overrides the default settings. | 
					
						
							|  |  |  |         self.assertRaises(Exception, self.apply_config, self.config2) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_config3_failure(self): | 
					
						
							|  |  |  |         # A simple config file which overrides the default settings. | 
					
						
							|  |  |  |         self.assertRaises(Exception, self.apply_config, self.config3) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_config4_ok(self): | 
					
						
							|  |  |  |         # A config file specifying a custom formatter class. | 
					
						
							|  |  |  |         with captured_stdout() as output: | 
					
						
							|  |  |  |             self.apply_config(self.config4) | 
					
						
							|  |  |  |             logger = logging.getLogger() | 
					
						
							|  |  |  |             try: | 
					
						
							|  |  |  |                 raise RuntimeError() | 
					
						
							|  |  |  |             except RuntimeError: | 
					
						
							|  |  |  |                 logging.exception("just testing") | 
					
						
							|  |  |  |             sys.stdout.seek(0) | 
					
						
							| 
									
										
										
										
											2010-11-20 19:04:17 +00:00
										 |  |  |             self.assertEqual(output.getvalue(), | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |                 "ERROR:root:just testing\nGot a [RuntimeError]\n") | 
					
						
							|  |  |  |             # Original logger output is empty | 
					
						
							| 
									
										
										
										
											2009-07-01 00:43:10 +00:00
										 |  |  |             self.assert_log_lines([]) | 
					
						
							| 
									
										
										
										
											2003-04-25 14:22:00 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 65012,65035,65037-65040,65048,65057,65077,65091-65095,65097-65099,65127-65128,65131,65133-65136,65139,65149-65151,65155,65158-65159,65176-65178,65183-65184,65187-65190,65192,65194 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r65012 | jesse.noller | 2008-07-16 15:24:06 +0200 (Wed, 16 Jul 2008) | 2 lines
  Apply patch for issue 3090: ARCHFLAGS parsing incorrect
........
  r65035 | georg.brandl | 2008-07-16 23:19:28 +0200 (Wed, 16 Jul 2008) | 2 lines
  #3045: fix pydoc behavior for TEMP path with spaces.
........
  r65037 | georg.brandl | 2008-07-16 23:31:41 +0200 (Wed, 16 Jul 2008) | 2 lines
  #1608818: errno can get set by every call to readdir().
........
  r65038 | georg.brandl | 2008-07-17 00:04:20 +0200 (Thu, 17 Jul 2008) | 2 lines
  #3305: self->stream can be NULL.
........
  r65039 | georg.brandl | 2008-07-17 00:09:17 +0200 (Thu, 17 Jul 2008) | 2 lines
  #3345: fix docstring.
........
  r65040 | georg.brandl | 2008-07-17 00:33:18 +0200 (Thu, 17 Jul 2008) | 2 lines
  #3312: fix two sqlite3 crashes.
........
  r65048 | georg.brandl | 2008-07-17 01:35:54 +0200 (Thu, 17 Jul 2008) | 2 lines
  #3388: add a paragraph about using "with" for file objects.
........
  r65057 | gregory.p.smith | 2008-07-17 05:13:05 +0200 (Thu, 17 Jul 2008) | 2 lines
  news note for r63052
........
  r65077 | jesse.noller | 2008-07-17 23:01:05 +0200 (Thu, 17 Jul 2008) | 3 lines
  Fix issue 3395, update _debugInfo to be _debug_info
........
  r65091 | ronald.oussoren | 2008-07-18 07:48:03 +0200 (Fri, 18 Jul 2008) | 2 lines
  Last bit of a fix for issue3381 (addon for my patch in r65061)
........
  r65092 | vinay.sajip | 2008-07-18 10:59:06 +0200 (Fri, 18 Jul 2008) | 1 line
  Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
  r65093 | vinay.sajip | 2008-07-18 11:00:00 +0200 (Fri, 18 Jul 2008) | 1 line
  Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
  r65094 | vinay.sajip | 2008-07-18 11:00:35 +0200 (Fri, 18 Jul 2008) | 1 line
  Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
  r65095 | vinay.sajip | 2008-07-18 11:01:10 +0200 (Fri, 18 Jul 2008) | 1 line
  Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
  r65097 | georg.brandl | 2008-07-18 12:20:59 +0200 (Fri, 18 Jul 2008) | 2 lines
  Remove duplicate entry in __all__.
........
  r65098 | georg.brandl | 2008-07-18 12:29:30 +0200 (Fri, 18 Jul 2008) | 2 lines
  Correct attribute name.
........
  r65099 | georg.brandl | 2008-07-18 13:15:06 +0200 (Fri, 18 Jul 2008) | 3 lines
  Document the different meaning of precision for {:f} and {:g}.
  Also document how inf and nan are formatted. #3404.
........
  r65127 | raymond.hettinger | 2008-07-19 02:42:03 +0200 (Sat, 19 Jul 2008) | 1 line
  Improve accuracy of gamma test function
........
  r65128 | raymond.hettinger | 2008-07-19 02:43:00 +0200 (Sat, 19 Jul 2008) | 1 line
  Add recipe to the itertools docs.
........
  r65131 | georg.brandl | 2008-07-19 12:08:55 +0200 (Sat, 19 Jul 2008) | 2 lines
  #3378: in case of no memory, don't leak even more memory. :)
........
  r65133 | georg.brandl | 2008-07-19 14:39:10 +0200 (Sat, 19 Jul 2008) | 3 lines
  #3302: fix segfaults when passing None for arguments that can't
  be NULL for the C functions.
........
  r65134 | georg.brandl | 2008-07-19 14:46:12 +0200 (Sat, 19 Jul 2008) | 2 lines
  #3303: fix crash with invalid Py_DECREF in strcoll().
........
  r65135 | georg.brandl | 2008-07-19 15:00:22 +0200 (Sat, 19 Jul 2008) | 3 lines
  #3319: don't raise ZeroDivisionError if number of rounds is so
  low that benchtime is zero.
........
  r65136 | georg.brandl | 2008-07-19 15:09:42 +0200 (Sat, 19 Jul 2008) | 3 lines
  #3323: mention that if inheriting from a class without __slots__,
  the subclass will have a __dict__ available too.
........
  r65139 | georg.brandl | 2008-07-19 15:48:44 +0200 (Sat, 19 Jul 2008) | 2 lines
  Add ordering info for findall and finditer.
........
  r65149 | raymond.hettinger | 2008-07-20 01:21:57 +0200 (Sun, 20 Jul 2008) | 1 line
  Fix compress() recipe in docs to use itertools.
........
  r65150 | raymond.hettinger | 2008-07-20 01:58:47 +0200 (Sun, 20 Jul 2008) | 1 line
  Clean-up itertools docs and recipes.
........
  r65151 | gregory.p.smith | 2008-07-20 02:22:08 +0200 (Sun, 20 Jul 2008) | 9 lines
  fix issue3120 - don't truncate handles on 64-bit Windows.
  This is still messy, realistically PC/_subprocess.c should never cast pointers
  to python numbers and back at all.
  I don't have a 64-bit windows build environment because microsoft apparently
  thinks that should cost money.  Time to watch the buildbots.  It builds and
  passes tests on 32-bit windows.
........
  r65155 | georg.brandl | 2008-07-20 13:50:29 +0200 (Sun, 20 Jul 2008) | 2 lines
  #926501: add info where to put the docstring.
........
  r65158 | neal.norwitz | 2008-07-20 21:35:23 +0200 (Sun, 20 Jul 2008) | 1 line
  Fix a couple of names in error messages that were wrong
........
  r65159 | neal.norwitz | 2008-07-20 22:39:36 +0200 (Sun, 20 Jul 2008) | 1 line
  Fix misspeeld method name (negative)
........
  r65176 | amaury.forgeotdarc | 2008-07-21 23:36:24 +0200 (Mon, 21 Jul 2008) | 4 lines
  Increment version number in NEWS file, and move items that were added after 2.6b2.
  (I thought there was a script to automate this kind of updates)
........
  r65177 | amaury.forgeotdarc | 2008-07-22 00:00:38 +0200 (Tue, 22 Jul 2008) | 5 lines
  Issue2378: pdb would delete free variables when stepping into a class statement.
  The problem was introduced by r53954, the correction is to restore the symmetry between
  PyFrame_FastToLocals and PyFrame_LocalsToFast
........
  r65178 | benjamin.peterson | 2008-07-22 00:05:34 +0200 (Tue, 22 Jul 2008) | 1 line
  don't use assert statement
........
  r65183 | ronald.oussoren | 2008-07-22 09:06:00 +0200 (Tue, 22 Jul 2008) | 2 lines
  Fix buglet in fix for issue3381
........
  r65184 | ronald.oussoren | 2008-07-22 09:06:33 +0200 (Tue, 22 Jul 2008) | 2 lines
  Fix build issue on OSX 10.4, somehow this wasn't committed before.
........
  r65187 | raymond.hettinger | 2008-07-22 20:54:02 +0200 (Tue, 22 Jul 2008) | 1 line
  Remove out-of-date section on Exact/Inexact.
........
  r65188 | raymond.hettinger | 2008-07-22 21:00:47 +0200 (Tue, 22 Jul 2008) | 1 line
  Tuples now have both count() and index().
........
  r65189 | raymond.hettinger | 2008-07-22 21:03:05 +0200 (Tue, 22 Jul 2008) | 1 line
  Fix credits for math.sum()
........
  r65190 | raymond.hettinger | 2008-07-22 21:18:50 +0200 (Tue, 22 Jul 2008) | 1 line
  One more attribution.
........
  r65192 | benjamin.peterson | 2008-07-23 01:44:37 +0200 (Wed, 23 Jul 2008) | 1 line
  remove unneeded import
........
  r65194 | benjamin.peterson | 2008-07-23 15:25:06 +0200 (Wed, 23 Jul 2008) | 1 line
  use isinstance
........
											
										 
											2008-07-23 16:10:53 +00:00
										 |  |  |     def test_config5_ok(self): | 
					
						
							|  |  |  |         self.test_config1_ok(config=self.config5) | 
					
						
							| 
									
										
										
										
											2003-01-02 14:56:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 66141,66145,66150,66180,66211,66217,66219,66226,66231,66244,66246,66249-66250,66264,66268,66272,66294,66306 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r66141 | gregory.p.smith | 2008-09-02 00:29:51 -0500 (Tue, 02 Sep 2008) | 3 lines
  Issue #3678: Correctly pass LDFLAGS and LDLAST to the linker on shared
  library targets in the Makefile.
........
  r66145 | marc-andre.lemburg | 2008-09-02 05:32:34 -0500 (Tue, 02 Sep 2008) | 5 lines
  Add quotes around the file name to avoid issues with spaces.
  Closes #3719.
........
  r66150 | marc-andre.lemburg | 2008-09-02 07:11:19 -0500 (Tue, 02 Sep 2008) | 3 lines
  Add news item for #3719.
........
  r66180 | vinay.sajip | 2008-09-03 04:20:05 -0500 (Wed, 03 Sep 2008) | 1 line
  Issue #3726: Allowed spaces in separators in logging configuration files.
........
  r66211 | vinay.sajip | 2008-09-04 02:31:21 -0500 (Thu, 04 Sep 2008) | 1 line
  Issue #3772: Fixed regression problem in StreamHandler.emit().
........
  r66217 | andrew.kuchling | 2008-09-04 08:26:24 -0500 (Thu, 04 Sep 2008) | 1 line
  #3671: various corrections and markup fixes noted by Kent Johnson
........
  r66219 | hirokazu.yamamoto | 2008-09-04 09:25:30 -0500 (Thu, 04 Sep 2008) | 1 line
  Added NEWS
........
  r66226 | benjamin.peterson | 2008-09-04 18:31:27 -0500 (Thu, 04 Sep 2008) | 1 line
  flesh out the documentation on using 2to3
........
  r66231 | andrew.kuchling | 2008-09-05 10:15:56 -0500 (Fri, 05 Sep 2008) | 1 line
  #3671: Typo fix
........
  r66244 | jesse.noller | 2008-09-05 20:20:11 -0500 (Fri, 05 Sep 2008) | 2 lines
  Fix typo in multiprocessing doc, cancel_join_thread was missing _thread
........
  r66246 | benjamin.peterson | 2008-09-05 22:00:00 -0500 (Fri, 05 Sep 2008) | 1 line
  actually tell the name of the flag to use
........
  r66249 | andrew.kuchling | 2008-09-06 07:50:05 -0500 (Sat, 06 Sep 2008) | 1 line
  Various corrections
........
  r66250 | andrew.kuchling | 2008-09-06 08:04:02 -0500 (Sat, 06 Sep 2008) | 1 line
  #3040: include 'dest' argument in example; trim some trailing whitespace
........
  r66264 | benjamin.peterson | 2008-09-06 14:42:39 -0500 (Sat, 06 Sep 2008) | 1 line
  docs are pretty good about new-style classes these days
........
  r66268 | andrew.kuchling | 2008-09-06 15:28:01 -0500 (Sat, 06 Sep 2008) | 1 line
  #3669 from Robert Lehmann: simplify use of iterator in example
........
  r66272 | andrew.kuchling | 2008-09-06 16:26:02 -0500 (Sat, 06 Sep 2008) | 1 line
  #1317: describe the does_esmtp, ehlo_resp, esmtp_features, and helo_resp attributes
........
  r66294 | georg.brandl | 2008-09-07 12:00:17 -0500 (Sun, 07 Sep 2008) | 2 lines
  Add a new howto about Python and the web, by Marek Kubica.
........
  r66306 | mark.summerfield | 2008-09-08 09:45:37 -0500 (Mon, 08 Sep 2008) | 3 lines
  Added xrefs to each other.
........
											
										 
											2008-09-08 23:05:23 +00:00
										 |  |  |     def test_config6_ok(self): | 
					
						
							|  |  |  |         self.test_config1_ok(config=self.config6) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-03-07 17:49:33 +00:00
										 |  |  |     def test_config7_ok(self): | 
					
						
							|  |  |  |         with captured_stdout() as output: | 
					
						
							|  |  |  |             self.apply_config(self.config1a) | 
					
						
							|  |  |  |             logger = logging.getLogger("compiler.parser") | 
					
						
							|  |  |  |             # See issue #11424. compiler-hyphenated sorts | 
					
						
							|  |  |  |             # between compiler and compiler.xyz and this | 
					
						
							|  |  |  |             # was preventing compiler.xyz from being included | 
					
						
							|  |  |  |             # in the child loggers of compiler because of an | 
					
						
							|  |  |  |             # overzealous loop termination condition. | 
					
						
							|  |  |  |             hyphenated = logging.getLogger('compiler-hyphenated') | 
					
						
							|  |  |  |             # All will output a message | 
					
						
							|  |  |  |             logger.info(self.next_message()) | 
					
						
							|  |  |  |             logger.error(self.next_message()) | 
					
						
							|  |  |  |             hyphenated.critical(self.next_message()) | 
					
						
							|  |  |  |             self.assert_log_lines([ | 
					
						
							|  |  |  |                 ('INFO', '1'), | 
					
						
							|  |  |  |                 ('ERROR', '2'), | 
					
						
							|  |  |  |                 ('CRITICAL', '3'), | 
					
						
							|  |  |  |             ], stream=output) | 
					
						
							|  |  |  |             # Original logger output is empty. | 
					
						
							|  |  |  |             self.assert_log_lines([]) | 
					
						
							|  |  |  |         with captured_stdout() as output: | 
					
						
							|  |  |  |             self.apply_config(self.config7) | 
					
						
							|  |  |  |             logger = logging.getLogger("compiler.parser") | 
					
						
							|  |  |  |             self.assertFalse(logger.disabled) | 
					
						
							|  |  |  |             # Both will output a message | 
					
						
							|  |  |  |             logger.info(self.next_message()) | 
					
						
							|  |  |  |             logger.error(self.next_message()) | 
					
						
							|  |  |  |             logger = logging.getLogger("compiler.lexer") | 
					
						
							|  |  |  |             # Both will output a message | 
					
						
							|  |  |  |             logger.info(self.next_message()) | 
					
						
							|  |  |  |             logger.error(self.next_message()) | 
					
						
							|  |  |  |             # Will not appear | 
					
						
							|  |  |  |             hyphenated.critical(self.next_message()) | 
					
						
							|  |  |  |             self.assert_log_lines([ | 
					
						
							|  |  |  |                 ('INFO', '4'), | 
					
						
							|  |  |  |                 ('ERROR', '5'), | 
					
						
							|  |  |  |                 ('INFO', '6'), | 
					
						
							|  |  |  |                 ('ERROR', '7'), | 
					
						
							|  |  |  |             ], stream=output) | 
					
						
							|  |  |  |             # Original logger output is empty. | 
					
						
							|  |  |  |             self.assert_log_lines([]) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2006-01-16 21:24:38 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 80552-80556,80564-80566,80568-80571 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r80552 | victor.stinner | 2010-04-27 23:46:03 +0200 (mar., 27 avril 2010) | 3 lines
  Issue #7449, part 1: fix test_support.py for Python compiled without thread
........
  r80553 | victor.stinner | 2010-04-27 23:47:01 +0200 (mar., 27 avril 2010) | 1 line
  Issue #7449, part 2: regrtest.py -j option requires thread support
........
  r80554 | victor.stinner | 2010-04-27 23:51:26 +0200 (mar., 27 avril 2010) | 9 lines
  Issue #7449 part 3, test_doctest: import trace module in test_coverage()
  Import trace module fail if the threading module is missing. test_coverage() is
  only used if test_doctest.py is used with the -c option. This commit allows to
  execute the test suite without thread support.
  Move "import trace" in test_coverage() and use
  test_support.import_module('trace').
........
  r80555 | victor.stinner | 2010-04-27 23:56:26 +0200 (mar., 27 avril 2010) | 6 lines
  Issue #7449, part 4: skip test_multiprocessing if thread support is disabled
  import threading after _multiprocessing to raise a more revelant error message:
  "No module named _multiprocessing". _multiprocessing is not compiled without
  thread support.
........
  r80556 | victor.stinner | 2010-04-28 00:01:24 +0200 (mer., 28 avril 2010) | 8 lines
  Issue #7449, part 5: split Test.test_open() of ctypes/test/test_errno.py
   * Split Test.test_open() in 2 functions: test_open() and test_thread_open()
   * Skip test_open() and test_thread_open() if we are unable to find the C
     library
   * Skip test_thread_open() if thread support is disabled
   * Use unittest.skipUnless(os.name == "nt", ...) on test_GetLastError()
........
  r80564 | victor.stinner | 2010-04-28 00:59:35 +0200 (mer., 28 avril 2010) | 4 lines
  Issue #7449, part 6: fix test_hashlib for missing threading module
  Move @test_support.reap_thread decorator from test_main() to test_threaded_hashing().
........
  r80565 | victor.stinner | 2010-04-28 01:01:29 +0200 (mer., 28 avril 2010) | 6 lines
  Issue #7449, part 7: simplify threading detection in test_capi
   * Skip TestPendingCalls if threading module is missing
   * Test if threading module is present or not, instead of test the presence of
     _testcapi._test_thread_state
........
  r80566 | victor.stinner | 2010-04-28 01:03:16 +0200 (mer., 28 avril 2010) | 4 lines
  Issue #7449, part 8: don't skip the whole test_asynchat if threading is missing
  TestFifo can be executed without the threading module
........
  r80568 | victor.stinner | 2010-04-28 01:14:58 +0200 (mer., 28 avril 2010) | 6 lines
  Issue #7449, part 9: fix test_xmlrpclib for missing threading module
   * Skip testcases using threads if threading module is missing
   * Use "http://" instead of URL in ServerProxyTestCase if threading is missing
     because URL is not set in this case
........
  r80569 | victor.stinner | 2010-04-28 01:33:58 +0200 (mer., 28 avril 2010) | 6 lines
  Partial revert of r80556 (Issue #7449, part 5, fix ctypes test)
  Rewrite r80556: the thread test have to be executed just after the test on
  libc_open() and so the test cannot be splitted in two functions (without
  duplicating code, and I don't want to duplicate code).
........
  r80570 | victor.stinner | 2010-04-28 01:51:16 +0200 (mer., 28 avril 2010) | 8 lines
  Issue #7449, part 10: test_cmd imports trace module using test_support.import_module()
  Use test_support.import_module() instead of import to raise a SkipTest
  exception if the import fail. Import trace fails if the threading module is
  missing.
  See also part 3: test_doctest: import trace module in test_coverage().
........
  r80571 | victor.stinner | 2010-04-28 01:55:59 +0200 (mer., 28 avril 2010) | 6 lines
  Issue #7449, last part (11): fix many tests if thread support is disabled
   * Use try/except ImportError or test_support.import_module() to import thread
     and threading modules
   * Add @unittest.skipUnless(threading, ...) to testcases using threads
........
											
										 
											2010-04-28 22:31:17 +00:00
										 |  |  | @unittest.skipUnless(threading, 'Threading required for this test.') | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  | class SocketHandlerTest(BaseTest): | 
					
						
							| 
									
										
										
										
											2006-01-16 21:24:38 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |     """Test for SocketHandler objects.""" | 
					
						
							| 
									
										
										
										
											2006-01-16 21:24:38 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |     def setUp(self): | 
					
						
							|  |  |  |         """Set up a TCP server to receive log messages, and a SocketHandler
 | 
					
						
							|  |  |  |         pointing to that server's address and port.""" | 
					
						
							|  |  |  |         BaseTest.setUp(self) | 
					
						
							| 
									
										
										
										
											2011-05-02 13:17:27 +01:00
										 |  |  |         addr = ('localhost', 0) | 
					
						
							|  |  |  |         self.server = server = TestTCPServer(addr, self.handle_socket, | 
					
						
							|  |  |  |                                                 0.01) | 
					
						
							|  |  |  |         server.start() | 
					
						
							|  |  |  |         server.ready.wait() | 
					
						
							|  |  |  |         self.sock_hdlr = logging.handlers.SocketHandler('localhost', | 
					
						
							|  |  |  |                                                         server.port) | 
					
						
							|  |  |  |         self.log_output = '' | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |         self.root_logger.removeHandler(self.root_logger.handlers[0]) | 
					
						
							|  |  |  |         self.root_logger.addHandler(self.sock_hdlr) | 
					
						
							| 
									
										
										
										
											2011-05-02 13:17:27 +01:00
										 |  |  |         self.handled = threading.Semaphore(0) | 
					
						
							| 
									
										
										
										
											2006-01-16 21:24:38 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |     def tearDown(self): | 
					
						
							|  |  |  |         """Shutdown the TCP server.""" | 
					
						
							|  |  |  |         try: | 
					
						
							| 
									
										
										
										
											2011-05-02 13:17:27 +01:00
										 |  |  |             self.server.stop(2.0) | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |             self.root_logger.removeHandler(self.sock_hdlr) | 
					
						
							|  |  |  |             self.sock_hdlr.close() | 
					
						
							|  |  |  |         finally: | 
					
						
							|  |  |  |             BaseTest.tearDown(self) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-05-02 13:17:27 +01:00
										 |  |  |     def handle_socket(self, request): | 
					
						
							|  |  |  |         conn = request.connection | 
					
						
							|  |  |  |         while True: | 
					
						
							|  |  |  |             chunk = conn.recv(4) | 
					
						
							|  |  |  |             if len(chunk) < 4: | 
					
						
							|  |  |  |                 break | 
					
						
							|  |  |  |             slen = struct.unpack(">L", chunk)[0] | 
					
						
							|  |  |  |             chunk = conn.recv(slen) | 
					
						
							|  |  |  |             while len(chunk) < slen: | 
					
						
							|  |  |  |                 chunk = chunk + conn.recv(slen - len(chunk)) | 
					
						
							|  |  |  |             obj = pickle.loads(chunk) | 
					
						
							|  |  |  |             record = logging.makeLogRecord(obj) | 
					
						
							|  |  |  |             self.log_output += record.msg + '\n' | 
					
						
							|  |  |  |             self.handled.release() | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_output(self): | 
					
						
							|  |  |  |         # The log message sent to the SocketHandler is properly received. | 
					
						
							|  |  |  |         logger = logging.getLogger("tcp") | 
					
						
							|  |  |  |         logger.error("spam") | 
					
						
							| 
									
										
										
										
											2011-05-02 13:17:27 +01:00
										 |  |  |         self.handled.acquire() | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |         logger.debug("eggs") | 
					
						
							| 
									
										
										
										
											2011-05-02 13:17:27 +01:00
										 |  |  |         self.handled.acquire() | 
					
						
							|  |  |  |         self.assertEqual(self.log_output, "spam\neggs\n") | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-04-28 12:04:58 +01:00
										 |  |  |     def test_noserver(self): | 
					
						
							|  |  |  |         # Kill the server | 
					
						
							| 
									
										
										
										
											2011-05-02 13:17:27 +01:00
										 |  |  |         self.server.stop(2.0) | 
					
						
							| 
									
										
										
										
											2011-04-28 12:04:58 +01:00
										 |  |  |         #The logging call should try to connect, which should fail | 
					
						
							|  |  |  |         try: | 
					
						
							|  |  |  |             raise RuntimeError('Deliberate mistake') | 
					
						
							|  |  |  |         except RuntimeError: | 
					
						
							|  |  |  |             self.root_logger.exception('Never sent') | 
					
						
							|  |  |  |         self.root_logger.error('Never sent, either') | 
					
						
							|  |  |  |         now = time.time() | 
					
						
							|  |  |  |         self.assertTrue(self.sock_hdlr.retryTime > now) | 
					
						
							|  |  |  |         time.sleep(self.sock_hdlr.retryTime - now + 0.001) | 
					
						
							|  |  |  |         self.root_logger.error('Nor this') | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-05-02 13:17:27 +01:00
										 |  |  | 
 | 
					
						
							|  |  |  | @unittest.skipUnless(threading, 'Threading required for this test.') | 
					
						
							|  |  |  | class DatagramHandlerTest(BaseTest): | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     """Test for DatagramHandler.""" | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def setUp(self): | 
					
						
							|  |  |  |         """Set up a UDP server to receive log messages, and a DatagramHandler
 | 
					
						
							|  |  |  |         pointing to that server's address and port.""" | 
					
						
							|  |  |  |         BaseTest.setUp(self) | 
					
						
							|  |  |  |         addr = ('localhost', 0) | 
					
						
							| 
									
										
										
										
											2011-06-09 16:55:23 +01:00
										 |  |  |         self.server = server = TestUDPServer(addr, self.handle_datagram, 0.01) | 
					
						
							| 
									
										
										
										
											2011-05-02 13:17:27 +01:00
										 |  |  |         server.start() | 
					
						
							|  |  |  |         server.ready.wait() | 
					
						
							|  |  |  |         self.sock_hdlr = logging.handlers.DatagramHandler('localhost', | 
					
						
							|  |  |  |                                                           server.port) | 
					
						
							|  |  |  |         self.log_output = '' | 
					
						
							|  |  |  |         self.root_logger.removeHandler(self.root_logger.handlers[0]) | 
					
						
							|  |  |  |         self.root_logger.addHandler(self.sock_hdlr) | 
					
						
							|  |  |  |         self.handled = threading.Event() | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def tearDown(self): | 
					
						
							|  |  |  |         """Shutdown the UDP server.""" | 
					
						
							|  |  |  |         try: | 
					
						
							|  |  |  |             self.server.stop(2.0) | 
					
						
							|  |  |  |             self.root_logger.removeHandler(self.sock_hdlr) | 
					
						
							|  |  |  |             self.sock_hdlr.close() | 
					
						
							|  |  |  |         finally: | 
					
						
							|  |  |  |             BaseTest.tearDown(self) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def handle_datagram(self, request): | 
					
						
							|  |  |  |         slen = struct.pack('>L', 0) # length of prefix | 
					
						
							|  |  |  |         packet = request.packet[len(slen):] | 
					
						
							|  |  |  |         obj = pickle.loads(packet) | 
					
						
							|  |  |  |         record = logging.makeLogRecord(obj) | 
					
						
							|  |  |  |         self.log_output += record.msg + '\n' | 
					
						
							|  |  |  |         self.handled.set() | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_output(self): | 
					
						
							|  |  |  |         # The log message sent to the DatagramHandler is properly received. | 
					
						
							|  |  |  |         logger = logging.getLogger("udp") | 
					
						
							|  |  |  |         logger.error("spam") | 
					
						
							|  |  |  |         self.handled.wait() | 
					
						
							| 
									
										
										
										
											2011-05-02 14:43:00 +01:00
										 |  |  |         self.handled.clear() | 
					
						
							|  |  |  |         logger.error("eggs") | 
					
						
							|  |  |  |         self.handled.wait() | 
					
						
							|  |  |  |         self.assertEqual(self.log_output, "spam\neggs\n") | 
					
						
							| 
									
										
										
										
											2011-05-02 13:17:27 +01:00
										 |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | @unittest.skipUnless(threading, 'Threading required for this test.') | 
					
						
							|  |  |  | class SysLogHandlerTest(BaseTest): | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     """Test for SysLogHandler using UDP.""" | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def setUp(self): | 
					
						
							|  |  |  |         """Set up a UDP server to receive log messages, and a SysLogHandler
 | 
					
						
							|  |  |  |         pointing to that server's address and port.""" | 
					
						
							|  |  |  |         BaseTest.setUp(self) | 
					
						
							|  |  |  |         addr = ('localhost', 0) | 
					
						
							|  |  |  |         self.server = server = TestUDPServer(addr, self.handle_datagram, | 
					
						
							|  |  |  |                                                 0.01) | 
					
						
							|  |  |  |         server.start() | 
					
						
							|  |  |  |         server.ready.wait() | 
					
						
							|  |  |  |         self.sl_hdlr = logging.handlers.SysLogHandler(('localhost', | 
					
						
							|  |  |  |                                                        server.port)) | 
					
						
							|  |  |  |         self.log_output = '' | 
					
						
							|  |  |  |         self.root_logger.removeHandler(self.root_logger.handlers[0]) | 
					
						
							|  |  |  |         self.root_logger.addHandler(self.sl_hdlr) | 
					
						
							|  |  |  |         self.handled = threading.Event() | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def tearDown(self): | 
					
						
							|  |  |  |         """Shutdown the UDP server.""" | 
					
						
							|  |  |  |         try: | 
					
						
							|  |  |  |             self.server.stop(2.0) | 
					
						
							|  |  |  |             self.root_logger.removeHandler(self.sl_hdlr) | 
					
						
							|  |  |  |             self.sl_hdlr.close() | 
					
						
							|  |  |  |         finally: | 
					
						
							|  |  |  |             BaseTest.tearDown(self) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def handle_datagram(self, request): | 
					
						
							|  |  |  |         self.log_output = request.packet | 
					
						
							|  |  |  |         self.handled.set() | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_output(self): | 
					
						
							|  |  |  |         # The log message sent to the SysLogHandler is properly received. | 
					
						
							|  |  |  |         logger = logging.getLogger("slh") | 
					
						
							|  |  |  |         logger.error("sp\xe4m") | 
					
						
							|  |  |  |         self.handled.wait() | 
					
						
							|  |  |  |         self.assertEqual(self.log_output, b'<11>\xef\xbb\xbfsp\xc3\xa4m\x00') | 
					
						
							| 
									
										
										
										
											2011-06-09 16:55:23 +01:00
										 |  |  |         self.handled.clear() | 
					
						
							|  |  |  |         self.sl_hdlr.append_nul = False | 
					
						
							|  |  |  |         logger.error("sp\xe4m") | 
					
						
							|  |  |  |         self.handled.wait() | 
					
						
							|  |  |  |         self.assertEqual(self.log_output, b'<11>\xef\xbb\xbfsp\xc3\xa4m') | 
					
						
							| 
									
										
										
										
											2011-06-27 15:40:06 +01:00
										 |  |  |         self.handled.clear() | 
					
						
							|  |  |  |         self.sl_hdlr.ident = "h\xe4m-" | 
					
						
							|  |  |  |         logger.error("sp\xe4m") | 
					
						
							|  |  |  |         self.handled.wait() | 
					
						
							|  |  |  |         self.assertEqual(self.log_output, b'<11>\xef\xbb\xbfh\xc3\xa4m-sp\xc3\xa4m') | 
					
						
							| 
									
										
										
										
											2011-05-02 13:17:27 +01:00
										 |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | @unittest.skipUnless(threading, 'Threading required for this test.') | 
					
						
							|  |  |  | class HTTPHandlerTest(BaseTest): | 
					
						
							|  |  |  |     """Test for HTTPHandler.""" | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-05-21 11:32:15 +01:00
										 |  |  |     PEMFILE = """-----BEGIN RSA PRIVATE KEY-----
 | 
					
						
							|  |  |  | MIICXQIBAAKBgQDGT4xS5r91rbLJQK2nUDenBhBG6qFk+bVOjuAGC/LSHlAoBnvG | 
					
						
							|  |  |  | zQG3agOG+e7c5z2XT8m2ktORLqG3E4mYmbxgyhDrzP6ei2Anc+pszmnxPoK3Puh5 | 
					
						
							|  |  |  | aXV+XKt0bU0C1m2+ACmGGJ0t3P408art82nOxBw8ZHgIg9Dtp6xIUCyOqwIDAQAB | 
					
						
							|  |  |  | AoGBAJFTnFboaKh5eUrIzjmNrKsG44jEyy+vWvHN/FgSC4l103HxhmWiuL5Lv3f7 | 
					
						
							|  |  |  | 0tMp1tX7D6xvHwIG9VWvyKb/Cq9rJsDibmDVIOslnOWeQhG+XwJyitR0pq/KlJIB | 
					
						
							|  |  |  | 5LjORcBw795oKWOAi6RcOb1ON59tysEFYhAGQO9k6VL621gRAkEA/Gb+YXULLpbs | 
					
						
							|  |  |  | piXN3q4zcHzeaVANo69tUZ6TjaQqMeTxE4tOYM0G0ZoSeHEdaP59AOZGKXXNGSQy | 
					
						
							|  |  |  | 2z/MddcYGQJBAMkjLSYIpOLJY11ja8OwwswFG2hEzHe0cS9bzo++R/jc1bHA5R0Y | 
					
						
							|  |  |  | i6vA5iPi+wopPFvpytdBol7UuEBe5xZrxWMCQQCWxELRHiP2yWpEeLJ3gGDzoXMN | 
					
						
							|  |  |  | PydWjhRju7Bx3AzkTtf+D6lawz1+eGTuEss5i0JKBkMEwvwnN2s1ce+EuF4JAkBb | 
					
						
							|  |  |  | E96h1lAzkVW5OAfYOPY8RCPA90ZO/hoyg7PpSxR0ECuDrgERR8gXIeYUYfejBkEa | 
					
						
							|  |  |  | rab4CfRoVJKKM28Yq/xZAkBvuq670JRCwOgfUTdww7WpdOQBYPkzQccsKNCslQW8 | 
					
						
							|  |  |  | /DyW6y06oQusSENUvynT6dr3LJxt/NgZPhZX2+k1eYDV | 
					
						
							|  |  |  | -----END RSA PRIVATE KEY----- | 
					
						
							|  |  |  | -----BEGIN CERTIFICATE----- | 
					
						
							|  |  |  | MIICGzCCAYSgAwIBAgIJAIq84a2Q/OvlMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV | 
					
						
							|  |  |  | BAMTCWxvY2FsaG9zdDAeFw0xMTA1MjExMDIzMzNaFw03NTAzMjEwMzU1MTdaMBQx | 
					
						
							|  |  |  | EjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA | 
					
						
							|  |  |  | xk+MUua/da2yyUCtp1A3pwYQRuqhZPm1To7gBgvy0h5QKAZ7xs0Bt2oDhvnu3Oc9 | 
					
						
							|  |  |  | l0/JtpLTkS6htxOJmJm8YMoQ68z+notgJ3PqbM5p8T6Ctz7oeWl1flyrdG1NAtZt | 
					
						
							|  |  |  | vgAphhidLdz+NPGq7fNpzsQcPGR4CIPQ7aesSFAsjqsCAwEAAaN1MHMwHQYDVR0O | 
					
						
							|  |  |  | BBYEFLWaUPO6N7efGiuoS9i3DVYcUwn0MEQGA1UdIwQ9MDuAFLWaUPO6N7efGiuo | 
					
						
							|  |  |  | S9i3DVYcUwn0oRikFjAUMRIwEAYDVQQDEwlsb2NhbGhvc3SCCQCKvOGtkPzr5TAM | 
					
						
							|  |  |  | BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAMK5whPjLNQK1Ivvk88oqJqq | 
					
						
							|  |  |  | 4f889OwikGP0eUhOBhbFlsZs+jq5YZC2UzHz+evzKBlgAP1u4lP/cB85CnjvWqM+ | 
					
						
							|  |  |  | 1c/lywFHQ6HOdDeQ1L72tSYMrNOG4XNmLn0h7rx6GoTU7dcFRfseahBCq8mv0IDt | 
					
						
							|  |  |  | IRbTpvlHWPjsSvHz0ZOH | 
					
						
							|  |  |  | -----END CERTIFICATE-----"""
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-05-02 13:17:27 +01:00
										 |  |  |     def setUp(self): | 
					
						
							|  |  |  |         """Set up an HTTP server to receive log messages, and a HTTPHandler
 | 
					
						
							|  |  |  |         pointing to that server's address and port.""" | 
					
						
							|  |  |  |         BaseTest.setUp(self) | 
					
						
							|  |  |  |         self.handled = threading.Event() | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def handle_request(self, request): | 
					
						
							| 
									
										
										
										
											2011-05-05 12:59:14 +01:00
										 |  |  |         self.command = request.command | 
					
						
							| 
									
										
										
										
											2011-05-02 13:17:27 +01:00
										 |  |  |         self.log_data = urlparse(request.path) | 
					
						
							| 
									
										
										
										
											2011-05-05 12:59:14 +01:00
										 |  |  |         if self.command == 'POST': | 
					
						
							|  |  |  |             try: | 
					
						
							|  |  |  |                 rlen = int(request.headers['Content-Length']) | 
					
						
							|  |  |  |                 self.post_data = request.rfile.read(rlen) | 
					
						
							|  |  |  |             except: | 
					
						
							|  |  |  |                 self.post_data = None | 
					
						
							| 
									
										
										
										
											2011-05-02 13:17:27 +01:00
										 |  |  |         request.send_response(200) | 
					
						
							| 
									
										
										
										
											2011-05-10 09:10:08 +01:00
										 |  |  |         request.end_headers() | 
					
						
							| 
									
										
										
										
											2011-05-02 13:17:27 +01:00
										 |  |  |         self.handled.set() | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_output(self): | 
					
						
							| 
									
										
										
										
											2011-05-09 22:05:50 +01:00
										 |  |  |         # The log message sent to the HTTPHandler is properly received. | 
					
						
							| 
									
										
										
										
											2011-05-02 13:17:27 +01:00
										 |  |  |         logger = logging.getLogger("http") | 
					
						
							| 
									
										
										
										
											2011-05-21 11:32:15 +01:00
										 |  |  |         root_logger = self.root_logger | 
					
						
							|  |  |  |         root_logger.removeHandler(self.root_logger.handlers[0]) | 
					
						
							|  |  |  |         for secure in (False, True): | 
					
						
							|  |  |  |             addr = ('localhost', 0) | 
					
						
							|  |  |  |             if secure: | 
					
						
							| 
									
										
										
										
											2011-05-21 16:46:41 +01:00
										 |  |  |                 try: | 
					
						
							|  |  |  |                     import ssl | 
					
						
							|  |  |  |                     fd, fn = tempfile.mkstemp() | 
					
						
							|  |  |  |                     os.close(fd) | 
					
						
							|  |  |  |                     with open(fn, 'w') as f: | 
					
						
							|  |  |  |                         f.write(self.PEMFILE) | 
					
						
							|  |  |  |                     sslctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) | 
					
						
							|  |  |  |                     sslctx.load_cert_chain(fn) | 
					
						
							|  |  |  |                     os.unlink(fn) | 
					
						
							|  |  |  |                 except ImportError: | 
					
						
							|  |  |  |                     sslctx = None | 
					
						
							| 
									
										
										
										
											2011-05-05 12:59:14 +01:00
										 |  |  |             else: | 
					
						
							| 
									
										
										
										
											2011-05-21 11:32:15 +01:00
										 |  |  |                 sslctx = None | 
					
						
							|  |  |  |             self.server = server = TestHTTPServer(addr, self.handle_request, | 
					
						
							|  |  |  |                                                     0.01, sslctx=sslctx) | 
					
						
							|  |  |  |             server.start() | 
					
						
							|  |  |  |             server.ready.wait() | 
					
						
							|  |  |  |             host = 'localhost:%d' % server.server_port | 
					
						
							| 
									
										
										
										
											2011-05-21 16:46:41 +01:00
										 |  |  |             secure_client = secure and sslctx | 
					
						
							|  |  |  |             self.h_hdlr = logging.handlers.HTTPHandler(host, '/frob', | 
					
						
							|  |  |  |                                                        secure=secure_client) | 
					
						
							| 
									
										
										
										
											2011-05-21 11:32:15 +01:00
										 |  |  |             self.log_data = None | 
					
						
							|  |  |  |             root_logger.addHandler(self.h_hdlr) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |             for method in ('GET', 'POST'): | 
					
						
							|  |  |  |                 self.h_hdlr.method = method | 
					
						
							|  |  |  |                 self.handled.clear() | 
					
						
							|  |  |  |                 msg = "sp\xe4m" | 
					
						
							|  |  |  |                 logger.error(msg) | 
					
						
							|  |  |  |                 self.handled.wait() | 
					
						
							|  |  |  |                 self.assertEqual(self.log_data.path, '/frob') | 
					
						
							|  |  |  |                 self.assertEqual(self.command, method) | 
					
						
							|  |  |  |                 if method == 'GET': | 
					
						
							|  |  |  |                     d = parse_qs(self.log_data.query) | 
					
						
							|  |  |  |                 else: | 
					
						
							|  |  |  |                     d = parse_qs(self.post_data.decode('utf-8')) | 
					
						
							|  |  |  |                 self.assertEqual(d['name'], ['http']) | 
					
						
							|  |  |  |                 self.assertEqual(d['funcName'], ['test_output']) | 
					
						
							|  |  |  |                 self.assertEqual(d['msg'], [msg]) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |             self.server.stop(2.0) | 
					
						
							|  |  |  |             self.root_logger.removeHandler(self.h_hdlr) | 
					
						
							|  |  |  |             self.h_hdlr.close() | 
					
						
							| 
									
										
										
										
											2011-05-02 13:17:27 +01:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  | class MemoryTest(BaseTest): | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     """Test memory persistence of logger objects.""" | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def setUp(self): | 
					
						
							|  |  |  |         """Create a dict to remember potentially destroyed objects.""" | 
					
						
							|  |  |  |         BaseTest.setUp(self) | 
					
						
							|  |  |  |         self._survivors = {} | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def _watch_for_survival(self, *args): | 
					
						
							|  |  |  |         """Watch the given objects for survival, by creating weakrefs to
 | 
					
						
							|  |  |  |         them."""
 | 
					
						
							|  |  |  |         for obj in args: | 
					
						
							|  |  |  |             key = id(obj), repr(obj) | 
					
						
							|  |  |  |             self._survivors[key] = weakref.ref(obj) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-06-30 23:06:06 +00:00
										 |  |  |     def _assertTruesurvival(self): | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |         """Assert that all objects watched for survival have survived.""" | 
					
						
							|  |  |  |         # Trigger cycle breaking. | 
					
						
							|  |  |  |         gc.collect() | 
					
						
							|  |  |  |         dead = [] | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,77973,77979,77985-77986,78009,78029,78031-78033,78081,78085,78103,78105-78106,78108,78246,78703,78728,78731,78853,78855 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 12:48:53 -0600 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 14:18:28 -0600 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r77973 | vinay.sajip | 2010-02-04 14:23:45 -0600 (Thu, 04 Feb 2010) | 1 line
  Issue #7851: logging: clarification on logging configuration files.
........
  r77979 | vinay.sajip | 2010-02-04 15:40:56 -0600 (Thu, 04 Feb 2010) | 1 line
  Added unit test for cfg:// resolution.
........
  r77985 | vinay.sajip | 2010-02-05 08:52:05 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener test now uses find_unused_port().
........
  r77986 | vinay.sajip | 2010-02-05 09:40:20 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener tests disabled for now.
........
  r78009 | vinay.sajip | 2010-02-05 17:43:11 -0600 (Fri, 05 Feb 2010) | 1 line
  test_logging: minor tweaks to timeouts, listening tests marked as skipped.
........
  r78029 | vinay.sajip | 2010-02-06 14:00:43 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Tentatively re-enabling one test to see effect on buildbots.
........
  r78031 | vinay.sajip | 2010-02-06 14:28:36 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Gave server thread more time to get ready, and re-enabled a skipped test.
........
  r78032 | georg.brandl | 2010-02-06 15:54:40 -0600 (Sat, 06 Feb 2010) | 1 line
  Remove unused imports from test_logging.
........
  r78033 | benjamin.peterson | 2010-02-06 16:08:15 -0600 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78081 | vinay.sajip | 2010-02-07 06:56:54 -0600 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 07:06:51 -0600 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78103 | vinay.sajip | 2010-02-08 00:50:14 -0600 (Mon, 08 Feb 2010) | 1 line
  Removed spurious print statement in test.
........
  r78105 | vinay.sajip | 2010-02-08 09:32:08 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: skipped listening tests because they're not working reliably.
........
  r78106 | vinay.sajip | 2010-02-08 10:05:50 -0600 (Mon, 08 Feb 2010) | 1 line
  Issue #7857: Another attempt to keep the buildbots happy.
........
  r78108 | vinay.sajip | 2010-02-08 15:18:15 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
  r78246 | vinay.sajip | 2010-02-19 17:53:17 -0600 (Fri, 19 Feb 2010) | 1 line
  logging: Documented warnings module integration.
........
  r78703 | vinay.sajip | 2010-03-05 16:11:24 -0600 (Fri, 05 Mar 2010) | 1 line
  Factored out time usage determination into a method, to facilitate alternative formatting implementations in the future.
........
  r78728 | vinay.sajip | 2010-03-06 09:12:08 -0600 (Sat, 06 Mar 2010) | 1 line
  Added schema version test in dictConfig.
........
  r78731 | vinay.sajip | 2010-03-06 09:56:03 -0600 (Sat, 06 Mar 2010) | 1 line
  Added checks for tuples in dictConfig.
........
  r78853 | vinay.sajip | 2010-03-12 00:01:21 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: logging: Improved algorithm for computing initial rollover time.
........
  r78855 | vinay.sajip | 2010-03-12 03:16:10 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: Updated NEWS entry and added to logging documentation.
........
											
										 
											2010-03-13 22:30:34 +00:00
										 |  |  |         for (id_, repr_), ref in self._survivors.items(): | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |             if ref() is None: | 
					
						
							|  |  |  |                 dead.append(repr_) | 
					
						
							|  |  |  |         if dead: | 
					
						
							|  |  |  |             self.fail("%d objects should have survived " | 
					
						
							|  |  |  |                 "but have been destroyed: %s" % (len(dead), ", ".join(dead))) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_persistent_loggers(self): | 
					
						
							|  |  |  |         # Logger objects are persistent and retain their configuration, even | 
					
						
							|  |  |  |         #  if visible references are destroyed. | 
					
						
							|  |  |  |         self.root_logger.setLevel(logging.INFO) | 
					
						
							|  |  |  |         foo = logging.getLogger("foo") | 
					
						
							|  |  |  |         self._watch_for_survival(foo) | 
					
						
							|  |  |  |         foo.setLevel(logging.DEBUG) | 
					
						
							|  |  |  |         self.root_logger.debug(self.next_message()) | 
					
						
							|  |  |  |         foo.debug(self.next_message()) | 
					
						
							| 
									
										
										
										
											2009-07-01 00:43:10 +00:00
										 |  |  |         self.assert_log_lines([ | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |             ('foo', 'DEBUG', '2'), | 
					
						
							|  |  |  |         ]) | 
					
						
							|  |  |  |         del foo | 
					
						
							|  |  |  |         # foo has survived. | 
					
						
							| 
									
										
										
										
											2009-06-30 23:06:06 +00:00
										 |  |  |         self._assertTruesurvival() | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |         # foo has retained its settings. | 
					
						
							|  |  |  |         bar = logging.getLogger("foo") | 
					
						
							|  |  |  |         bar.debug(self.next_message()) | 
					
						
							| 
									
										
										
										
											2009-07-01 00:43:10 +00:00
										 |  |  |         self.assert_log_lines([ | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |             ('foo', 'DEBUG', '2'), | 
					
						
							|  |  |  |             ('foo', 'DEBUG', '3'), | 
					
						
							|  |  |  |         ]) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 69364-69365,69409-69410,69413,69417,69435,69442,69447,69495,69519-69521 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r69364 | kristjan.jonsson | 2009-02-06 04:17:34 -0600 (Fri, 06 Feb 2009) | 1 line
  Fix a number of Win32ErrorTests error cases.  chmod wasn't being tested.  'access' never raises an error.
........
  r69365 | armin.rigo | 2009-02-06 05:46:26 -0600 (Fri, 06 Feb 2009) | 2 lines
  Ivan on IRC in #twisted reported this crasher.
........
  r69409 | georg.brandl | 2009-02-07 06:21:17 -0600 (Sat, 07 Feb 2009) | 1 line
  #5174: fix wrong file closing in example.
........
  r69410 | neil.schemenauer | 2009-02-07 08:53:31 -0600 (Sat, 07 Feb 2009) | 4 lines
  Fix broken test in test_hotshot.  Treating the current directory as an
  empty file is sloppy and non-portable.  Use NamedTemporaryFile to make
  an empty file.
........
  r69413 | neil.schemenauer | 2009-02-07 12:35:16 -0600 (Sat, 07 Feb 2009) | 2 lines
  Add test for issue #999042, explict global statement works.
........
  r69417 | benjamin.peterson | 2009-02-07 17:01:19 -0600 (Sat, 07 Feb 2009) | 1 line
  document individual 2to3 fixers
........
  r69435 | benjamin.peterson | 2009-02-08 08:38:13 -0600 (Sun, 08 Feb 2009) | 1 line
  document numliterals fixer
........
  r69442 | benjamin.peterson | 2009-02-08 09:14:57 -0600 (Sun, 08 Feb 2009) | 1 line
  a few edits and typos
........
  r69447 | vinay.sajip | 2009-02-08 13:06:08 -0600 (Sun, 08 Feb 2009) | 2 lines
  Issue #5170: Fixed Unicode output bug in logging and added test case. This is a regression which did not occur in 2.5.
........
  r69495 | kristjan.jonsson | 2009-02-10 07:32:24 -0600 (Tue, 10 Feb 2009) | 1 line
  Issue 4804.  Add a function to test the validity of file descriptors on Windows, and stop using global runtime settings to silence the warnings / assertions.
........
  r69519 | gregory.p.smith | 2009-02-11 17:45:25 -0600 (Wed, 11 Feb 2009) | 3 lines
  Issue #1008086: Fixes socket.inet_aton() to always return 4 bytes even
  on LP64 platforms (most 64-bit Linux, bsd, unix systems).
........
  r69520 | benjamin.peterson | 2009-02-11 21:50:00 -0600 (Wed, 11 Feb 2009) | 1 line
  os.fsync() should be used to ensure that data is written to disk
........
  r69521 | benjamin.peterson | 2009-02-11 22:17:04 -0600 (Wed, 11 Feb 2009) | 1 line
  no need for this __bases__ trick anymore
........
											
										 
											2009-02-13 02:50:59 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 66141,66145,66150,66180,66211,66217,66219,66226,66231,66244,66246,66249-66250,66264,66268,66272,66294,66306 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r66141 | gregory.p.smith | 2008-09-02 00:29:51 -0500 (Tue, 02 Sep 2008) | 3 lines
  Issue #3678: Correctly pass LDFLAGS and LDLAST to the linker on shared
  library targets in the Makefile.
........
  r66145 | marc-andre.lemburg | 2008-09-02 05:32:34 -0500 (Tue, 02 Sep 2008) | 5 lines
  Add quotes around the file name to avoid issues with spaces.
  Closes #3719.
........
  r66150 | marc-andre.lemburg | 2008-09-02 07:11:19 -0500 (Tue, 02 Sep 2008) | 3 lines
  Add news item for #3719.
........
  r66180 | vinay.sajip | 2008-09-03 04:20:05 -0500 (Wed, 03 Sep 2008) | 1 line
  Issue #3726: Allowed spaces in separators in logging configuration files.
........
  r66211 | vinay.sajip | 2008-09-04 02:31:21 -0500 (Thu, 04 Sep 2008) | 1 line
  Issue #3772: Fixed regression problem in StreamHandler.emit().
........
  r66217 | andrew.kuchling | 2008-09-04 08:26:24 -0500 (Thu, 04 Sep 2008) | 1 line
  #3671: various corrections and markup fixes noted by Kent Johnson
........
  r66219 | hirokazu.yamamoto | 2008-09-04 09:25:30 -0500 (Thu, 04 Sep 2008) | 1 line
  Added NEWS
........
  r66226 | benjamin.peterson | 2008-09-04 18:31:27 -0500 (Thu, 04 Sep 2008) | 1 line
  flesh out the documentation on using 2to3
........
  r66231 | andrew.kuchling | 2008-09-05 10:15:56 -0500 (Fri, 05 Sep 2008) | 1 line
  #3671: Typo fix
........
  r66244 | jesse.noller | 2008-09-05 20:20:11 -0500 (Fri, 05 Sep 2008) | 2 lines
  Fix typo in multiprocessing doc, cancel_join_thread was missing _thread
........
  r66246 | benjamin.peterson | 2008-09-05 22:00:00 -0500 (Fri, 05 Sep 2008) | 1 line
  actually tell the name of the flag to use
........
  r66249 | andrew.kuchling | 2008-09-06 07:50:05 -0500 (Sat, 06 Sep 2008) | 1 line
  Various corrections
........
  r66250 | andrew.kuchling | 2008-09-06 08:04:02 -0500 (Sat, 06 Sep 2008) | 1 line
  #3040: include 'dest' argument in example; trim some trailing whitespace
........
  r66264 | benjamin.peterson | 2008-09-06 14:42:39 -0500 (Sat, 06 Sep 2008) | 1 line
  docs are pretty good about new-style classes these days
........
  r66268 | andrew.kuchling | 2008-09-06 15:28:01 -0500 (Sat, 06 Sep 2008) | 1 line
  #3669 from Robert Lehmann: simplify use of iterator in example
........
  r66272 | andrew.kuchling | 2008-09-06 16:26:02 -0500 (Sat, 06 Sep 2008) | 1 line
  #1317: describe the does_esmtp, ehlo_resp, esmtp_features, and helo_resp attributes
........
  r66294 | georg.brandl | 2008-09-07 12:00:17 -0500 (Sun, 07 Sep 2008) | 2 lines
  Add a new howto about Python and the web, by Marek Kubica.
........
  r66306 | mark.summerfield | 2008-09-08 09:45:37 -0500 (Mon, 08 Sep 2008) | 3 lines
  Added xrefs to each other.
........
											
										 
											2008-09-08 23:05:23 +00:00
										 |  |  | class EncodingTest(BaseTest): | 
					
						
							|  |  |  |     def test_encoding_plain_file(self): | 
					
						
							|  |  |  |         # In Python 2.x, a plain file object is treated as having no encoding. | 
					
						
							|  |  |  |         log = logging.getLogger("test") | 
					
						
							| 
									
										
										
										
											2010-12-27 11:18:52 +00:00
										 |  |  |         fd, fn = tempfile.mkstemp(".log", "test_logging-1-") | 
					
						
							|  |  |  |         os.close(fd) | 
					
						
							| 
									
										
											  
											
												Merged revisions 66141,66145,66150,66180,66211,66217,66219,66226,66231,66244,66246,66249-66250,66264,66268,66272,66294,66306 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r66141 | gregory.p.smith | 2008-09-02 00:29:51 -0500 (Tue, 02 Sep 2008) | 3 lines
  Issue #3678: Correctly pass LDFLAGS and LDLAST to the linker on shared
  library targets in the Makefile.
........
  r66145 | marc-andre.lemburg | 2008-09-02 05:32:34 -0500 (Tue, 02 Sep 2008) | 5 lines
  Add quotes around the file name to avoid issues with spaces.
  Closes #3719.
........
  r66150 | marc-andre.lemburg | 2008-09-02 07:11:19 -0500 (Tue, 02 Sep 2008) | 3 lines
  Add news item for #3719.
........
  r66180 | vinay.sajip | 2008-09-03 04:20:05 -0500 (Wed, 03 Sep 2008) | 1 line
  Issue #3726: Allowed spaces in separators in logging configuration files.
........
  r66211 | vinay.sajip | 2008-09-04 02:31:21 -0500 (Thu, 04 Sep 2008) | 1 line
  Issue #3772: Fixed regression problem in StreamHandler.emit().
........
  r66217 | andrew.kuchling | 2008-09-04 08:26:24 -0500 (Thu, 04 Sep 2008) | 1 line
  #3671: various corrections and markup fixes noted by Kent Johnson
........
  r66219 | hirokazu.yamamoto | 2008-09-04 09:25:30 -0500 (Thu, 04 Sep 2008) | 1 line
  Added NEWS
........
  r66226 | benjamin.peterson | 2008-09-04 18:31:27 -0500 (Thu, 04 Sep 2008) | 1 line
  flesh out the documentation on using 2to3
........
  r66231 | andrew.kuchling | 2008-09-05 10:15:56 -0500 (Fri, 05 Sep 2008) | 1 line
  #3671: Typo fix
........
  r66244 | jesse.noller | 2008-09-05 20:20:11 -0500 (Fri, 05 Sep 2008) | 2 lines
  Fix typo in multiprocessing doc, cancel_join_thread was missing _thread
........
  r66246 | benjamin.peterson | 2008-09-05 22:00:00 -0500 (Fri, 05 Sep 2008) | 1 line
  actually tell the name of the flag to use
........
  r66249 | andrew.kuchling | 2008-09-06 07:50:05 -0500 (Sat, 06 Sep 2008) | 1 line
  Various corrections
........
  r66250 | andrew.kuchling | 2008-09-06 08:04:02 -0500 (Sat, 06 Sep 2008) | 1 line
  #3040: include 'dest' argument in example; trim some trailing whitespace
........
  r66264 | benjamin.peterson | 2008-09-06 14:42:39 -0500 (Sat, 06 Sep 2008) | 1 line
  docs are pretty good about new-style classes these days
........
  r66268 | andrew.kuchling | 2008-09-06 15:28:01 -0500 (Sat, 06 Sep 2008) | 1 line
  #3669 from Robert Lehmann: simplify use of iterator in example
........
  r66272 | andrew.kuchling | 2008-09-06 16:26:02 -0500 (Sat, 06 Sep 2008) | 1 line
  #1317: describe the does_esmtp, ehlo_resp, esmtp_features, and helo_resp attributes
........
  r66294 | georg.brandl | 2008-09-07 12:00:17 -0500 (Sun, 07 Sep 2008) | 2 lines
  Add a new howto about Python and the web, by Marek Kubica.
........
  r66306 | mark.summerfield | 2008-09-08 09:45:37 -0500 (Mon, 08 Sep 2008) | 3 lines
  Added xrefs to each other.
........
											
										 
											2008-09-08 23:05:23 +00:00
										 |  |  |         # the non-ascii data we write to the log. | 
					
						
							|  |  |  |         data = "foo\x80" | 
					
						
							|  |  |  |         try: | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,77973,77979,77985-77986,78009,78029,78031-78033,78081,78085,78103,78105-78106,78108,78246,78703,78728,78731,78853,78855 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 12:48:53 -0600 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 14:18:28 -0600 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r77973 | vinay.sajip | 2010-02-04 14:23:45 -0600 (Thu, 04 Feb 2010) | 1 line
  Issue #7851: logging: clarification on logging configuration files.
........
  r77979 | vinay.sajip | 2010-02-04 15:40:56 -0600 (Thu, 04 Feb 2010) | 1 line
  Added unit test for cfg:// resolution.
........
  r77985 | vinay.sajip | 2010-02-05 08:52:05 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener test now uses find_unused_port().
........
  r77986 | vinay.sajip | 2010-02-05 09:40:20 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener tests disabled for now.
........
  r78009 | vinay.sajip | 2010-02-05 17:43:11 -0600 (Fri, 05 Feb 2010) | 1 line
  test_logging: minor tweaks to timeouts, listening tests marked as skipped.
........
  r78029 | vinay.sajip | 2010-02-06 14:00:43 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Tentatively re-enabling one test to see effect on buildbots.
........
  r78031 | vinay.sajip | 2010-02-06 14:28:36 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Gave server thread more time to get ready, and re-enabled a skipped test.
........
  r78032 | georg.brandl | 2010-02-06 15:54:40 -0600 (Sat, 06 Feb 2010) | 1 line
  Remove unused imports from test_logging.
........
  r78033 | benjamin.peterson | 2010-02-06 16:08:15 -0600 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78081 | vinay.sajip | 2010-02-07 06:56:54 -0600 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 07:06:51 -0600 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78103 | vinay.sajip | 2010-02-08 00:50:14 -0600 (Mon, 08 Feb 2010) | 1 line
  Removed spurious print statement in test.
........
  r78105 | vinay.sajip | 2010-02-08 09:32:08 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: skipped listening tests because they're not working reliably.
........
  r78106 | vinay.sajip | 2010-02-08 10:05:50 -0600 (Mon, 08 Feb 2010) | 1 line
  Issue #7857: Another attempt to keep the buildbots happy.
........
  r78108 | vinay.sajip | 2010-02-08 15:18:15 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
  r78246 | vinay.sajip | 2010-02-19 17:53:17 -0600 (Fri, 19 Feb 2010) | 1 line
  logging: Documented warnings module integration.
........
  r78703 | vinay.sajip | 2010-03-05 16:11:24 -0600 (Fri, 05 Mar 2010) | 1 line
  Factored out time usage determination into a method, to facilitate alternative formatting implementations in the future.
........
  r78728 | vinay.sajip | 2010-03-06 09:12:08 -0600 (Sat, 06 Mar 2010) | 1 line
  Added schema version test in dictConfig.
........
  r78731 | vinay.sajip | 2010-03-06 09:56:03 -0600 (Sat, 06 Mar 2010) | 1 line
  Added checks for tuples in dictConfig.
........
  r78853 | vinay.sajip | 2010-03-12 00:01:21 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: logging: Improved algorithm for computing initial rollover time.
........
  r78855 | vinay.sajip | 2010-03-12 03:16:10 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: Updated NEWS entry and added to logging documentation.
........
											
										 
											2010-03-13 22:30:34 +00:00
										 |  |  |             handler = logging.FileHandler(fn, encoding="utf-8") | 
					
						
							| 
									
										
											  
											
												Merged revisions 66141,66145,66150,66180,66211,66217,66219,66226,66231,66244,66246,66249-66250,66264,66268,66272,66294,66306 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r66141 | gregory.p.smith | 2008-09-02 00:29:51 -0500 (Tue, 02 Sep 2008) | 3 lines
  Issue #3678: Correctly pass LDFLAGS and LDLAST to the linker on shared
  library targets in the Makefile.
........
  r66145 | marc-andre.lemburg | 2008-09-02 05:32:34 -0500 (Tue, 02 Sep 2008) | 5 lines
  Add quotes around the file name to avoid issues with spaces.
  Closes #3719.
........
  r66150 | marc-andre.lemburg | 2008-09-02 07:11:19 -0500 (Tue, 02 Sep 2008) | 3 lines
  Add news item for #3719.
........
  r66180 | vinay.sajip | 2008-09-03 04:20:05 -0500 (Wed, 03 Sep 2008) | 1 line
  Issue #3726: Allowed spaces in separators in logging configuration files.
........
  r66211 | vinay.sajip | 2008-09-04 02:31:21 -0500 (Thu, 04 Sep 2008) | 1 line
  Issue #3772: Fixed regression problem in StreamHandler.emit().
........
  r66217 | andrew.kuchling | 2008-09-04 08:26:24 -0500 (Thu, 04 Sep 2008) | 1 line
  #3671: various corrections and markup fixes noted by Kent Johnson
........
  r66219 | hirokazu.yamamoto | 2008-09-04 09:25:30 -0500 (Thu, 04 Sep 2008) | 1 line
  Added NEWS
........
  r66226 | benjamin.peterson | 2008-09-04 18:31:27 -0500 (Thu, 04 Sep 2008) | 1 line
  flesh out the documentation on using 2to3
........
  r66231 | andrew.kuchling | 2008-09-05 10:15:56 -0500 (Fri, 05 Sep 2008) | 1 line
  #3671: Typo fix
........
  r66244 | jesse.noller | 2008-09-05 20:20:11 -0500 (Fri, 05 Sep 2008) | 2 lines
  Fix typo in multiprocessing doc, cancel_join_thread was missing _thread
........
  r66246 | benjamin.peterson | 2008-09-05 22:00:00 -0500 (Fri, 05 Sep 2008) | 1 line
  actually tell the name of the flag to use
........
  r66249 | andrew.kuchling | 2008-09-06 07:50:05 -0500 (Sat, 06 Sep 2008) | 1 line
  Various corrections
........
  r66250 | andrew.kuchling | 2008-09-06 08:04:02 -0500 (Sat, 06 Sep 2008) | 1 line
  #3040: include 'dest' argument in example; trim some trailing whitespace
........
  r66264 | benjamin.peterson | 2008-09-06 14:42:39 -0500 (Sat, 06 Sep 2008) | 1 line
  docs are pretty good about new-style classes these days
........
  r66268 | andrew.kuchling | 2008-09-06 15:28:01 -0500 (Sat, 06 Sep 2008) | 1 line
  #3669 from Robert Lehmann: simplify use of iterator in example
........
  r66272 | andrew.kuchling | 2008-09-06 16:26:02 -0500 (Sat, 06 Sep 2008) | 1 line
  #1317: describe the does_esmtp, ehlo_resp, esmtp_features, and helo_resp attributes
........
  r66294 | georg.brandl | 2008-09-07 12:00:17 -0500 (Sun, 07 Sep 2008) | 2 lines
  Add a new howto about Python and the web, by Marek Kubica.
........
  r66306 | mark.summerfield | 2008-09-08 09:45:37 -0500 (Mon, 08 Sep 2008) | 3 lines
  Added xrefs to each other.
........
											
										 
											2008-09-08 23:05:23 +00:00
										 |  |  |             log.addHandler(handler) | 
					
						
							|  |  |  |             try: | 
					
						
							|  |  |  |                 # write non-ascii data to the log. | 
					
						
							|  |  |  |                 log.warning(data) | 
					
						
							|  |  |  |             finally: | 
					
						
							|  |  |  |                 log.removeHandler(handler) | 
					
						
							|  |  |  |                 handler.close() | 
					
						
							|  |  |  |             # check we wrote exactly those bytes, ignoring trailing \n etc | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,77973,77979,77985-77986,78009,78029,78031-78033,78081,78085,78103,78105-78106,78108,78246,78703,78728,78731,78853,78855 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 12:48:53 -0600 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 14:18:28 -0600 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r77973 | vinay.sajip | 2010-02-04 14:23:45 -0600 (Thu, 04 Feb 2010) | 1 line
  Issue #7851: logging: clarification on logging configuration files.
........
  r77979 | vinay.sajip | 2010-02-04 15:40:56 -0600 (Thu, 04 Feb 2010) | 1 line
  Added unit test for cfg:// resolution.
........
  r77985 | vinay.sajip | 2010-02-05 08:52:05 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener test now uses find_unused_port().
........
  r77986 | vinay.sajip | 2010-02-05 09:40:20 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener tests disabled for now.
........
  r78009 | vinay.sajip | 2010-02-05 17:43:11 -0600 (Fri, 05 Feb 2010) | 1 line
  test_logging: minor tweaks to timeouts, listening tests marked as skipped.
........
  r78029 | vinay.sajip | 2010-02-06 14:00:43 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Tentatively re-enabling one test to see effect on buildbots.
........
  r78031 | vinay.sajip | 2010-02-06 14:28:36 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Gave server thread more time to get ready, and re-enabled a skipped test.
........
  r78032 | georg.brandl | 2010-02-06 15:54:40 -0600 (Sat, 06 Feb 2010) | 1 line
  Remove unused imports from test_logging.
........
  r78033 | benjamin.peterson | 2010-02-06 16:08:15 -0600 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78081 | vinay.sajip | 2010-02-07 06:56:54 -0600 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 07:06:51 -0600 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78103 | vinay.sajip | 2010-02-08 00:50:14 -0600 (Mon, 08 Feb 2010) | 1 line
  Removed spurious print statement in test.
........
  r78105 | vinay.sajip | 2010-02-08 09:32:08 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: skipped listening tests because they're not working reliably.
........
  r78106 | vinay.sajip | 2010-02-08 10:05:50 -0600 (Mon, 08 Feb 2010) | 1 line
  Issue #7857: Another attempt to keep the buildbots happy.
........
  r78108 | vinay.sajip | 2010-02-08 15:18:15 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
  r78246 | vinay.sajip | 2010-02-19 17:53:17 -0600 (Fri, 19 Feb 2010) | 1 line
  logging: Documented warnings module integration.
........
  r78703 | vinay.sajip | 2010-03-05 16:11:24 -0600 (Fri, 05 Mar 2010) | 1 line
  Factored out time usage determination into a method, to facilitate alternative formatting implementations in the future.
........
  r78728 | vinay.sajip | 2010-03-06 09:12:08 -0600 (Sat, 06 Mar 2010) | 1 line
  Added schema version test in dictConfig.
........
  r78731 | vinay.sajip | 2010-03-06 09:56:03 -0600 (Sat, 06 Mar 2010) | 1 line
  Added checks for tuples in dictConfig.
........
  r78853 | vinay.sajip | 2010-03-12 00:01:21 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: logging: Improved algorithm for computing initial rollover time.
........
  r78855 | vinay.sajip | 2010-03-12 03:16:10 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: Updated NEWS entry and added to logging documentation.
........
											
										 
											2010-03-13 22:30:34 +00:00
										 |  |  |             f = open(fn, encoding="utf-8") | 
					
						
							| 
									
										
											  
											
												Merged revisions 66141,66145,66150,66180,66211,66217,66219,66226,66231,66244,66246,66249-66250,66264,66268,66272,66294,66306 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r66141 | gregory.p.smith | 2008-09-02 00:29:51 -0500 (Tue, 02 Sep 2008) | 3 lines
  Issue #3678: Correctly pass LDFLAGS and LDLAST to the linker on shared
  library targets in the Makefile.
........
  r66145 | marc-andre.lemburg | 2008-09-02 05:32:34 -0500 (Tue, 02 Sep 2008) | 5 lines
  Add quotes around the file name to avoid issues with spaces.
  Closes #3719.
........
  r66150 | marc-andre.lemburg | 2008-09-02 07:11:19 -0500 (Tue, 02 Sep 2008) | 3 lines
  Add news item for #3719.
........
  r66180 | vinay.sajip | 2008-09-03 04:20:05 -0500 (Wed, 03 Sep 2008) | 1 line
  Issue #3726: Allowed spaces in separators in logging configuration files.
........
  r66211 | vinay.sajip | 2008-09-04 02:31:21 -0500 (Thu, 04 Sep 2008) | 1 line
  Issue #3772: Fixed regression problem in StreamHandler.emit().
........
  r66217 | andrew.kuchling | 2008-09-04 08:26:24 -0500 (Thu, 04 Sep 2008) | 1 line
  #3671: various corrections and markup fixes noted by Kent Johnson
........
  r66219 | hirokazu.yamamoto | 2008-09-04 09:25:30 -0500 (Thu, 04 Sep 2008) | 1 line
  Added NEWS
........
  r66226 | benjamin.peterson | 2008-09-04 18:31:27 -0500 (Thu, 04 Sep 2008) | 1 line
  flesh out the documentation on using 2to3
........
  r66231 | andrew.kuchling | 2008-09-05 10:15:56 -0500 (Fri, 05 Sep 2008) | 1 line
  #3671: Typo fix
........
  r66244 | jesse.noller | 2008-09-05 20:20:11 -0500 (Fri, 05 Sep 2008) | 2 lines
  Fix typo in multiprocessing doc, cancel_join_thread was missing _thread
........
  r66246 | benjamin.peterson | 2008-09-05 22:00:00 -0500 (Fri, 05 Sep 2008) | 1 line
  actually tell the name of the flag to use
........
  r66249 | andrew.kuchling | 2008-09-06 07:50:05 -0500 (Sat, 06 Sep 2008) | 1 line
  Various corrections
........
  r66250 | andrew.kuchling | 2008-09-06 08:04:02 -0500 (Sat, 06 Sep 2008) | 1 line
  #3040: include 'dest' argument in example; trim some trailing whitespace
........
  r66264 | benjamin.peterson | 2008-09-06 14:42:39 -0500 (Sat, 06 Sep 2008) | 1 line
  docs are pretty good about new-style classes these days
........
  r66268 | andrew.kuchling | 2008-09-06 15:28:01 -0500 (Sat, 06 Sep 2008) | 1 line
  #3669 from Robert Lehmann: simplify use of iterator in example
........
  r66272 | andrew.kuchling | 2008-09-06 16:26:02 -0500 (Sat, 06 Sep 2008) | 1 line
  #1317: describe the does_esmtp, ehlo_resp, esmtp_features, and helo_resp attributes
........
  r66294 | georg.brandl | 2008-09-07 12:00:17 -0500 (Sun, 07 Sep 2008) | 2 lines
  Add a new howto about Python and the web, by Marek Kubica.
........
  r66306 | mark.summerfield | 2008-09-08 09:45:37 -0500 (Mon, 08 Sep 2008) | 3 lines
  Added xrefs to each other.
........
											
										 
											2008-09-08 23:05:23 +00:00
										 |  |  |             try: | 
					
						
							| 
									
										
										
										
											2009-06-30 23:06:06 +00:00
										 |  |  |                 self.assertEqual(f.read().rstrip(), data) | 
					
						
							| 
									
										
											  
											
												Merged revisions 66141,66145,66150,66180,66211,66217,66219,66226,66231,66244,66246,66249-66250,66264,66268,66272,66294,66306 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r66141 | gregory.p.smith | 2008-09-02 00:29:51 -0500 (Tue, 02 Sep 2008) | 3 lines
  Issue #3678: Correctly pass LDFLAGS and LDLAST to the linker on shared
  library targets in the Makefile.
........
  r66145 | marc-andre.lemburg | 2008-09-02 05:32:34 -0500 (Tue, 02 Sep 2008) | 5 lines
  Add quotes around the file name to avoid issues with spaces.
  Closes #3719.
........
  r66150 | marc-andre.lemburg | 2008-09-02 07:11:19 -0500 (Tue, 02 Sep 2008) | 3 lines
  Add news item for #3719.
........
  r66180 | vinay.sajip | 2008-09-03 04:20:05 -0500 (Wed, 03 Sep 2008) | 1 line
  Issue #3726: Allowed spaces in separators in logging configuration files.
........
  r66211 | vinay.sajip | 2008-09-04 02:31:21 -0500 (Thu, 04 Sep 2008) | 1 line
  Issue #3772: Fixed regression problem in StreamHandler.emit().
........
  r66217 | andrew.kuchling | 2008-09-04 08:26:24 -0500 (Thu, 04 Sep 2008) | 1 line
  #3671: various corrections and markup fixes noted by Kent Johnson
........
  r66219 | hirokazu.yamamoto | 2008-09-04 09:25:30 -0500 (Thu, 04 Sep 2008) | 1 line
  Added NEWS
........
  r66226 | benjamin.peterson | 2008-09-04 18:31:27 -0500 (Thu, 04 Sep 2008) | 1 line
  flesh out the documentation on using 2to3
........
  r66231 | andrew.kuchling | 2008-09-05 10:15:56 -0500 (Fri, 05 Sep 2008) | 1 line
  #3671: Typo fix
........
  r66244 | jesse.noller | 2008-09-05 20:20:11 -0500 (Fri, 05 Sep 2008) | 2 lines
  Fix typo in multiprocessing doc, cancel_join_thread was missing _thread
........
  r66246 | benjamin.peterson | 2008-09-05 22:00:00 -0500 (Fri, 05 Sep 2008) | 1 line
  actually tell the name of the flag to use
........
  r66249 | andrew.kuchling | 2008-09-06 07:50:05 -0500 (Sat, 06 Sep 2008) | 1 line
  Various corrections
........
  r66250 | andrew.kuchling | 2008-09-06 08:04:02 -0500 (Sat, 06 Sep 2008) | 1 line
  #3040: include 'dest' argument in example; trim some trailing whitespace
........
  r66264 | benjamin.peterson | 2008-09-06 14:42:39 -0500 (Sat, 06 Sep 2008) | 1 line
  docs are pretty good about new-style classes these days
........
  r66268 | andrew.kuchling | 2008-09-06 15:28:01 -0500 (Sat, 06 Sep 2008) | 1 line
  #3669 from Robert Lehmann: simplify use of iterator in example
........
  r66272 | andrew.kuchling | 2008-09-06 16:26:02 -0500 (Sat, 06 Sep 2008) | 1 line
  #1317: describe the does_esmtp, ehlo_resp, esmtp_features, and helo_resp attributes
........
  r66294 | georg.brandl | 2008-09-07 12:00:17 -0500 (Sun, 07 Sep 2008) | 2 lines
  Add a new howto about Python and the web, by Marek Kubica.
........
  r66306 | mark.summerfield | 2008-09-08 09:45:37 -0500 (Mon, 08 Sep 2008) | 3 lines
  Added xrefs to each other.
........
											
										 
											2008-09-08 23:05:23 +00:00
										 |  |  |             finally: | 
					
						
							|  |  |  |                 f.close() | 
					
						
							|  |  |  |         finally: | 
					
						
							|  |  |  |             if os.path.isfile(fn): | 
					
						
							|  |  |  |                 os.remove(fn) | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 69364-69365,69409-69410,69413,69417,69435,69442,69447,69495,69519-69521 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r69364 | kristjan.jonsson | 2009-02-06 04:17:34 -0600 (Fri, 06 Feb 2009) | 1 line
  Fix a number of Win32ErrorTests error cases.  chmod wasn't being tested.  'access' never raises an error.
........
  r69365 | armin.rigo | 2009-02-06 05:46:26 -0600 (Fri, 06 Feb 2009) | 2 lines
  Ivan on IRC in #twisted reported this crasher.
........
  r69409 | georg.brandl | 2009-02-07 06:21:17 -0600 (Sat, 07 Feb 2009) | 1 line
  #5174: fix wrong file closing in example.
........
  r69410 | neil.schemenauer | 2009-02-07 08:53:31 -0600 (Sat, 07 Feb 2009) | 4 lines
  Fix broken test in test_hotshot.  Treating the current directory as an
  empty file is sloppy and non-portable.  Use NamedTemporaryFile to make
  an empty file.
........
  r69413 | neil.schemenauer | 2009-02-07 12:35:16 -0600 (Sat, 07 Feb 2009) | 2 lines
  Add test for issue #999042, explict global statement works.
........
  r69417 | benjamin.peterson | 2009-02-07 17:01:19 -0600 (Sat, 07 Feb 2009) | 1 line
  document individual 2to3 fixers
........
  r69435 | benjamin.peterson | 2009-02-08 08:38:13 -0600 (Sun, 08 Feb 2009) | 1 line
  document numliterals fixer
........
  r69442 | benjamin.peterson | 2009-02-08 09:14:57 -0600 (Sun, 08 Feb 2009) | 1 line
  a few edits and typos
........
  r69447 | vinay.sajip | 2009-02-08 13:06:08 -0600 (Sun, 08 Feb 2009) | 2 lines
  Issue #5170: Fixed Unicode output bug in logging and added test case. This is a regression which did not occur in 2.5.
........
  r69495 | kristjan.jonsson | 2009-02-10 07:32:24 -0600 (Tue, 10 Feb 2009) | 1 line
  Issue 4804.  Add a function to test the validity of file descriptors on Windows, and stop using global runtime settings to silence the warnings / assertions.
........
  r69519 | gregory.p.smith | 2009-02-11 17:45:25 -0600 (Wed, 11 Feb 2009) | 3 lines
  Issue #1008086: Fixes socket.inet_aton() to always return 4 bytes even
  on LP64 platforms (most 64-bit Linux, bsd, unix systems).
........
  r69520 | benjamin.peterson | 2009-02-11 21:50:00 -0600 (Wed, 11 Feb 2009) | 1 line
  os.fsync() should be used to ensure that data is written to disk
........
  r69521 | benjamin.peterson | 2009-02-11 22:17:04 -0600 (Wed, 11 Feb 2009) | 1 line
  no need for this __bases__ trick anymore
........
											
										 
											2009-02-13 02:50:59 +00:00
										 |  |  |     def test_encoding_cyrillic_unicode(self): | 
					
						
							|  |  |  |         log = logging.getLogger("test") | 
					
						
							|  |  |  |         #Get a message in Unicode: Do svidanya in Cyrillic (meaning goodbye) | 
					
						
							|  |  |  |         message = '\u0434\u043e \u0441\u0432\u0438\u0434\u0430\u043d\u0438\u044f' | 
					
						
							|  |  |  |         #Ensure it's written in a Cyrillic encoding | 
					
						
							|  |  |  |         writer_class = codecs.getwriter('cp1251') | 
					
						
							| 
									
										
											  
											
												Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r70768 | andrew.kuchling | 2009-03-30 17:29:15 -0500 (Mon, 30 Mar 2009) | 1 line
  Typo fixes
........
  r71657 | vinay.sajip | 2009-04-16 14:07:37 -0500 (Thu, 16 Apr 2009) | 1 line
  Issue #5768: Change to Unicode output logic and test case for same.
........
  r71721 | benjamin.peterson | 2009-04-18 14:26:19 -0500 (Sat, 18 Apr 2009) | 1 line
  fix a few nits in unittest.py #5771
........
  r71729 | benjamin.peterson | 2009-04-18 16:03:10 -0500 (Sat, 18 Apr 2009) | 1 line
  move test to a more appropiate one
........
  r71794 | vinay.sajip | 2009-04-22 07:10:47 -0500 (Wed, 22 Apr 2009) | 2 lines
  Issue #5170: Fixed regression caused when fixing #5768.
........
  r71976 | mark.dickinson | 2009-04-26 14:54:55 -0500 (Sun, 26 Apr 2009) | 2 lines
  Fix typo in function name
........
  r72036 | georg.brandl | 2009-04-27 12:04:23 -0500 (Mon, 27 Apr 2009) | 1 line
  #5848: small unittest doc patch.
........
  r72037 | georg.brandl | 2009-04-27 12:09:53 -0500 (Mon, 27 Apr 2009) | 1 line
  #5840: dont claim we dont support TLS.
........
  r72079 | r.david.murray | 2009-04-28 14:02:55 -0500 (Tue, 28 Apr 2009) | 2 lines
  Remove spurious 'u'.
........
  r72085 | georg.brandl | 2009-04-28 16:48:35 -0500 (Tue, 28 Apr 2009) | 1 line
  Make the doctests in the docs pass, except for those in the turtle module.
........
  r72131 | benjamin.peterson | 2009-04-29 17:43:35 -0500 (Wed, 29 Apr 2009) | 1 line
  fix test_shutil on ZFS #5676
........
  r72132 | georg.brandl | 2009-04-29 17:44:07 -0500 (Wed, 29 Apr 2009) | 1 line
  #5878: fix repr of re object.
........
  r72133 | benjamin.peterson | 2009-04-29 17:44:15 -0500 (Wed, 29 Apr 2009) | 1 line
  make sure mode is removable while cleaning up test droppings
........
  r72134 | benjamin.peterson | 2009-04-29 19:06:33 -0500 (Wed, 29 Apr 2009) | 1 line
  make sure to close file
........
  r72191 | michael.foord | 2009-05-02 06:43:06 -0500 (Sat, 02 May 2009) | 9 lines
  Adds an exit parameter to unittest.main(). If False main no longer
  calls sys.exit.
  Closes issue 3379.
  Michael Foord
........
  r72197 | benjamin.peterson | 2009-05-02 11:24:37 -0500 (Sat, 02 May 2009) | 1 line
  don't let sys.argv be used in the tests
........
  r72198 | andrew.kuchling | 2009-05-02 12:12:15 -0500 (Sat, 02 May 2009) | 1 line
  Add items
........
  r72219 | michael.foord | 2009-05-02 15:15:05 -0500 (Sat, 02 May 2009) | 8 lines
  Add addCleanup and doCleanups to unittest.TestCase.
  Closes issue 5679.
  Michael Foord
........
  r72221 | benjamin.peterson | 2009-05-02 15:26:53 -0500 (Sat, 02 May 2009) | 1 line
  add myself
........
  r72225 | michael.foord | 2009-05-02 17:43:34 -0500 (Sat, 02 May 2009) | 1 line
........
  r72303 | benjamin.peterson | 2009-05-04 19:55:24 -0500 (Mon, 04 May 2009) | 1 line
  using sys._getframe(x), where x > 0 doesnt' work on IronPython
........
  r72434 | r.david.murray | 2009-05-07 13:09:58 -0500 (Thu, 07 May 2009) | 2 lines
  Pre-opened test file needs to be opened in binary mode.
........
  r72467 | georg.brandl | 2009-05-08 07:17:34 -0500 (Fri, 08 May 2009) | 1 line
  Fix name.
........
  r72476 | thomas.heller | 2009-05-08 15:09:40 -0500 (Fri, 08 May 2009) | 4 lines
  Add a file that contains diffs between offical libffi files and the
  files in this repository.  Should make it easier to merge new libffi
  versions.
........
											
										 
											2009-05-08 20:42:26 +00:00
										 |  |  |         writer_class.encoding = 'cp1251' | 
					
						
							| 
									
										
											  
											
												Merged revisions 69364-69365,69409-69410,69413,69417,69435,69442,69447,69495,69519-69521 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r69364 | kristjan.jonsson | 2009-02-06 04:17:34 -0600 (Fri, 06 Feb 2009) | 1 line
  Fix a number of Win32ErrorTests error cases.  chmod wasn't being tested.  'access' never raises an error.
........
  r69365 | armin.rigo | 2009-02-06 05:46:26 -0600 (Fri, 06 Feb 2009) | 2 lines
  Ivan on IRC in #twisted reported this crasher.
........
  r69409 | georg.brandl | 2009-02-07 06:21:17 -0600 (Sat, 07 Feb 2009) | 1 line
  #5174: fix wrong file closing in example.
........
  r69410 | neil.schemenauer | 2009-02-07 08:53:31 -0600 (Sat, 07 Feb 2009) | 4 lines
  Fix broken test in test_hotshot.  Treating the current directory as an
  empty file is sloppy and non-portable.  Use NamedTemporaryFile to make
  an empty file.
........
  r69413 | neil.schemenauer | 2009-02-07 12:35:16 -0600 (Sat, 07 Feb 2009) | 2 lines
  Add test for issue #999042, explict global statement works.
........
  r69417 | benjamin.peterson | 2009-02-07 17:01:19 -0600 (Sat, 07 Feb 2009) | 1 line
  document individual 2to3 fixers
........
  r69435 | benjamin.peterson | 2009-02-08 08:38:13 -0600 (Sun, 08 Feb 2009) | 1 line
  document numliterals fixer
........
  r69442 | benjamin.peterson | 2009-02-08 09:14:57 -0600 (Sun, 08 Feb 2009) | 1 line
  a few edits and typos
........
  r69447 | vinay.sajip | 2009-02-08 13:06:08 -0600 (Sun, 08 Feb 2009) | 2 lines
  Issue #5170: Fixed Unicode output bug in logging and added test case. This is a regression which did not occur in 2.5.
........
  r69495 | kristjan.jonsson | 2009-02-10 07:32:24 -0600 (Tue, 10 Feb 2009) | 1 line
  Issue 4804.  Add a function to test the validity of file descriptors on Windows, and stop using global runtime settings to silence the warnings / assertions.
........
  r69519 | gregory.p.smith | 2009-02-11 17:45:25 -0600 (Wed, 11 Feb 2009) | 3 lines
  Issue #1008086: Fixes socket.inet_aton() to always return 4 bytes even
  on LP64 platforms (most 64-bit Linux, bsd, unix systems).
........
  r69520 | benjamin.peterson | 2009-02-11 21:50:00 -0600 (Wed, 11 Feb 2009) | 1 line
  os.fsync() should be used to ensure that data is written to disk
........
  r69521 | benjamin.peterson | 2009-02-11 22:17:04 -0600 (Wed, 11 Feb 2009) | 1 line
  no need for this __bases__ trick anymore
........
											
										 
											2009-02-13 02:50:59 +00:00
										 |  |  |         stream = io.BytesIO() | 
					
						
							|  |  |  |         writer = writer_class(stream, 'strict') | 
					
						
							|  |  |  |         handler = logging.StreamHandler(writer) | 
					
						
							|  |  |  |         log.addHandler(handler) | 
					
						
							|  |  |  |         try: | 
					
						
							|  |  |  |             log.warning(message) | 
					
						
							|  |  |  |         finally: | 
					
						
							|  |  |  |             log.removeHandler(handler) | 
					
						
							|  |  |  |             handler.close() | 
					
						
							|  |  |  |         # check we wrote exactly those bytes, ignoring trailing \n etc | 
					
						
							|  |  |  |         s = stream.getvalue() | 
					
						
							|  |  |  |         #Compare against what the data should be when encoded in CP-1251 | 
					
						
							|  |  |  |         self.assertEqual(s, b'\xe4\xee \xf1\xe2\xe8\xe4\xe0\xed\xe8\xff\n') | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-12-07 15:30:06 +00:00
										 |  |  | class WarningsTest(BaseTest): | 
					
						
							| 
									
										
										
										
											2009-04-01 20:01:47 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-12-07 15:30:06 +00:00
										 |  |  |     def test_warnings(self): | 
					
						
							| 
									
										
										
										
											2009-04-01 20:01:47 +00:00
										 |  |  |         with warnings.catch_warnings(): | 
					
						
							| 
									
										
										
										
											2009-04-05 18:57:32 +00:00
										 |  |  |             logging.captureWarnings(True) | 
					
						
							| 
									
										
										
										
											2011-06-05 09:31:34 +01:00
										 |  |  |             self.addCleanup(logging.captureWarnings, False) | 
					
						
							| 
									
										
										
										
											2011-03-29 17:20:34 +01:00
										 |  |  |             warnings.filterwarnings("always", category=UserWarning) | 
					
						
							|  |  |  |             stream = io.StringIO() | 
					
						
							|  |  |  |             h = logging.StreamHandler(stream) | 
					
						
							|  |  |  |             logger = logging.getLogger("py.warnings") | 
					
						
							|  |  |  |             logger.addHandler(h) | 
					
						
							|  |  |  |             warnings.warn("I'm warning you...") | 
					
						
							|  |  |  |             logger.removeHandler(h) | 
					
						
							|  |  |  |             s = stream.getvalue() | 
					
						
							|  |  |  |             h.close() | 
					
						
							|  |  |  |             self.assertTrue(s.find("UserWarning: I'm warning you...\n") > 0) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |             #See if an explicit file uses the original implementation | 
					
						
							|  |  |  |             a_file = io.StringIO() | 
					
						
							|  |  |  |             warnings.showwarning("Explicit", UserWarning, "dummy.py", 42, | 
					
						
							|  |  |  |                                  a_file, "Dummy line") | 
					
						
							|  |  |  |             s = a_file.getvalue() | 
					
						
							|  |  |  |             a_file.close() | 
					
						
							|  |  |  |             self.assertEqual(s, | 
					
						
							|  |  |  |                 "dummy.py:42: UserWarning: Explicit\n  Dummy line\n") | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_warnings_no_handlers(self): | 
					
						
							|  |  |  |         with warnings.catch_warnings(): | 
					
						
							|  |  |  |             logging.captureWarnings(True) | 
					
						
							| 
									
										
										
										
											2011-06-05 09:31:34 +01:00
										 |  |  |             self.addCleanup(logging.captureWarnings, False) | 
					
						
							| 
									
										
										
										
											2011-03-29 17:20:34 +01:00
										 |  |  | 
 | 
					
						
							|  |  |  |             # confirm our assumption: no loggers are set | 
					
						
							|  |  |  |             logger = logging.getLogger("py.warnings") | 
					
						
							| 
									
										
										
										
											2011-06-05 09:31:34 +01:00
										 |  |  |             self.assertEqual(logger.handlers, []) | 
					
						
							| 
									
										
										
										
											2011-03-29 17:20:34 +01:00
										 |  |  | 
 | 
					
						
							|  |  |  |             warnings.showwarning("Explicit", UserWarning, "dummy.py", 42) | 
					
						
							| 
									
										
										
										
											2011-06-05 09:31:34 +01:00
										 |  |  |             self.assertEqual(len(logger.handlers), 1) | 
					
						
							| 
									
										
										
										
											2011-03-29 17:20:34 +01:00
										 |  |  |             self.assertIsInstance(logger.handlers[0], logging.NullHandler) | 
					
						
							| 
									
										
										
										
											2008-12-07 15:30:06 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | def formatFunc(format, datefmt=None): | 
					
						
							|  |  |  |     return logging.Formatter(format, datefmt) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | def handlerFunc(): | 
					
						
							|  |  |  |     return logging.StreamHandler() | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | class CustomHandler(logging.StreamHandler): | 
					
						
							|  |  |  |     pass | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | class ConfigDictTest(BaseTest): | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     """Reading logging config from a dictionary.""" | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     expected_log_pat = r"^([\w]+) \+\+ ([\w]+)$" | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     # config0 is a standard configuration. | 
					
						
							|  |  |  |     config0 = { | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,77973,77979,77985-77986,78009,78029,78031-78033,78081,78085,78103,78105-78106,78108,78246,78703,78728,78731,78853,78855 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 12:48:53 -0600 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 14:18:28 -0600 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r77973 | vinay.sajip | 2010-02-04 14:23:45 -0600 (Thu, 04 Feb 2010) | 1 line
  Issue #7851: logging: clarification on logging configuration files.
........
  r77979 | vinay.sajip | 2010-02-04 15:40:56 -0600 (Thu, 04 Feb 2010) | 1 line
  Added unit test for cfg:// resolution.
........
  r77985 | vinay.sajip | 2010-02-05 08:52:05 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener test now uses find_unused_port().
........
  r77986 | vinay.sajip | 2010-02-05 09:40:20 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener tests disabled for now.
........
  r78009 | vinay.sajip | 2010-02-05 17:43:11 -0600 (Fri, 05 Feb 2010) | 1 line
  test_logging: minor tweaks to timeouts, listening tests marked as skipped.
........
  r78029 | vinay.sajip | 2010-02-06 14:00:43 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Tentatively re-enabling one test to see effect on buildbots.
........
  r78031 | vinay.sajip | 2010-02-06 14:28:36 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Gave server thread more time to get ready, and re-enabled a skipped test.
........
  r78032 | georg.brandl | 2010-02-06 15:54:40 -0600 (Sat, 06 Feb 2010) | 1 line
  Remove unused imports from test_logging.
........
  r78033 | benjamin.peterson | 2010-02-06 16:08:15 -0600 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78081 | vinay.sajip | 2010-02-07 06:56:54 -0600 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 07:06:51 -0600 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78103 | vinay.sajip | 2010-02-08 00:50:14 -0600 (Mon, 08 Feb 2010) | 1 line
  Removed spurious print statement in test.
........
  r78105 | vinay.sajip | 2010-02-08 09:32:08 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: skipped listening tests because they're not working reliably.
........
  r78106 | vinay.sajip | 2010-02-08 10:05:50 -0600 (Mon, 08 Feb 2010) | 1 line
  Issue #7857: Another attempt to keep the buildbots happy.
........
  r78108 | vinay.sajip | 2010-02-08 15:18:15 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
  r78246 | vinay.sajip | 2010-02-19 17:53:17 -0600 (Fri, 19 Feb 2010) | 1 line
  logging: Documented warnings module integration.
........
  r78703 | vinay.sajip | 2010-03-05 16:11:24 -0600 (Fri, 05 Mar 2010) | 1 line
  Factored out time usage determination into a method, to facilitate alternative formatting implementations in the future.
........
  r78728 | vinay.sajip | 2010-03-06 09:12:08 -0600 (Sat, 06 Mar 2010) | 1 line
  Added schema version test in dictConfig.
........
  r78731 | vinay.sajip | 2010-03-06 09:56:03 -0600 (Sat, 06 Mar 2010) | 1 line
  Added checks for tuples in dictConfig.
........
  r78853 | vinay.sajip | 2010-03-12 00:01:21 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: logging: Improved algorithm for computing initial rollover time.
........
  r78855 | vinay.sajip | 2010-03-12 03:16:10 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: Updated NEWS entry and added to logging documentation.
........
											
										 
											2010-03-13 22:30:34 +00:00
										 |  |  |         'version': 1, | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  |         'formatters': { | 
					
						
							|  |  |  |             'form1' : { | 
					
						
							|  |  |  |                 'format' : '%(levelname)s ++ %(message)s', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'handlers' : { | 
					
						
							|  |  |  |             'hand1' : { | 
					
						
							|  |  |  |                 'class' : 'logging.StreamHandler', | 
					
						
							|  |  |  |                 'formatter' : 'form1', | 
					
						
							|  |  |  |                 'level' : 'NOTSET', | 
					
						
							|  |  |  |                 'stream'  : 'ext://sys.stdout', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'root' : { | 
					
						
							|  |  |  |             'level' : 'WARNING', | 
					
						
							|  |  |  |             'handlers' : ['hand1'], | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     # config1 adds a little to the standard configuration. | 
					
						
							|  |  |  |     config1 = { | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,77973,77979,77985-77986,78009,78029,78031-78033,78081,78085,78103,78105-78106,78108,78246,78703,78728,78731,78853,78855 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 12:48:53 -0600 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 14:18:28 -0600 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r77973 | vinay.sajip | 2010-02-04 14:23:45 -0600 (Thu, 04 Feb 2010) | 1 line
  Issue #7851: logging: clarification on logging configuration files.
........
  r77979 | vinay.sajip | 2010-02-04 15:40:56 -0600 (Thu, 04 Feb 2010) | 1 line
  Added unit test for cfg:// resolution.
........
  r77985 | vinay.sajip | 2010-02-05 08:52:05 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener test now uses find_unused_port().
........
  r77986 | vinay.sajip | 2010-02-05 09:40:20 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener tests disabled for now.
........
  r78009 | vinay.sajip | 2010-02-05 17:43:11 -0600 (Fri, 05 Feb 2010) | 1 line
  test_logging: minor tweaks to timeouts, listening tests marked as skipped.
........
  r78029 | vinay.sajip | 2010-02-06 14:00:43 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Tentatively re-enabling one test to see effect on buildbots.
........
  r78031 | vinay.sajip | 2010-02-06 14:28:36 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Gave server thread more time to get ready, and re-enabled a skipped test.
........
  r78032 | georg.brandl | 2010-02-06 15:54:40 -0600 (Sat, 06 Feb 2010) | 1 line
  Remove unused imports from test_logging.
........
  r78033 | benjamin.peterson | 2010-02-06 16:08:15 -0600 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78081 | vinay.sajip | 2010-02-07 06:56:54 -0600 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 07:06:51 -0600 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78103 | vinay.sajip | 2010-02-08 00:50:14 -0600 (Mon, 08 Feb 2010) | 1 line
  Removed spurious print statement in test.
........
  r78105 | vinay.sajip | 2010-02-08 09:32:08 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: skipped listening tests because they're not working reliably.
........
  r78106 | vinay.sajip | 2010-02-08 10:05:50 -0600 (Mon, 08 Feb 2010) | 1 line
  Issue #7857: Another attempt to keep the buildbots happy.
........
  r78108 | vinay.sajip | 2010-02-08 15:18:15 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
  r78246 | vinay.sajip | 2010-02-19 17:53:17 -0600 (Fri, 19 Feb 2010) | 1 line
  logging: Documented warnings module integration.
........
  r78703 | vinay.sajip | 2010-03-05 16:11:24 -0600 (Fri, 05 Mar 2010) | 1 line
  Factored out time usage determination into a method, to facilitate alternative formatting implementations in the future.
........
  r78728 | vinay.sajip | 2010-03-06 09:12:08 -0600 (Sat, 06 Mar 2010) | 1 line
  Added schema version test in dictConfig.
........
  r78731 | vinay.sajip | 2010-03-06 09:56:03 -0600 (Sat, 06 Mar 2010) | 1 line
  Added checks for tuples in dictConfig.
........
  r78853 | vinay.sajip | 2010-03-12 00:01:21 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: logging: Improved algorithm for computing initial rollover time.
........
  r78855 | vinay.sajip | 2010-03-12 03:16:10 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: Updated NEWS entry and added to logging documentation.
........
											
										 
											2010-03-13 22:30:34 +00:00
										 |  |  |         'version': 1, | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  |         'formatters': { | 
					
						
							|  |  |  |             'form1' : { | 
					
						
							|  |  |  |                 'format' : '%(levelname)s ++ %(message)s', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'handlers' : { | 
					
						
							|  |  |  |             'hand1' : { | 
					
						
							|  |  |  |                 'class' : 'logging.StreamHandler', | 
					
						
							|  |  |  |                 'formatter' : 'form1', | 
					
						
							|  |  |  |                 'level' : 'NOTSET', | 
					
						
							|  |  |  |                 'stream'  : 'ext://sys.stdout', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'loggers' : { | 
					
						
							|  |  |  |             'compiler.parser' : { | 
					
						
							|  |  |  |                 'level' : 'DEBUG', | 
					
						
							|  |  |  |                 'handlers' : ['hand1'], | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'root' : { | 
					
						
							|  |  |  |             'level' : 'WARNING', | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-03-07 18:02:57 +00:00
										 |  |  |     # config1a moves the handler to the root. Used with config8a | 
					
						
							|  |  |  |     config1a = { | 
					
						
							|  |  |  |         'version': 1, | 
					
						
							|  |  |  |         'formatters': { | 
					
						
							|  |  |  |             'form1' : { | 
					
						
							|  |  |  |                 'format' : '%(levelname)s ++ %(message)s', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'handlers' : { | 
					
						
							|  |  |  |             'hand1' : { | 
					
						
							|  |  |  |                 'class' : 'logging.StreamHandler', | 
					
						
							|  |  |  |                 'formatter' : 'form1', | 
					
						
							|  |  |  |                 'level' : 'NOTSET', | 
					
						
							|  |  |  |                 'stream'  : 'ext://sys.stdout', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'loggers' : { | 
					
						
							|  |  |  |             'compiler.parser' : { | 
					
						
							|  |  |  |                 'level' : 'DEBUG', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'root' : { | 
					
						
							|  |  |  |             'level' : 'WARNING', | 
					
						
							|  |  |  |             'handlers' : ['hand1'], | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  |     # config2 has a subtle configuration error that should be reported | 
					
						
							|  |  |  |     config2 = { | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,77973,77979,77985-77986,78009,78029,78031-78033,78081,78085,78103,78105-78106,78108,78246,78703,78728,78731,78853,78855 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 12:48:53 -0600 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 14:18:28 -0600 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r77973 | vinay.sajip | 2010-02-04 14:23:45 -0600 (Thu, 04 Feb 2010) | 1 line
  Issue #7851: logging: clarification on logging configuration files.
........
  r77979 | vinay.sajip | 2010-02-04 15:40:56 -0600 (Thu, 04 Feb 2010) | 1 line
  Added unit test for cfg:// resolution.
........
  r77985 | vinay.sajip | 2010-02-05 08:52:05 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener test now uses find_unused_port().
........
  r77986 | vinay.sajip | 2010-02-05 09:40:20 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener tests disabled for now.
........
  r78009 | vinay.sajip | 2010-02-05 17:43:11 -0600 (Fri, 05 Feb 2010) | 1 line
  test_logging: minor tweaks to timeouts, listening tests marked as skipped.
........
  r78029 | vinay.sajip | 2010-02-06 14:00:43 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Tentatively re-enabling one test to see effect on buildbots.
........
  r78031 | vinay.sajip | 2010-02-06 14:28:36 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Gave server thread more time to get ready, and re-enabled a skipped test.
........
  r78032 | georg.brandl | 2010-02-06 15:54:40 -0600 (Sat, 06 Feb 2010) | 1 line
  Remove unused imports from test_logging.
........
  r78033 | benjamin.peterson | 2010-02-06 16:08:15 -0600 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78081 | vinay.sajip | 2010-02-07 06:56:54 -0600 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 07:06:51 -0600 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78103 | vinay.sajip | 2010-02-08 00:50:14 -0600 (Mon, 08 Feb 2010) | 1 line
  Removed spurious print statement in test.
........
  r78105 | vinay.sajip | 2010-02-08 09:32:08 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: skipped listening tests because they're not working reliably.
........
  r78106 | vinay.sajip | 2010-02-08 10:05:50 -0600 (Mon, 08 Feb 2010) | 1 line
  Issue #7857: Another attempt to keep the buildbots happy.
........
  r78108 | vinay.sajip | 2010-02-08 15:18:15 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
  r78246 | vinay.sajip | 2010-02-19 17:53:17 -0600 (Fri, 19 Feb 2010) | 1 line
  logging: Documented warnings module integration.
........
  r78703 | vinay.sajip | 2010-03-05 16:11:24 -0600 (Fri, 05 Mar 2010) | 1 line
  Factored out time usage determination into a method, to facilitate alternative formatting implementations in the future.
........
  r78728 | vinay.sajip | 2010-03-06 09:12:08 -0600 (Sat, 06 Mar 2010) | 1 line
  Added schema version test in dictConfig.
........
  r78731 | vinay.sajip | 2010-03-06 09:56:03 -0600 (Sat, 06 Mar 2010) | 1 line
  Added checks for tuples in dictConfig.
........
  r78853 | vinay.sajip | 2010-03-12 00:01:21 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: logging: Improved algorithm for computing initial rollover time.
........
  r78855 | vinay.sajip | 2010-03-12 03:16:10 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: Updated NEWS entry and added to logging documentation.
........
											
										 
											2010-03-13 22:30:34 +00:00
										 |  |  |         'version': 1, | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  |         'formatters': { | 
					
						
							|  |  |  |             'form1' : { | 
					
						
							|  |  |  |                 'format' : '%(levelname)s ++ %(message)s', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'handlers' : { | 
					
						
							|  |  |  |             'hand1' : { | 
					
						
							|  |  |  |                 'class' : 'logging.StreamHandler', | 
					
						
							|  |  |  |                 'formatter' : 'form1', | 
					
						
							|  |  |  |                 'level' : 'NOTSET', | 
					
						
							|  |  |  |                 'stream'  : 'ext://sys.stdbout', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'loggers' : { | 
					
						
							|  |  |  |             'compiler.parser' : { | 
					
						
							|  |  |  |                 'level' : 'DEBUG', | 
					
						
							|  |  |  |                 'handlers' : ['hand1'], | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'root' : { | 
					
						
							|  |  |  |             'level' : 'WARNING', | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     #As config1 but with a misspelt level on a handler | 
					
						
							|  |  |  |     config2a = { | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,77973,77979,77985-77986,78009,78029,78031-78033,78081,78085,78103,78105-78106,78108,78246,78703,78728,78731,78853,78855 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 12:48:53 -0600 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 14:18:28 -0600 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r77973 | vinay.sajip | 2010-02-04 14:23:45 -0600 (Thu, 04 Feb 2010) | 1 line
  Issue #7851: logging: clarification on logging configuration files.
........
  r77979 | vinay.sajip | 2010-02-04 15:40:56 -0600 (Thu, 04 Feb 2010) | 1 line
  Added unit test for cfg:// resolution.
........
  r77985 | vinay.sajip | 2010-02-05 08:52:05 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener test now uses find_unused_port().
........
  r77986 | vinay.sajip | 2010-02-05 09:40:20 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener tests disabled for now.
........
  r78009 | vinay.sajip | 2010-02-05 17:43:11 -0600 (Fri, 05 Feb 2010) | 1 line
  test_logging: minor tweaks to timeouts, listening tests marked as skipped.
........
  r78029 | vinay.sajip | 2010-02-06 14:00:43 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Tentatively re-enabling one test to see effect on buildbots.
........
  r78031 | vinay.sajip | 2010-02-06 14:28:36 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Gave server thread more time to get ready, and re-enabled a skipped test.
........
  r78032 | georg.brandl | 2010-02-06 15:54:40 -0600 (Sat, 06 Feb 2010) | 1 line
  Remove unused imports from test_logging.
........
  r78033 | benjamin.peterson | 2010-02-06 16:08:15 -0600 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78081 | vinay.sajip | 2010-02-07 06:56:54 -0600 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 07:06:51 -0600 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78103 | vinay.sajip | 2010-02-08 00:50:14 -0600 (Mon, 08 Feb 2010) | 1 line
  Removed spurious print statement in test.
........
  r78105 | vinay.sajip | 2010-02-08 09:32:08 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: skipped listening tests because they're not working reliably.
........
  r78106 | vinay.sajip | 2010-02-08 10:05:50 -0600 (Mon, 08 Feb 2010) | 1 line
  Issue #7857: Another attempt to keep the buildbots happy.
........
  r78108 | vinay.sajip | 2010-02-08 15:18:15 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
  r78246 | vinay.sajip | 2010-02-19 17:53:17 -0600 (Fri, 19 Feb 2010) | 1 line
  logging: Documented warnings module integration.
........
  r78703 | vinay.sajip | 2010-03-05 16:11:24 -0600 (Fri, 05 Mar 2010) | 1 line
  Factored out time usage determination into a method, to facilitate alternative formatting implementations in the future.
........
  r78728 | vinay.sajip | 2010-03-06 09:12:08 -0600 (Sat, 06 Mar 2010) | 1 line
  Added schema version test in dictConfig.
........
  r78731 | vinay.sajip | 2010-03-06 09:56:03 -0600 (Sat, 06 Mar 2010) | 1 line
  Added checks for tuples in dictConfig.
........
  r78853 | vinay.sajip | 2010-03-12 00:01:21 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: logging: Improved algorithm for computing initial rollover time.
........
  r78855 | vinay.sajip | 2010-03-12 03:16:10 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: Updated NEWS entry and added to logging documentation.
........
											
										 
											2010-03-13 22:30:34 +00:00
										 |  |  |         'version': 1, | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  |         'formatters': { | 
					
						
							|  |  |  |             'form1' : { | 
					
						
							|  |  |  |                 'format' : '%(levelname)s ++ %(message)s', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'handlers' : { | 
					
						
							|  |  |  |             'hand1' : { | 
					
						
							|  |  |  |                 'class' : 'logging.StreamHandler', | 
					
						
							|  |  |  |                 'formatter' : 'form1', | 
					
						
							|  |  |  |                 'level' : 'NTOSET', | 
					
						
							|  |  |  |                 'stream'  : 'ext://sys.stdout', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'loggers' : { | 
					
						
							|  |  |  |             'compiler.parser' : { | 
					
						
							|  |  |  |                 'level' : 'DEBUG', | 
					
						
							|  |  |  |                 'handlers' : ['hand1'], | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'root' : { | 
					
						
							|  |  |  |             'level' : 'WARNING', | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     #As config1 but with a misspelt level on a logger | 
					
						
							|  |  |  |     config2b = { | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,77973,77979,77985-77986,78009,78029,78031-78033,78081,78085,78103,78105-78106,78108,78246,78703,78728,78731,78853,78855 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 12:48:53 -0600 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 14:18:28 -0600 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r77973 | vinay.sajip | 2010-02-04 14:23:45 -0600 (Thu, 04 Feb 2010) | 1 line
  Issue #7851: logging: clarification on logging configuration files.
........
  r77979 | vinay.sajip | 2010-02-04 15:40:56 -0600 (Thu, 04 Feb 2010) | 1 line
  Added unit test for cfg:// resolution.
........
  r77985 | vinay.sajip | 2010-02-05 08:52:05 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener test now uses find_unused_port().
........
  r77986 | vinay.sajip | 2010-02-05 09:40:20 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener tests disabled for now.
........
  r78009 | vinay.sajip | 2010-02-05 17:43:11 -0600 (Fri, 05 Feb 2010) | 1 line
  test_logging: minor tweaks to timeouts, listening tests marked as skipped.
........
  r78029 | vinay.sajip | 2010-02-06 14:00:43 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Tentatively re-enabling one test to see effect on buildbots.
........
  r78031 | vinay.sajip | 2010-02-06 14:28:36 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Gave server thread more time to get ready, and re-enabled a skipped test.
........
  r78032 | georg.brandl | 2010-02-06 15:54:40 -0600 (Sat, 06 Feb 2010) | 1 line
  Remove unused imports from test_logging.
........
  r78033 | benjamin.peterson | 2010-02-06 16:08:15 -0600 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78081 | vinay.sajip | 2010-02-07 06:56:54 -0600 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 07:06:51 -0600 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78103 | vinay.sajip | 2010-02-08 00:50:14 -0600 (Mon, 08 Feb 2010) | 1 line
  Removed spurious print statement in test.
........
  r78105 | vinay.sajip | 2010-02-08 09:32:08 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: skipped listening tests because they're not working reliably.
........
  r78106 | vinay.sajip | 2010-02-08 10:05:50 -0600 (Mon, 08 Feb 2010) | 1 line
  Issue #7857: Another attempt to keep the buildbots happy.
........
  r78108 | vinay.sajip | 2010-02-08 15:18:15 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
  r78246 | vinay.sajip | 2010-02-19 17:53:17 -0600 (Fri, 19 Feb 2010) | 1 line
  logging: Documented warnings module integration.
........
  r78703 | vinay.sajip | 2010-03-05 16:11:24 -0600 (Fri, 05 Mar 2010) | 1 line
  Factored out time usage determination into a method, to facilitate alternative formatting implementations in the future.
........
  r78728 | vinay.sajip | 2010-03-06 09:12:08 -0600 (Sat, 06 Mar 2010) | 1 line
  Added schema version test in dictConfig.
........
  r78731 | vinay.sajip | 2010-03-06 09:56:03 -0600 (Sat, 06 Mar 2010) | 1 line
  Added checks for tuples in dictConfig.
........
  r78853 | vinay.sajip | 2010-03-12 00:01:21 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: logging: Improved algorithm for computing initial rollover time.
........
  r78855 | vinay.sajip | 2010-03-12 03:16:10 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: Updated NEWS entry and added to logging documentation.
........
											
										 
											2010-03-13 22:30:34 +00:00
										 |  |  |         'version': 1, | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  |         'formatters': { | 
					
						
							|  |  |  |             'form1' : { | 
					
						
							|  |  |  |                 'format' : '%(levelname)s ++ %(message)s', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'handlers' : { | 
					
						
							|  |  |  |             'hand1' : { | 
					
						
							|  |  |  |                 'class' : 'logging.StreamHandler', | 
					
						
							|  |  |  |                 'formatter' : 'form1', | 
					
						
							|  |  |  |                 'level' : 'NOTSET', | 
					
						
							|  |  |  |                 'stream'  : 'ext://sys.stdout', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'loggers' : { | 
					
						
							|  |  |  |             'compiler.parser' : { | 
					
						
							|  |  |  |                 'level' : 'DEBUG', | 
					
						
							|  |  |  |                 'handlers' : ['hand1'], | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'root' : { | 
					
						
							|  |  |  |             'level' : 'WRANING', | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     # config3 has a less subtle configuration error | 
					
						
							|  |  |  |     config3 = { | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,77973,77979,77985-77986,78009,78029,78031-78033,78081,78085,78103,78105-78106,78108,78246,78703,78728,78731,78853,78855 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 12:48:53 -0600 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 14:18:28 -0600 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r77973 | vinay.sajip | 2010-02-04 14:23:45 -0600 (Thu, 04 Feb 2010) | 1 line
  Issue #7851: logging: clarification on logging configuration files.
........
  r77979 | vinay.sajip | 2010-02-04 15:40:56 -0600 (Thu, 04 Feb 2010) | 1 line
  Added unit test for cfg:// resolution.
........
  r77985 | vinay.sajip | 2010-02-05 08:52:05 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener test now uses find_unused_port().
........
  r77986 | vinay.sajip | 2010-02-05 09:40:20 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener tests disabled for now.
........
  r78009 | vinay.sajip | 2010-02-05 17:43:11 -0600 (Fri, 05 Feb 2010) | 1 line
  test_logging: minor tweaks to timeouts, listening tests marked as skipped.
........
  r78029 | vinay.sajip | 2010-02-06 14:00:43 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Tentatively re-enabling one test to see effect on buildbots.
........
  r78031 | vinay.sajip | 2010-02-06 14:28:36 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Gave server thread more time to get ready, and re-enabled a skipped test.
........
  r78032 | georg.brandl | 2010-02-06 15:54:40 -0600 (Sat, 06 Feb 2010) | 1 line
  Remove unused imports from test_logging.
........
  r78033 | benjamin.peterson | 2010-02-06 16:08:15 -0600 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78081 | vinay.sajip | 2010-02-07 06:56:54 -0600 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 07:06:51 -0600 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78103 | vinay.sajip | 2010-02-08 00:50:14 -0600 (Mon, 08 Feb 2010) | 1 line
  Removed spurious print statement in test.
........
  r78105 | vinay.sajip | 2010-02-08 09:32:08 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: skipped listening tests because they're not working reliably.
........
  r78106 | vinay.sajip | 2010-02-08 10:05:50 -0600 (Mon, 08 Feb 2010) | 1 line
  Issue #7857: Another attempt to keep the buildbots happy.
........
  r78108 | vinay.sajip | 2010-02-08 15:18:15 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
  r78246 | vinay.sajip | 2010-02-19 17:53:17 -0600 (Fri, 19 Feb 2010) | 1 line
  logging: Documented warnings module integration.
........
  r78703 | vinay.sajip | 2010-03-05 16:11:24 -0600 (Fri, 05 Mar 2010) | 1 line
  Factored out time usage determination into a method, to facilitate alternative formatting implementations in the future.
........
  r78728 | vinay.sajip | 2010-03-06 09:12:08 -0600 (Sat, 06 Mar 2010) | 1 line
  Added schema version test in dictConfig.
........
  r78731 | vinay.sajip | 2010-03-06 09:56:03 -0600 (Sat, 06 Mar 2010) | 1 line
  Added checks for tuples in dictConfig.
........
  r78853 | vinay.sajip | 2010-03-12 00:01:21 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: logging: Improved algorithm for computing initial rollover time.
........
  r78855 | vinay.sajip | 2010-03-12 03:16:10 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: Updated NEWS entry and added to logging documentation.
........
											
										 
											2010-03-13 22:30:34 +00:00
										 |  |  |         'version': 1, | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  |         'formatters': { | 
					
						
							|  |  |  |             'form1' : { | 
					
						
							|  |  |  |                 'format' : '%(levelname)s ++ %(message)s', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'handlers' : { | 
					
						
							|  |  |  |             'hand1' : { | 
					
						
							|  |  |  |                 'class' : 'logging.StreamHandler', | 
					
						
							|  |  |  |                 'formatter' : 'misspelled_name', | 
					
						
							|  |  |  |                 'level' : 'NOTSET', | 
					
						
							|  |  |  |                 'stream'  : 'ext://sys.stdout', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'loggers' : { | 
					
						
							|  |  |  |             'compiler.parser' : { | 
					
						
							|  |  |  |                 'level' : 'DEBUG', | 
					
						
							|  |  |  |                 'handlers' : ['hand1'], | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'root' : { | 
					
						
							|  |  |  |             'level' : 'WARNING', | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     # config4 specifies a custom formatter class to be loaded | 
					
						
							|  |  |  |     config4 = { | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,77973,77979,77985-77986,78009,78029,78031-78033,78081,78085,78103,78105-78106,78108,78246,78703,78728,78731,78853,78855 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 12:48:53 -0600 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 14:18:28 -0600 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r77973 | vinay.sajip | 2010-02-04 14:23:45 -0600 (Thu, 04 Feb 2010) | 1 line
  Issue #7851: logging: clarification on logging configuration files.
........
  r77979 | vinay.sajip | 2010-02-04 15:40:56 -0600 (Thu, 04 Feb 2010) | 1 line
  Added unit test for cfg:// resolution.
........
  r77985 | vinay.sajip | 2010-02-05 08:52:05 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener test now uses find_unused_port().
........
  r77986 | vinay.sajip | 2010-02-05 09:40:20 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener tests disabled for now.
........
  r78009 | vinay.sajip | 2010-02-05 17:43:11 -0600 (Fri, 05 Feb 2010) | 1 line
  test_logging: minor tweaks to timeouts, listening tests marked as skipped.
........
  r78029 | vinay.sajip | 2010-02-06 14:00:43 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Tentatively re-enabling one test to see effect on buildbots.
........
  r78031 | vinay.sajip | 2010-02-06 14:28:36 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Gave server thread more time to get ready, and re-enabled a skipped test.
........
  r78032 | georg.brandl | 2010-02-06 15:54:40 -0600 (Sat, 06 Feb 2010) | 1 line
  Remove unused imports from test_logging.
........
  r78033 | benjamin.peterson | 2010-02-06 16:08:15 -0600 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78081 | vinay.sajip | 2010-02-07 06:56:54 -0600 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 07:06:51 -0600 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78103 | vinay.sajip | 2010-02-08 00:50:14 -0600 (Mon, 08 Feb 2010) | 1 line
  Removed spurious print statement in test.
........
  r78105 | vinay.sajip | 2010-02-08 09:32:08 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: skipped listening tests because they're not working reliably.
........
  r78106 | vinay.sajip | 2010-02-08 10:05:50 -0600 (Mon, 08 Feb 2010) | 1 line
  Issue #7857: Another attempt to keep the buildbots happy.
........
  r78108 | vinay.sajip | 2010-02-08 15:18:15 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
  r78246 | vinay.sajip | 2010-02-19 17:53:17 -0600 (Fri, 19 Feb 2010) | 1 line
  logging: Documented warnings module integration.
........
  r78703 | vinay.sajip | 2010-03-05 16:11:24 -0600 (Fri, 05 Mar 2010) | 1 line
  Factored out time usage determination into a method, to facilitate alternative formatting implementations in the future.
........
  r78728 | vinay.sajip | 2010-03-06 09:12:08 -0600 (Sat, 06 Mar 2010) | 1 line
  Added schema version test in dictConfig.
........
  r78731 | vinay.sajip | 2010-03-06 09:56:03 -0600 (Sat, 06 Mar 2010) | 1 line
  Added checks for tuples in dictConfig.
........
  r78853 | vinay.sajip | 2010-03-12 00:01:21 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: logging: Improved algorithm for computing initial rollover time.
........
  r78855 | vinay.sajip | 2010-03-12 03:16:10 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: Updated NEWS entry and added to logging documentation.
........
											
										 
											2010-03-13 22:30:34 +00:00
										 |  |  |         'version': 1, | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  |         'formatters': { | 
					
						
							|  |  |  |             'form1' : { | 
					
						
							|  |  |  |                 '()' : __name__ + '.ExceptionFormatter', | 
					
						
							|  |  |  |                 'format' : '%(levelname)s:%(name)s:%(message)s', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'handlers' : { | 
					
						
							|  |  |  |             'hand1' : { | 
					
						
							|  |  |  |                 'class' : 'logging.StreamHandler', | 
					
						
							|  |  |  |                 'formatter' : 'form1', | 
					
						
							|  |  |  |                 'level' : 'NOTSET', | 
					
						
							|  |  |  |                 'stream'  : 'ext://sys.stdout', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'root' : { | 
					
						
							|  |  |  |             'level' : 'NOTSET', | 
					
						
							|  |  |  |                 'handlers' : ['hand1'], | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     # As config4 but using an actual callable rather than a string | 
					
						
							|  |  |  |     config4a = { | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,77973,77979,77985-77986,78009,78029,78031-78033,78081,78085,78103,78105-78106,78108,78246,78703,78728,78731,78853,78855 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 12:48:53 -0600 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 14:18:28 -0600 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r77973 | vinay.sajip | 2010-02-04 14:23:45 -0600 (Thu, 04 Feb 2010) | 1 line
  Issue #7851: logging: clarification on logging configuration files.
........
  r77979 | vinay.sajip | 2010-02-04 15:40:56 -0600 (Thu, 04 Feb 2010) | 1 line
  Added unit test for cfg:// resolution.
........
  r77985 | vinay.sajip | 2010-02-05 08:52:05 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener test now uses find_unused_port().
........
  r77986 | vinay.sajip | 2010-02-05 09:40:20 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener tests disabled for now.
........
  r78009 | vinay.sajip | 2010-02-05 17:43:11 -0600 (Fri, 05 Feb 2010) | 1 line
  test_logging: minor tweaks to timeouts, listening tests marked as skipped.
........
  r78029 | vinay.sajip | 2010-02-06 14:00:43 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Tentatively re-enabling one test to see effect on buildbots.
........
  r78031 | vinay.sajip | 2010-02-06 14:28:36 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Gave server thread more time to get ready, and re-enabled a skipped test.
........
  r78032 | georg.brandl | 2010-02-06 15:54:40 -0600 (Sat, 06 Feb 2010) | 1 line
  Remove unused imports from test_logging.
........
  r78033 | benjamin.peterson | 2010-02-06 16:08:15 -0600 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78081 | vinay.sajip | 2010-02-07 06:56:54 -0600 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 07:06:51 -0600 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78103 | vinay.sajip | 2010-02-08 00:50:14 -0600 (Mon, 08 Feb 2010) | 1 line
  Removed spurious print statement in test.
........
  r78105 | vinay.sajip | 2010-02-08 09:32:08 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: skipped listening tests because they're not working reliably.
........
  r78106 | vinay.sajip | 2010-02-08 10:05:50 -0600 (Mon, 08 Feb 2010) | 1 line
  Issue #7857: Another attempt to keep the buildbots happy.
........
  r78108 | vinay.sajip | 2010-02-08 15:18:15 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
  r78246 | vinay.sajip | 2010-02-19 17:53:17 -0600 (Fri, 19 Feb 2010) | 1 line
  logging: Documented warnings module integration.
........
  r78703 | vinay.sajip | 2010-03-05 16:11:24 -0600 (Fri, 05 Mar 2010) | 1 line
  Factored out time usage determination into a method, to facilitate alternative formatting implementations in the future.
........
  r78728 | vinay.sajip | 2010-03-06 09:12:08 -0600 (Sat, 06 Mar 2010) | 1 line
  Added schema version test in dictConfig.
........
  r78731 | vinay.sajip | 2010-03-06 09:56:03 -0600 (Sat, 06 Mar 2010) | 1 line
  Added checks for tuples in dictConfig.
........
  r78853 | vinay.sajip | 2010-03-12 00:01:21 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: logging: Improved algorithm for computing initial rollover time.
........
  r78855 | vinay.sajip | 2010-03-12 03:16:10 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: Updated NEWS entry and added to logging documentation.
........
											
										 
											2010-03-13 22:30:34 +00:00
										 |  |  |         'version': 1, | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  |         'formatters': { | 
					
						
							|  |  |  |             'form1' : { | 
					
						
							|  |  |  |                 '()' : ExceptionFormatter, | 
					
						
							|  |  |  |                 'format' : '%(levelname)s:%(name)s:%(message)s', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |             'form2' : { | 
					
						
							|  |  |  |                 '()' : __name__ + '.formatFunc', | 
					
						
							|  |  |  |                 'format' : '%(levelname)s:%(name)s:%(message)s', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |             'form3' : { | 
					
						
							|  |  |  |                 '()' : formatFunc, | 
					
						
							|  |  |  |                 'format' : '%(levelname)s:%(name)s:%(message)s', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'handlers' : { | 
					
						
							|  |  |  |             'hand1' : { | 
					
						
							|  |  |  |                 'class' : 'logging.StreamHandler', | 
					
						
							|  |  |  |                 'formatter' : 'form1', | 
					
						
							|  |  |  |                 'level' : 'NOTSET', | 
					
						
							|  |  |  |                 'stream'  : 'ext://sys.stdout', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |             'hand2' : { | 
					
						
							|  |  |  |                 '()' : handlerFunc, | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'root' : { | 
					
						
							|  |  |  |             'level' : 'NOTSET', | 
					
						
							|  |  |  |                 'handlers' : ['hand1'], | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     # config5 specifies a custom handler class to be loaded | 
					
						
							|  |  |  |     config5 = { | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,77973,77979,77985-77986,78009,78029,78031-78033,78081,78085,78103,78105-78106,78108,78246,78703,78728,78731,78853,78855 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 12:48:53 -0600 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 14:18:28 -0600 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r77973 | vinay.sajip | 2010-02-04 14:23:45 -0600 (Thu, 04 Feb 2010) | 1 line
  Issue #7851: logging: clarification on logging configuration files.
........
  r77979 | vinay.sajip | 2010-02-04 15:40:56 -0600 (Thu, 04 Feb 2010) | 1 line
  Added unit test for cfg:// resolution.
........
  r77985 | vinay.sajip | 2010-02-05 08:52:05 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener test now uses find_unused_port().
........
  r77986 | vinay.sajip | 2010-02-05 09:40:20 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener tests disabled for now.
........
  r78009 | vinay.sajip | 2010-02-05 17:43:11 -0600 (Fri, 05 Feb 2010) | 1 line
  test_logging: minor tweaks to timeouts, listening tests marked as skipped.
........
  r78029 | vinay.sajip | 2010-02-06 14:00:43 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Tentatively re-enabling one test to see effect on buildbots.
........
  r78031 | vinay.sajip | 2010-02-06 14:28:36 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Gave server thread more time to get ready, and re-enabled a skipped test.
........
  r78032 | georg.brandl | 2010-02-06 15:54:40 -0600 (Sat, 06 Feb 2010) | 1 line
  Remove unused imports from test_logging.
........
  r78033 | benjamin.peterson | 2010-02-06 16:08:15 -0600 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78081 | vinay.sajip | 2010-02-07 06:56:54 -0600 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 07:06:51 -0600 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78103 | vinay.sajip | 2010-02-08 00:50:14 -0600 (Mon, 08 Feb 2010) | 1 line
  Removed spurious print statement in test.
........
  r78105 | vinay.sajip | 2010-02-08 09:32:08 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: skipped listening tests because they're not working reliably.
........
  r78106 | vinay.sajip | 2010-02-08 10:05:50 -0600 (Mon, 08 Feb 2010) | 1 line
  Issue #7857: Another attempt to keep the buildbots happy.
........
  r78108 | vinay.sajip | 2010-02-08 15:18:15 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
  r78246 | vinay.sajip | 2010-02-19 17:53:17 -0600 (Fri, 19 Feb 2010) | 1 line
  logging: Documented warnings module integration.
........
  r78703 | vinay.sajip | 2010-03-05 16:11:24 -0600 (Fri, 05 Mar 2010) | 1 line
  Factored out time usage determination into a method, to facilitate alternative formatting implementations in the future.
........
  r78728 | vinay.sajip | 2010-03-06 09:12:08 -0600 (Sat, 06 Mar 2010) | 1 line
  Added schema version test in dictConfig.
........
  r78731 | vinay.sajip | 2010-03-06 09:56:03 -0600 (Sat, 06 Mar 2010) | 1 line
  Added checks for tuples in dictConfig.
........
  r78853 | vinay.sajip | 2010-03-12 00:01:21 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: logging: Improved algorithm for computing initial rollover time.
........
  r78855 | vinay.sajip | 2010-03-12 03:16:10 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: Updated NEWS entry and added to logging documentation.
........
											
										 
											2010-03-13 22:30:34 +00:00
										 |  |  |         'version': 1, | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  |         'formatters': { | 
					
						
							|  |  |  |             'form1' : { | 
					
						
							|  |  |  |                 'format' : '%(levelname)s ++ %(message)s', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'handlers' : { | 
					
						
							|  |  |  |             'hand1' : { | 
					
						
							|  |  |  |                 'class' : __name__ + '.CustomHandler', | 
					
						
							|  |  |  |                 'formatter' : 'form1', | 
					
						
							|  |  |  |                 'level' : 'NOTSET', | 
					
						
							|  |  |  |                 'stream'  : 'ext://sys.stdout', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'loggers' : { | 
					
						
							|  |  |  |             'compiler.parser' : { | 
					
						
							|  |  |  |                 'level' : 'DEBUG', | 
					
						
							|  |  |  |                 'handlers' : ['hand1'], | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'root' : { | 
					
						
							|  |  |  |             'level' : 'WARNING', | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     # config6 specifies a custom handler class to be loaded | 
					
						
							|  |  |  |     # but has bad arguments | 
					
						
							|  |  |  |     config6 = { | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,77973,77979,77985-77986,78009,78029,78031-78033,78081,78085,78103,78105-78106,78108,78246,78703,78728,78731,78853,78855 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 12:48:53 -0600 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 14:18:28 -0600 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r77973 | vinay.sajip | 2010-02-04 14:23:45 -0600 (Thu, 04 Feb 2010) | 1 line
  Issue #7851: logging: clarification on logging configuration files.
........
  r77979 | vinay.sajip | 2010-02-04 15:40:56 -0600 (Thu, 04 Feb 2010) | 1 line
  Added unit test for cfg:// resolution.
........
  r77985 | vinay.sajip | 2010-02-05 08:52:05 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener test now uses find_unused_port().
........
  r77986 | vinay.sajip | 2010-02-05 09:40:20 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener tests disabled for now.
........
  r78009 | vinay.sajip | 2010-02-05 17:43:11 -0600 (Fri, 05 Feb 2010) | 1 line
  test_logging: minor tweaks to timeouts, listening tests marked as skipped.
........
  r78029 | vinay.sajip | 2010-02-06 14:00:43 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Tentatively re-enabling one test to see effect on buildbots.
........
  r78031 | vinay.sajip | 2010-02-06 14:28:36 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Gave server thread more time to get ready, and re-enabled a skipped test.
........
  r78032 | georg.brandl | 2010-02-06 15:54:40 -0600 (Sat, 06 Feb 2010) | 1 line
  Remove unused imports from test_logging.
........
  r78033 | benjamin.peterson | 2010-02-06 16:08:15 -0600 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78081 | vinay.sajip | 2010-02-07 06:56:54 -0600 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 07:06:51 -0600 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78103 | vinay.sajip | 2010-02-08 00:50:14 -0600 (Mon, 08 Feb 2010) | 1 line
  Removed spurious print statement in test.
........
  r78105 | vinay.sajip | 2010-02-08 09:32:08 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: skipped listening tests because they're not working reliably.
........
  r78106 | vinay.sajip | 2010-02-08 10:05:50 -0600 (Mon, 08 Feb 2010) | 1 line
  Issue #7857: Another attempt to keep the buildbots happy.
........
  r78108 | vinay.sajip | 2010-02-08 15:18:15 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
  r78246 | vinay.sajip | 2010-02-19 17:53:17 -0600 (Fri, 19 Feb 2010) | 1 line
  logging: Documented warnings module integration.
........
  r78703 | vinay.sajip | 2010-03-05 16:11:24 -0600 (Fri, 05 Mar 2010) | 1 line
  Factored out time usage determination into a method, to facilitate alternative formatting implementations in the future.
........
  r78728 | vinay.sajip | 2010-03-06 09:12:08 -0600 (Sat, 06 Mar 2010) | 1 line
  Added schema version test in dictConfig.
........
  r78731 | vinay.sajip | 2010-03-06 09:56:03 -0600 (Sat, 06 Mar 2010) | 1 line
  Added checks for tuples in dictConfig.
........
  r78853 | vinay.sajip | 2010-03-12 00:01:21 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: logging: Improved algorithm for computing initial rollover time.
........
  r78855 | vinay.sajip | 2010-03-12 03:16:10 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: Updated NEWS entry and added to logging documentation.
........
											
										 
											2010-03-13 22:30:34 +00:00
										 |  |  |         'version': 1, | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  |         'formatters': { | 
					
						
							|  |  |  |             'form1' : { | 
					
						
							|  |  |  |                 'format' : '%(levelname)s ++ %(message)s', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'handlers' : { | 
					
						
							|  |  |  |             'hand1' : { | 
					
						
							|  |  |  |                 'class' : __name__ + '.CustomHandler', | 
					
						
							|  |  |  |                 'formatter' : 'form1', | 
					
						
							|  |  |  |                 'level' : 'NOTSET', | 
					
						
							|  |  |  |                 'stream'  : 'ext://sys.stdout', | 
					
						
							|  |  |  |                 '9' : 'invalid parameter name', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'loggers' : { | 
					
						
							|  |  |  |             'compiler.parser' : { | 
					
						
							|  |  |  |                 'level' : 'DEBUG', | 
					
						
							|  |  |  |                 'handlers' : ['hand1'], | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'root' : { | 
					
						
							|  |  |  |             'level' : 'WARNING', | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     #config 7 does not define compiler.parser but defines compiler.lexer | 
					
						
							|  |  |  |     #so compiler.parser should be disabled after applying it | 
					
						
							|  |  |  |     config7 = { | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,77973,77979,77985-77986,78009,78029,78031-78033,78081,78085,78103,78105-78106,78108,78246,78703,78728,78731,78853,78855 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 12:48:53 -0600 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 14:18:28 -0600 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r77973 | vinay.sajip | 2010-02-04 14:23:45 -0600 (Thu, 04 Feb 2010) | 1 line
  Issue #7851: logging: clarification on logging configuration files.
........
  r77979 | vinay.sajip | 2010-02-04 15:40:56 -0600 (Thu, 04 Feb 2010) | 1 line
  Added unit test for cfg:// resolution.
........
  r77985 | vinay.sajip | 2010-02-05 08:52:05 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener test now uses find_unused_port().
........
  r77986 | vinay.sajip | 2010-02-05 09:40:20 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener tests disabled for now.
........
  r78009 | vinay.sajip | 2010-02-05 17:43:11 -0600 (Fri, 05 Feb 2010) | 1 line
  test_logging: minor tweaks to timeouts, listening tests marked as skipped.
........
  r78029 | vinay.sajip | 2010-02-06 14:00:43 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Tentatively re-enabling one test to see effect on buildbots.
........
  r78031 | vinay.sajip | 2010-02-06 14:28:36 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Gave server thread more time to get ready, and re-enabled a skipped test.
........
  r78032 | georg.brandl | 2010-02-06 15:54:40 -0600 (Sat, 06 Feb 2010) | 1 line
  Remove unused imports from test_logging.
........
  r78033 | benjamin.peterson | 2010-02-06 16:08:15 -0600 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78081 | vinay.sajip | 2010-02-07 06:56:54 -0600 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 07:06:51 -0600 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78103 | vinay.sajip | 2010-02-08 00:50:14 -0600 (Mon, 08 Feb 2010) | 1 line
  Removed spurious print statement in test.
........
  r78105 | vinay.sajip | 2010-02-08 09:32:08 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: skipped listening tests because they're not working reliably.
........
  r78106 | vinay.sajip | 2010-02-08 10:05:50 -0600 (Mon, 08 Feb 2010) | 1 line
  Issue #7857: Another attempt to keep the buildbots happy.
........
  r78108 | vinay.sajip | 2010-02-08 15:18:15 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
  r78246 | vinay.sajip | 2010-02-19 17:53:17 -0600 (Fri, 19 Feb 2010) | 1 line
  logging: Documented warnings module integration.
........
  r78703 | vinay.sajip | 2010-03-05 16:11:24 -0600 (Fri, 05 Mar 2010) | 1 line
  Factored out time usage determination into a method, to facilitate alternative formatting implementations in the future.
........
  r78728 | vinay.sajip | 2010-03-06 09:12:08 -0600 (Sat, 06 Mar 2010) | 1 line
  Added schema version test in dictConfig.
........
  r78731 | vinay.sajip | 2010-03-06 09:56:03 -0600 (Sat, 06 Mar 2010) | 1 line
  Added checks for tuples in dictConfig.
........
  r78853 | vinay.sajip | 2010-03-12 00:01:21 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: logging: Improved algorithm for computing initial rollover time.
........
  r78855 | vinay.sajip | 2010-03-12 03:16:10 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: Updated NEWS entry and added to logging documentation.
........
											
										 
											2010-03-13 22:30:34 +00:00
										 |  |  |         'version': 1, | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  |         'formatters': { | 
					
						
							|  |  |  |             'form1' : { | 
					
						
							|  |  |  |                 'format' : '%(levelname)s ++ %(message)s', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'handlers' : { | 
					
						
							|  |  |  |             'hand1' : { | 
					
						
							|  |  |  |                 'class' : 'logging.StreamHandler', | 
					
						
							|  |  |  |                 'formatter' : 'form1', | 
					
						
							|  |  |  |                 'level' : 'NOTSET', | 
					
						
							|  |  |  |                 'stream'  : 'ext://sys.stdout', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'loggers' : { | 
					
						
							|  |  |  |             'compiler.lexer' : { | 
					
						
							|  |  |  |                 'level' : 'DEBUG', | 
					
						
							|  |  |  |                 'handlers' : ['hand1'], | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'root' : { | 
					
						
							|  |  |  |             'level' : 'WARNING', | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-03-07 18:02:57 +00:00
										 |  |  |     # config8 defines both compiler and compiler.lexer | 
					
						
							|  |  |  |     # so compiler.parser should not be disabled (since | 
					
						
							|  |  |  |     # compiler is defined) | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  |     config8 = { | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,77973,77979,77985-77986,78009,78029,78031-78033,78081,78085,78103,78105-78106,78108,78246,78703,78728,78731,78853,78855 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 12:48:53 -0600 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 14:18:28 -0600 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r77973 | vinay.sajip | 2010-02-04 14:23:45 -0600 (Thu, 04 Feb 2010) | 1 line
  Issue #7851: logging: clarification on logging configuration files.
........
  r77979 | vinay.sajip | 2010-02-04 15:40:56 -0600 (Thu, 04 Feb 2010) | 1 line
  Added unit test for cfg:// resolution.
........
  r77985 | vinay.sajip | 2010-02-05 08:52:05 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener test now uses find_unused_port().
........
  r77986 | vinay.sajip | 2010-02-05 09:40:20 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener tests disabled for now.
........
  r78009 | vinay.sajip | 2010-02-05 17:43:11 -0600 (Fri, 05 Feb 2010) | 1 line
  test_logging: minor tweaks to timeouts, listening tests marked as skipped.
........
  r78029 | vinay.sajip | 2010-02-06 14:00:43 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Tentatively re-enabling one test to see effect on buildbots.
........
  r78031 | vinay.sajip | 2010-02-06 14:28:36 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Gave server thread more time to get ready, and re-enabled a skipped test.
........
  r78032 | georg.brandl | 2010-02-06 15:54:40 -0600 (Sat, 06 Feb 2010) | 1 line
  Remove unused imports from test_logging.
........
  r78033 | benjamin.peterson | 2010-02-06 16:08:15 -0600 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78081 | vinay.sajip | 2010-02-07 06:56:54 -0600 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 07:06:51 -0600 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78103 | vinay.sajip | 2010-02-08 00:50:14 -0600 (Mon, 08 Feb 2010) | 1 line
  Removed spurious print statement in test.
........
  r78105 | vinay.sajip | 2010-02-08 09:32:08 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: skipped listening tests because they're not working reliably.
........
  r78106 | vinay.sajip | 2010-02-08 10:05:50 -0600 (Mon, 08 Feb 2010) | 1 line
  Issue #7857: Another attempt to keep the buildbots happy.
........
  r78108 | vinay.sajip | 2010-02-08 15:18:15 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
  r78246 | vinay.sajip | 2010-02-19 17:53:17 -0600 (Fri, 19 Feb 2010) | 1 line
  logging: Documented warnings module integration.
........
  r78703 | vinay.sajip | 2010-03-05 16:11:24 -0600 (Fri, 05 Mar 2010) | 1 line
  Factored out time usage determination into a method, to facilitate alternative formatting implementations in the future.
........
  r78728 | vinay.sajip | 2010-03-06 09:12:08 -0600 (Sat, 06 Mar 2010) | 1 line
  Added schema version test in dictConfig.
........
  r78731 | vinay.sajip | 2010-03-06 09:56:03 -0600 (Sat, 06 Mar 2010) | 1 line
  Added checks for tuples in dictConfig.
........
  r78853 | vinay.sajip | 2010-03-12 00:01:21 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: logging: Improved algorithm for computing initial rollover time.
........
  r78855 | vinay.sajip | 2010-03-12 03:16:10 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: Updated NEWS entry and added to logging documentation.
........
											
										 
											2010-03-13 22:30:34 +00:00
										 |  |  |         'version': 1, | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  |         'disable_existing_loggers' : False, | 
					
						
							|  |  |  |         'formatters': { | 
					
						
							|  |  |  |             'form1' : { | 
					
						
							|  |  |  |                 'format' : '%(levelname)s ++ %(message)s', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'handlers' : { | 
					
						
							|  |  |  |             'hand1' : { | 
					
						
							|  |  |  |                 'class' : 'logging.StreamHandler', | 
					
						
							|  |  |  |                 'formatter' : 'form1', | 
					
						
							|  |  |  |                 'level' : 'NOTSET', | 
					
						
							|  |  |  |                 'stream'  : 'ext://sys.stdout', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'loggers' : { | 
					
						
							|  |  |  |             'compiler' : { | 
					
						
							|  |  |  |                 'level' : 'DEBUG', | 
					
						
							|  |  |  |                 'handlers' : ['hand1'], | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |             'compiler.lexer' : { | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'root' : { | 
					
						
							|  |  |  |             'level' : 'WARNING', | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-03-07 18:02:57 +00:00
										 |  |  |     # config8a disables existing loggers | 
					
						
							|  |  |  |     config8a = { | 
					
						
							|  |  |  |         'version': 1, | 
					
						
							|  |  |  |         'disable_existing_loggers' : True, | 
					
						
							|  |  |  |         'formatters': { | 
					
						
							|  |  |  |             'form1' : { | 
					
						
							|  |  |  |                 'format' : '%(levelname)s ++ %(message)s', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'handlers' : { | 
					
						
							|  |  |  |             'hand1' : { | 
					
						
							|  |  |  |                 'class' : 'logging.StreamHandler', | 
					
						
							|  |  |  |                 'formatter' : 'form1', | 
					
						
							|  |  |  |                 'level' : 'NOTSET', | 
					
						
							|  |  |  |                 'stream'  : 'ext://sys.stdout', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'loggers' : { | 
					
						
							|  |  |  |             'compiler' : { | 
					
						
							|  |  |  |                 'level' : 'DEBUG', | 
					
						
							|  |  |  |                 'handlers' : ['hand1'], | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |             'compiler.lexer' : { | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'root' : { | 
					
						
							|  |  |  |             'level' : 'WARNING', | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  |     config9 = { | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,77973,77979,77985-77986,78009,78029,78031-78033,78081,78085,78103,78105-78106,78108,78246,78703,78728,78731,78853,78855 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 12:48:53 -0600 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 14:18:28 -0600 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r77973 | vinay.sajip | 2010-02-04 14:23:45 -0600 (Thu, 04 Feb 2010) | 1 line
  Issue #7851: logging: clarification on logging configuration files.
........
  r77979 | vinay.sajip | 2010-02-04 15:40:56 -0600 (Thu, 04 Feb 2010) | 1 line
  Added unit test for cfg:// resolution.
........
  r77985 | vinay.sajip | 2010-02-05 08:52:05 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener test now uses find_unused_port().
........
  r77986 | vinay.sajip | 2010-02-05 09:40:20 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener tests disabled for now.
........
  r78009 | vinay.sajip | 2010-02-05 17:43:11 -0600 (Fri, 05 Feb 2010) | 1 line
  test_logging: minor tweaks to timeouts, listening tests marked as skipped.
........
  r78029 | vinay.sajip | 2010-02-06 14:00:43 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Tentatively re-enabling one test to see effect on buildbots.
........
  r78031 | vinay.sajip | 2010-02-06 14:28:36 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Gave server thread more time to get ready, and re-enabled a skipped test.
........
  r78032 | georg.brandl | 2010-02-06 15:54:40 -0600 (Sat, 06 Feb 2010) | 1 line
  Remove unused imports from test_logging.
........
  r78033 | benjamin.peterson | 2010-02-06 16:08:15 -0600 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78081 | vinay.sajip | 2010-02-07 06:56:54 -0600 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 07:06:51 -0600 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78103 | vinay.sajip | 2010-02-08 00:50:14 -0600 (Mon, 08 Feb 2010) | 1 line
  Removed spurious print statement in test.
........
  r78105 | vinay.sajip | 2010-02-08 09:32:08 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: skipped listening tests because they're not working reliably.
........
  r78106 | vinay.sajip | 2010-02-08 10:05:50 -0600 (Mon, 08 Feb 2010) | 1 line
  Issue #7857: Another attempt to keep the buildbots happy.
........
  r78108 | vinay.sajip | 2010-02-08 15:18:15 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
  r78246 | vinay.sajip | 2010-02-19 17:53:17 -0600 (Fri, 19 Feb 2010) | 1 line
  logging: Documented warnings module integration.
........
  r78703 | vinay.sajip | 2010-03-05 16:11:24 -0600 (Fri, 05 Mar 2010) | 1 line
  Factored out time usage determination into a method, to facilitate alternative formatting implementations in the future.
........
  r78728 | vinay.sajip | 2010-03-06 09:12:08 -0600 (Sat, 06 Mar 2010) | 1 line
  Added schema version test in dictConfig.
........
  r78731 | vinay.sajip | 2010-03-06 09:56:03 -0600 (Sat, 06 Mar 2010) | 1 line
  Added checks for tuples in dictConfig.
........
  r78853 | vinay.sajip | 2010-03-12 00:01:21 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: logging: Improved algorithm for computing initial rollover time.
........
  r78855 | vinay.sajip | 2010-03-12 03:16:10 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: Updated NEWS entry and added to logging documentation.
........
											
										 
											2010-03-13 22:30:34 +00:00
										 |  |  |         'version': 1, | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  |         'formatters': { | 
					
						
							|  |  |  |             'form1' : { | 
					
						
							|  |  |  |                 'format' : '%(levelname)s ++ %(message)s', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'handlers' : { | 
					
						
							|  |  |  |             'hand1' : { | 
					
						
							|  |  |  |                 'class' : 'logging.StreamHandler', | 
					
						
							|  |  |  |                 'formatter' : 'form1', | 
					
						
							|  |  |  |                 'level' : 'WARNING', | 
					
						
							|  |  |  |                 'stream'  : 'ext://sys.stdout', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'loggers' : { | 
					
						
							|  |  |  |             'compiler.parser' : { | 
					
						
							|  |  |  |                 'level' : 'WARNING', | 
					
						
							|  |  |  |                 'handlers' : ['hand1'], | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'root' : { | 
					
						
							|  |  |  |             'level' : 'NOTSET', | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     config9a = { | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,77973,77979,77985-77986,78009,78029,78031-78033,78081,78085,78103,78105-78106,78108,78246,78703,78728,78731,78853,78855 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 12:48:53 -0600 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 14:18:28 -0600 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r77973 | vinay.sajip | 2010-02-04 14:23:45 -0600 (Thu, 04 Feb 2010) | 1 line
  Issue #7851: logging: clarification on logging configuration files.
........
  r77979 | vinay.sajip | 2010-02-04 15:40:56 -0600 (Thu, 04 Feb 2010) | 1 line
  Added unit test for cfg:// resolution.
........
  r77985 | vinay.sajip | 2010-02-05 08:52:05 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener test now uses find_unused_port().
........
  r77986 | vinay.sajip | 2010-02-05 09:40:20 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener tests disabled for now.
........
  r78009 | vinay.sajip | 2010-02-05 17:43:11 -0600 (Fri, 05 Feb 2010) | 1 line
  test_logging: minor tweaks to timeouts, listening tests marked as skipped.
........
  r78029 | vinay.sajip | 2010-02-06 14:00:43 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Tentatively re-enabling one test to see effect on buildbots.
........
  r78031 | vinay.sajip | 2010-02-06 14:28:36 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Gave server thread more time to get ready, and re-enabled a skipped test.
........
  r78032 | georg.brandl | 2010-02-06 15:54:40 -0600 (Sat, 06 Feb 2010) | 1 line
  Remove unused imports from test_logging.
........
  r78033 | benjamin.peterson | 2010-02-06 16:08:15 -0600 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78081 | vinay.sajip | 2010-02-07 06:56:54 -0600 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 07:06:51 -0600 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78103 | vinay.sajip | 2010-02-08 00:50:14 -0600 (Mon, 08 Feb 2010) | 1 line
  Removed spurious print statement in test.
........
  r78105 | vinay.sajip | 2010-02-08 09:32:08 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: skipped listening tests because they're not working reliably.
........
  r78106 | vinay.sajip | 2010-02-08 10:05:50 -0600 (Mon, 08 Feb 2010) | 1 line
  Issue #7857: Another attempt to keep the buildbots happy.
........
  r78108 | vinay.sajip | 2010-02-08 15:18:15 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
  r78246 | vinay.sajip | 2010-02-19 17:53:17 -0600 (Fri, 19 Feb 2010) | 1 line
  logging: Documented warnings module integration.
........
  r78703 | vinay.sajip | 2010-03-05 16:11:24 -0600 (Fri, 05 Mar 2010) | 1 line
  Factored out time usage determination into a method, to facilitate alternative formatting implementations in the future.
........
  r78728 | vinay.sajip | 2010-03-06 09:12:08 -0600 (Sat, 06 Mar 2010) | 1 line
  Added schema version test in dictConfig.
........
  r78731 | vinay.sajip | 2010-03-06 09:56:03 -0600 (Sat, 06 Mar 2010) | 1 line
  Added checks for tuples in dictConfig.
........
  r78853 | vinay.sajip | 2010-03-12 00:01:21 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: logging: Improved algorithm for computing initial rollover time.
........
  r78855 | vinay.sajip | 2010-03-12 03:16:10 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: Updated NEWS entry and added to logging documentation.
........
											
										 
											2010-03-13 22:30:34 +00:00
										 |  |  |         'version': 1, | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  |         'incremental' : True, | 
					
						
							|  |  |  |         'handlers' : { | 
					
						
							|  |  |  |             'hand1' : { | 
					
						
							|  |  |  |                 'level' : 'WARNING', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'loggers' : { | 
					
						
							|  |  |  |             'compiler.parser' : { | 
					
						
							|  |  |  |                 'level' : 'INFO', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     config9b = { | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,77973,77979,77985-77986,78009,78029,78031-78033,78081,78085,78103,78105-78106,78108,78246,78703,78728,78731,78853,78855 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 12:48:53 -0600 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 14:18:28 -0600 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r77973 | vinay.sajip | 2010-02-04 14:23:45 -0600 (Thu, 04 Feb 2010) | 1 line
  Issue #7851: logging: clarification on logging configuration files.
........
  r77979 | vinay.sajip | 2010-02-04 15:40:56 -0600 (Thu, 04 Feb 2010) | 1 line
  Added unit test for cfg:// resolution.
........
  r77985 | vinay.sajip | 2010-02-05 08:52:05 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener test now uses find_unused_port().
........
  r77986 | vinay.sajip | 2010-02-05 09:40:20 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener tests disabled for now.
........
  r78009 | vinay.sajip | 2010-02-05 17:43:11 -0600 (Fri, 05 Feb 2010) | 1 line
  test_logging: minor tweaks to timeouts, listening tests marked as skipped.
........
  r78029 | vinay.sajip | 2010-02-06 14:00:43 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Tentatively re-enabling one test to see effect on buildbots.
........
  r78031 | vinay.sajip | 2010-02-06 14:28:36 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Gave server thread more time to get ready, and re-enabled a skipped test.
........
  r78032 | georg.brandl | 2010-02-06 15:54:40 -0600 (Sat, 06 Feb 2010) | 1 line
  Remove unused imports from test_logging.
........
  r78033 | benjamin.peterson | 2010-02-06 16:08:15 -0600 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78081 | vinay.sajip | 2010-02-07 06:56:54 -0600 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 07:06:51 -0600 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78103 | vinay.sajip | 2010-02-08 00:50:14 -0600 (Mon, 08 Feb 2010) | 1 line
  Removed spurious print statement in test.
........
  r78105 | vinay.sajip | 2010-02-08 09:32:08 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: skipped listening tests because they're not working reliably.
........
  r78106 | vinay.sajip | 2010-02-08 10:05:50 -0600 (Mon, 08 Feb 2010) | 1 line
  Issue #7857: Another attempt to keep the buildbots happy.
........
  r78108 | vinay.sajip | 2010-02-08 15:18:15 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
  r78246 | vinay.sajip | 2010-02-19 17:53:17 -0600 (Fri, 19 Feb 2010) | 1 line
  logging: Documented warnings module integration.
........
  r78703 | vinay.sajip | 2010-03-05 16:11:24 -0600 (Fri, 05 Mar 2010) | 1 line
  Factored out time usage determination into a method, to facilitate alternative formatting implementations in the future.
........
  r78728 | vinay.sajip | 2010-03-06 09:12:08 -0600 (Sat, 06 Mar 2010) | 1 line
  Added schema version test in dictConfig.
........
  r78731 | vinay.sajip | 2010-03-06 09:56:03 -0600 (Sat, 06 Mar 2010) | 1 line
  Added checks for tuples in dictConfig.
........
  r78853 | vinay.sajip | 2010-03-12 00:01:21 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: logging: Improved algorithm for computing initial rollover time.
........
  r78855 | vinay.sajip | 2010-03-12 03:16:10 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: Updated NEWS entry and added to logging documentation.
........
											
										 
											2010-03-13 22:30:34 +00:00
										 |  |  |         'version': 1, | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  |         'incremental' : True, | 
					
						
							|  |  |  |         'handlers' : { | 
					
						
							|  |  |  |             'hand1' : { | 
					
						
							|  |  |  |                 'level' : 'INFO', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'loggers' : { | 
					
						
							|  |  |  |             'compiler.parser' : { | 
					
						
							|  |  |  |                 'level' : 'INFO', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     #As config1 but with a filter added | 
					
						
							|  |  |  |     config10 = { | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,77973,77979,77985-77986,78009,78029,78031-78033,78081,78085,78103,78105-78106,78108,78246,78703,78728,78731,78853,78855 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 12:48:53 -0600 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 14:18:28 -0600 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r77973 | vinay.sajip | 2010-02-04 14:23:45 -0600 (Thu, 04 Feb 2010) | 1 line
  Issue #7851: logging: clarification on logging configuration files.
........
  r77979 | vinay.sajip | 2010-02-04 15:40:56 -0600 (Thu, 04 Feb 2010) | 1 line
  Added unit test for cfg:// resolution.
........
  r77985 | vinay.sajip | 2010-02-05 08:52:05 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener test now uses find_unused_port().
........
  r77986 | vinay.sajip | 2010-02-05 09:40:20 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener tests disabled for now.
........
  r78009 | vinay.sajip | 2010-02-05 17:43:11 -0600 (Fri, 05 Feb 2010) | 1 line
  test_logging: minor tweaks to timeouts, listening tests marked as skipped.
........
  r78029 | vinay.sajip | 2010-02-06 14:00:43 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Tentatively re-enabling one test to see effect on buildbots.
........
  r78031 | vinay.sajip | 2010-02-06 14:28:36 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Gave server thread more time to get ready, and re-enabled a skipped test.
........
  r78032 | georg.brandl | 2010-02-06 15:54:40 -0600 (Sat, 06 Feb 2010) | 1 line
  Remove unused imports from test_logging.
........
  r78033 | benjamin.peterson | 2010-02-06 16:08:15 -0600 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78081 | vinay.sajip | 2010-02-07 06:56:54 -0600 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 07:06:51 -0600 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78103 | vinay.sajip | 2010-02-08 00:50:14 -0600 (Mon, 08 Feb 2010) | 1 line
  Removed spurious print statement in test.
........
  r78105 | vinay.sajip | 2010-02-08 09:32:08 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: skipped listening tests because they're not working reliably.
........
  r78106 | vinay.sajip | 2010-02-08 10:05:50 -0600 (Mon, 08 Feb 2010) | 1 line
  Issue #7857: Another attempt to keep the buildbots happy.
........
  r78108 | vinay.sajip | 2010-02-08 15:18:15 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
  r78246 | vinay.sajip | 2010-02-19 17:53:17 -0600 (Fri, 19 Feb 2010) | 1 line
  logging: Documented warnings module integration.
........
  r78703 | vinay.sajip | 2010-03-05 16:11:24 -0600 (Fri, 05 Mar 2010) | 1 line
  Factored out time usage determination into a method, to facilitate alternative formatting implementations in the future.
........
  r78728 | vinay.sajip | 2010-03-06 09:12:08 -0600 (Sat, 06 Mar 2010) | 1 line
  Added schema version test in dictConfig.
........
  r78731 | vinay.sajip | 2010-03-06 09:56:03 -0600 (Sat, 06 Mar 2010) | 1 line
  Added checks for tuples in dictConfig.
........
  r78853 | vinay.sajip | 2010-03-12 00:01:21 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: logging: Improved algorithm for computing initial rollover time.
........
  r78855 | vinay.sajip | 2010-03-12 03:16:10 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: Updated NEWS entry and added to logging documentation.
........
											
										 
											2010-03-13 22:30:34 +00:00
										 |  |  |         'version': 1, | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  |         'formatters': { | 
					
						
							|  |  |  |             'form1' : { | 
					
						
							|  |  |  |                 'format' : '%(levelname)s ++ %(message)s', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'filters' : { | 
					
						
							|  |  |  |             'filt1' : { | 
					
						
							|  |  |  |                 'name' : 'compiler.parser', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'handlers' : { | 
					
						
							|  |  |  |             'hand1' : { | 
					
						
							|  |  |  |                 'class' : 'logging.StreamHandler', | 
					
						
							|  |  |  |                 'formatter' : 'form1', | 
					
						
							|  |  |  |                 'level' : 'NOTSET', | 
					
						
							|  |  |  |                 'stream'  : 'ext://sys.stdout', | 
					
						
							|  |  |  |                 'filters' : ['filt1'], | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'loggers' : { | 
					
						
							|  |  |  |             'compiler.parser' : { | 
					
						
							|  |  |  |                 'level' : 'DEBUG', | 
					
						
							|  |  |  |                 'filters' : ['filt1'], | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'root' : { | 
					
						
							|  |  |  |             'level' : 'WARNING', | 
					
						
							|  |  |  |             'handlers' : ['hand1'], | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     #As config1 but using cfg:// references | 
					
						
							|  |  |  |     config11 = { | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,77973,77979,77985-77986,78009,78029,78031-78033,78081,78085,78103,78105-78106,78108,78246,78703,78728,78731,78853,78855 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 12:48:53 -0600 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 14:18:28 -0600 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r77973 | vinay.sajip | 2010-02-04 14:23:45 -0600 (Thu, 04 Feb 2010) | 1 line
  Issue #7851: logging: clarification on logging configuration files.
........
  r77979 | vinay.sajip | 2010-02-04 15:40:56 -0600 (Thu, 04 Feb 2010) | 1 line
  Added unit test for cfg:// resolution.
........
  r77985 | vinay.sajip | 2010-02-05 08:52:05 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener test now uses find_unused_port().
........
  r77986 | vinay.sajip | 2010-02-05 09:40:20 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener tests disabled for now.
........
  r78009 | vinay.sajip | 2010-02-05 17:43:11 -0600 (Fri, 05 Feb 2010) | 1 line
  test_logging: minor tweaks to timeouts, listening tests marked as skipped.
........
  r78029 | vinay.sajip | 2010-02-06 14:00:43 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Tentatively re-enabling one test to see effect on buildbots.
........
  r78031 | vinay.sajip | 2010-02-06 14:28:36 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Gave server thread more time to get ready, and re-enabled a skipped test.
........
  r78032 | georg.brandl | 2010-02-06 15:54:40 -0600 (Sat, 06 Feb 2010) | 1 line
  Remove unused imports from test_logging.
........
  r78033 | benjamin.peterson | 2010-02-06 16:08:15 -0600 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78081 | vinay.sajip | 2010-02-07 06:56:54 -0600 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 07:06:51 -0600 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78103 | vinay.sajip | 2010-02-08 00:50:14 -0600 (Mon, 08 Feb 2010) | 1 line
  Removed spurious print statement in test.
........
  r78105 | vinay.sajip | 2010-02-08 09:32:08 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: skipped listening tests because they're not working reliably.
........
  r78106 | vinay.sajip | 2010-02-08 10:05:50 -0600 (Mon, 08 Feb 2010) | 1 line
  Issue #7857: Another attempt to keep the buildbots happy.
........
  r78108 | vinay.sajip | 2010-02-08 15:18:15 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
  r78246 | vinay.sajip | 2010-02-19 17:53:17 -0600 (Fri, 19 Feb 2010) | 1 line
  logging: Documented warnings module integration.
........
  r78703 | vinay.sajip | 2010-03-05 16:11:24 -0600 (Fri, 05 Mar 2010) | 1 line
  Factored out time usage determination into a method, to facilitate alternative formatting implementations in the future.
........
  r78728 | vinay.sajip | 2010-03-06 09:12:08 -0600 (Sat, 06 Mar 2010) | 1 line
  Added schema version test in dictConfig.
........
  r78731 | vinay.sajip | 2010-03-06 09:56:03 -0600 (Sat, 06 Mar 2010) | 1 line
  Added checks for tuples in dictConfig.
........
  r78853 | vinay.sajip | 2010-03-12 00:01:21 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: logging: Improved algorithm for computing initial rollover time.
........
  r78855 | vinay.sajip | 2010-03-12 03:16:10 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: Updated NEWS entry and added to logging documentation.
........
											
										 
											2010-03-13 22:30:34 +00:00
										 |  |  |         'version': 1, | 
					
						
							|  |  |  |         'true_formatters': { | 
					
						
							|  |  |  |             'form1' : { | 
					
						
							|  |  |  |                 'format' : '%(levelname)s ++ %(message)s', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'handler_configs': { | 
					
						
							|  |  |  |             'hand1' : { | 
					
						
							|  |  |  |                 'class' : 'logging.StreamHandler', | 
					
						
							|  |  |  |                 'formatter' : 'form1', | 
					
						
							|  |  |  |                 'level' : 'NOTSET', | 
					
						
							|  |  |  |                 'stream'  : 'ext://sys.stdout', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'formatters' : 'cfg://true_formatters', | 
					
						
							|  |  |  |         'handlers' : { | 
					
						
							|  |  |  |             'hand1' : 'cfg://handler_configs[hand1]', | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'loggers' : { | 
					
						
							|  |  |  |             'compiler.parser' : { | 
					
						
							|  |  |  |                 'level' : 'DEBUG', | 
					
						
							|  |  |  |                 'handlers' : ['hand1'], | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'root' : { | 
					
						
							|  |  |  |             'level' : 'WARNING', | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     #As config11 but missing the version key | 
					
						
							|  |  |  |     config12 = { | 
					
						
							|  |  |  |         'true_formatters': { | 
					
						
							|  |  |  |             'form1' : { | 
					
						
							|  |  |  |                 'format' : '%(levelname)s ++ %(message)s', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'handler_configs': { | 
					
						
							|  |  |  |             'hand1' : { | 
					
						
							|  |  |  |                 'class' : 'logging.StreamHandler', | 
					
						
							|  |  |  |                 'formatter' : 'form1', | 
					
						
							|  |  |  |                 'level' : 'NOTSET', | 
					
						
							|  |  |  |                 'stream'  : 'ext://sys.stdout', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'formatters' : 'cfg://true_formatters', | 
					
						
							|  |  |  |         'handlers' : { | 
					
						
							|  |  |  |             'hand1' : 'cfg://handler_configs[hand1]', | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'loggers' : { | 
					
						
							|  |  |  |             'compiler.parser' : { | 
					
						
							|  |  |  |                 'level' : 'DEBUG', | 
					
						
							|  |  |  |                 'handlers' : ['hand1'], | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'root' : { | 
					
						
							|  |  |  |             'level' : 'WARNING', | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     #As config11 but using an unsupported version | 
					
						
							|  |  |  |     config13 = { | 
					
						
							|  |  |  |         'version': 2, | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  |         'true_formatters': { | 
					
						
							|  |  |  |             'form1' : { | 
					
						
							|  |  |  |                 'format' : '%(levelname)s ++ %(message)s', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'handler_configs': { | 
					
						
							|  |  |  |             'hand1' : { | 
					
						
							|  |  |  |                 'class' : 'logging.StreamHandler', | 
					
						
							|  |  |  |                 'formatter' : 'form1', | 
					
						
							|  |  |  |                 'level' : 'NOTSET', | 
					
						
							|  |  |  |                 'stream'  : 'ext://sys.stdout', | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'formatters' : 'cfg://true_formatters', | 
					
						
							|  |  |  |         'handlers' : { | 
					
						
							|  |  |  |             'hand1' : 'cfg://handler_configs[hand1]', | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'loggers' : { | 
					
						
							|  |  |  |             'compiler.parser' : { | 
					
						
							|  |  |  |                 'level' : 'DEBUG', | 
					
						
							|  |  |  |                 'handlers' : ['hand1'], | 
					
						
							|  |  |  |             }, | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |         'root' : { | 
					
						
							|  |  |  |             'level' : 'WARNING', | 
					
						
							|  |  |  |         }, | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def apply_config(self, conf): | 
					
						
							|  |  |  |         logging.config.dictConfig(conf) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_config0_ok(self): | 
					
						
							|  |  |  |         # A simple config which overrides the default settings. | 
					
						
							|  |  |  |         with captured_stdout() as output: | 
					
						
							|  |  |  |             self.apply_config(self.config0) | 
					
						
							|  |  |  |             logger = logging.getLogger() | 
					
						
							|  |  |  |             # Won't output anything | 
					
						
							|  |  |  |             logger.info(self.next_message()) | 
					
						
							|  |  |  |             # Outputs a message | 
					
						
							|  |  |  |             logger.error(self.next_message()) | 
					
						
							|  |  |  |             self.assert_log_lines([ | 
					
						
							|  |  |  |                 ('ERROR', '2'), | 
					
						
							|  |  |  |             ], stream=output) | 
					
						
							|  |  |  |             # Original logger output is empty. | 
					
						
							|  |  |  |             self.assert_log_lines([]) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_config1_ok(self, config=config1): | 
					
						
							|  |  |  |         # A config defining a sub-parser as well. | 
					
						
							|  |  |  |         with captured_stdout() as output: | 
					
						
							|  |  |  |             self.apply_config(config) | 
					
						
							|  |  |  |             logger = logging.getLogger("compiler.parser") | 
					
						
							|  |  |  |             # Both will output a message | 
					
						
							|  |  |  |             logger.info(self.next_message()) | 
					
						
							|  |  |  |             logger.error(self.next_message()) | 
					
						
							|  |  |  |             self.assert_log_lines([ | 
					
						
							|  |  |  |                 ('INFO', '1'), | 
					
						
							|  |  |  |                 ('ERROR', '2'), | 
					
						
							|  |  |  |             ], stream=output) | 
					
						
							|  |  |  |             # Original logger output is empty. | 
					
						
							|  |  |  |             self.assert_log_lines([]) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_config2_failure(self): | 
					
						
							|  |  |  |         # A simple config which overrides the default settings. | 
					
						
							|  |  |  |         self.assertRaises(Exception, self.apply_config, self.config2) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_config2a_failure(self): | 
					
						
							|  |  |  |         # A simple config which overrides the default settings. | 
					
						
							|  |  |  |         self.assertRaises(Exception, self.apply_config, self.config2a) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_config2b_failure(self): | 
					
						
							|  |  |  |         # A simple config which overrides the default settings. | 
					
						
							|  |  |  |         self.assertRaises(Exception, self.apply_config, self.config2b) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_config3_failure(self): | 
					
						
							|  |  |  |         # A simple config which overrides the default settings. | 
					
						
							|  |  |  |         self.assertRaises(Exception, self.apply_config, self.config3) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_config4_ok(self): | 
					
						
							|  |  |  |         # A config specifying a custom formatter class. | 
					
						
							|  |  |  |         with captured_stdout() as output: | 
					
						
							|  |  |  |             self.apply_config(self.config4) | 
					
						
							|  |  |  |             #logger = logging.getLogger() | 
					
						
							|  |  |  |             try: | 
					
						
							|  |  |  |                 raise RuntimeError() | 
					
						
							|  |  |  |             except RuntimeError: | 
					
						
							|  |  |  |                 logging.exception("just testing") | 
					
						
							|  |  |  |             sys.stdout.seek(0) | 
					
						
							| 
									
										
										
										
											2010-11-20 19:04:17 +00:00
										 |  |  |             self.assertEqual(output.getvalue(), | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  |                 "ERROR:root:just testing\nGot a [RuntimeError]\n") | 
					
						
							|  |  |  |             # Original logger output is empty | 
					
						
							|  |  |  |             self.assert_log_lines([]) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_config4a_ok(self): | 
					
						
							|  |  |  |         # A config specifying a custom formatter class. | 
					
						
							|  |  |  |         with captured_stdout() as output: | 
					
						
							|  |  |  |             self.apply_config(self.config4a) | 
					
						
							|  |  |  |             #logger = logging.getLogger() | 
					
						
							|  |  |  |             try: | 
					
						
							|  |  |  |                 raise RuntimeError() | 
					
						
							|  |  |  |             except RuntimeError: | 
					
						
							|  |  |  |                 logging.exception("just testing") | 
					
						
							|  |  |  |             sys.stdout.seek(0) | 
					
						
							| 
									
										
										
										
											2010-11-20 19:04:17 +00:00
										 |  |  |             self.assertEqual(output.getvalue(), | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  |                 "ERROR:root:just testing\nGot a [RuntimeError]\n") | 
					
						
							|  |  |  |             # Original logger output is empty | 
					
						
							|  |  |  |             self.assert_log_lines([]) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_config5_ok(self): | 
					
						
							|  |  |  |         self.test_config1_ok(config=self.config5) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_config6_failure(self): | 
					
						
							|  |  |  |         self.assertRaises(Exception, self.apply_config, self.config6) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_config7_ok(self): | 
					
						
							|  |  |  |         with captured_stdout() as output: | 
					
						
							|  |  |  |             self.apply_config(self.config1) | 
					
						
							|  |  |  |             logger = logging.getLogger("compiler.parser") | 
					
						
							|  |  |  |             # Both will output a message | 
					
						
							|  |  |  |             logger.info(self.next_message()) | 
					
						
							|  |  |  |             logger.error(self.next_message()) | 
					
						
							|  |  |  |             self.assert_log_lines([ | 
					
						
							|  |  |  |                 ('INFO', '1'), | 
					
						
							|  |  |  |                 ('ERROR', '2'), | 
					
						
							|  |  |  |             ], stream=output) | 
					
						
							|  |  |  |             # Original logger output is empty. | 
					
						
							|  |  |  |             self.assert_log_lines([]) | 
					
						
							|  |  |  |         with captured_stdout() as output: | 
					
						
							|  |  |  |             self.apply_config(self.config7) | 
					
						
							|  |  |  |             logger = logging.getLogger("compiler.parser") | 
					
						
							|  |  |  |             self.assertTrue(logger.disabled) | 
					
						
							|  |  |  |             logger = logging.getLogger("compiler.lexer") | 
					
						
							|  |  |  |             # Both will output a message | 
					
						
							|  |  |  |             logger.info(self.next_message()) | 
					
						
							|  |  |  |             logger.error(self.next_message()) | 
					
						
							|  |  |  |             self.assert_log_lines([ | 
					
						
							|  |  |  |                 ('INFO', '3'), | 
					
						
							|  |  |  |                 ('ERROR', '4'), | 
					
						
							|  |  |  |             ], stream=output) | 
					
						
							|  |  |  |             # Original logger output is empty. | 
					
						
							|  |  |  |             self.assert_log_lines([]) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     #Same as test_config_7_ok but don't disable old loggers. | 
					
						
							|  |  |  |     def test_config_8_ok(self): | 
					
						
							|  |  |  |         with captured_stdout() as output: | 
					
						
							|  |  |  |             self.apply_config(self.config1) | 
					
						
							|  |  |  |             logger = logging.getLogger("compiler.parser") | 
					
						
							| 
									
										
										
										
											2011-03-07 18:02:57 +00:00
										 |  |  |             # All will output a message | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  |             logger.info(self.next_message()) | 
					
						
							|  |  |  |             logger.error(self.next_message()) | 
					
						
							|  |  |  |             self.assert_log_lines([ | 
					
						
							|  |  |  |                 ('INFO', '1'), | 
					
						
							|  |  |  |                 ('ERROR', '2'), | 
					
						
							|  |  |  |             ], stream=output) | 
					
						
							|  |  |  |             # Original logger output is empty. | 
					
						
							|  |  |  |             self.assert_log_lines([]) | 
					
						
							|  |  |  |         with captured_stdout() as output: | 
					
						
							|  |  |  |             self.apply_config(self.config8) | 
					
						
							|  |  |  |             logger = logging.getLogger("compiler.parser") | 
					
						
							|  |  |  |             self.assertFalse(logger.disabled) | 
					
						
							|  |  |  |             # Both will output a message | 
					
						
							|  |  |  |             logger.info(self.next_message()) | 
					
						
							|  |  |  |             logger.error(self.next_message()) | 
					
						
							|  |  |  |             logger = logging.getLogger("compiler.lexer") | 
					
						
							|  |  |  |             # Both will output a message | 
					
						
							|  |  |  |             logger.info(self.next_message()) | 
					
						
							|  |  |  |             logger.error(self.next_message()) | 
					
						
							|  |  |  |             self.assert_log_lines([ | 
					
						
							|  |  |  |                 ('INFO', '3'), | 
					
						
							|  |  |  |                 ('ERROR', '4'), | 
					
						
							|  |  |  |                 ('INFO', '5'), | 
					
						
							|  |  |  |                 ('ERROR', '6'), | 
					
						
							|  |  |  |             ], stream=output) | 
					
						
							|  |  |  |             # Original logger output is empty. | 
					
						
							|  |  |  |             self.assert_log_lines([]) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-03-07 18:02:57 +00:00
										 |  |  |     def test_config_8a_ok(self): | 
					
						
							|  |  |  |         with captured_stdout() as output: | 
					
						
							|  |  |  |             self.apply_config(self.config1a) | 
					
						
							|  |  |  |             logger = logging.getLogger("compiler.parser") | 
					
						
							|  |  |  |             # See issue #11424. compiler-hyphenated sorts | 
					
						
							|  |  |  |             # between compiler and compiler.xyz and this | 
					
						
							|  |  |  |             # was preventing compiler.xyz from being included | 
					
						
							|  |  |  |             # in the child loggers of compiler because of an | 
					
						
							|  |  |  |             # overzealous loop termination condition. | 
					
						
							|  |  |  |             hyphenated = logging.getLogger('compiler-hyphenated') | 
					
						
							|  |  |  |             # All will output a message | 
					
						
							|  |  |  |             logger.info(self.next_message()) | 
					
						
							|  |  |  |             logger.error(self.next_message()) | 
					
						
							|  |  |  |             hyphenated.critical(self.next_message()) | 
					
						
							|  |  |  |             self.assert_log_lines([ | 
					
						
							|  |  |  |                 ('INFO', '1'), | 
					
						
							|  |  |  |                 ('ERROR', '2'), | 
					
						
							|  |  |  |                 ('CRITICAL', '3'), | 
					
						
							|  |  |  |             ], stream=output) | 
					
						
							|  |  |  |             # Original logger output is empty. | 
					
						
							|  |  |  |             self.assert_log_lines([]) | 
					
						
							|  |  |  |         with captured_stdout() as output: | 
					
						
							|  |  |  |             self.apply_config(self.config8a) | 
					
						
							|  |  |  |             logger = logging.getLogger("compiler.parser") | 
					
						
							|  |  |  |             self.assertFalse(logger.disabled) | 
					
						
							|  |  |  |             # Both will output a message | 
					
						
							|  |  |  |             logger.info(self.next_message()) | 
					
						
							|  |  |  |             logger.error(self.next_message()) | 
					
						
							|  |  |  |             logger = logging.getLogger("compiler.lexer") | 
					
						
							|  |  |  |             # Both will output a message | 
					
						
							|  |  |  |             logger.info(self.next_message()) | 
					
						
							|  |  |  |             logger.error(self.next_message()) | 
					
						
							|  |  |  |             # Will not appear | 
					
						
							|  |  |  |             hyphenated.critical(self.next_message()) | 
					
						
							|  |  |  |             self.assert_log_lines([ | 
					
						
							|  |  |  |                 ('INFO', '4'), | 
					
						
							|  |  |  |                 ('ERROR', '5'), | 
					
						
							|  |  |  |                 ('INFO', '6'), | 
					
						
							|  |  |  |                 ('ERROR', '7'), | 
					
						
							|  |  |  |             ], stream=output) | 
					
						
							|  |  |  |             # Original logger output is empty. | 
					
						
							|  |  |  |             self.assert_log_lines([]) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  |     def test_config_9_ok(self): | 
					
						
							|  |  |  |         with captured_stdout() as output: | 
					
						
							|  |  |  |             self.apply_config(self.config9) | 
					
						
							|  |  |  |             logger = logging.getLogger("compiler.parser") | 
					
						
							|  |  |  |             #Nothing will be output since both handler and logger are set to WARNING | 
					
						
							|  |  |  |             logger.info(self.next_message()) | 
					
						
							|  |  |  |             self.assert_log_lines([], stream=output) | 
					
						
							|  |  |  |             self.apply_config(self.config9a) | 
					
						
							|  |  |  |             #Nothing will be output since both handler is still set to WARNING | 
					
						
							|  |  |  |             logger.info(self.next_message()) | 
					
						
							|  |  |  |             self.assert_log_lines([], stream=output) | 
					
						
							|  |  |  |             self.apply_config(self.config9b) | 
					
						
							|  |  |  |             #Message should now be output | 
					
						
							|  |  |  |             logger.info(self.next_message()) | 
					
						
							|  |  |  |             self.assert_log_lines([ | 
					
						
							|  |  |  |                 ('INFO', '3'), | 
					
						
							|  |  |  |             ], stream=output) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_config_10_ok(self): | 
					
						
							|  |  |  |         with captured_stdout() as output: | 
					
						
							|  |  |  |             self.apply_config(self.config10) | 
					
						
							|  |  |  |             logger = logging.getLogger("compiler.parser") | 
					
						
							|  |  |  |             logger.warning(self.next_message()) | 
					
						
							|  |  |  |             logger = logging.getLogger('compiler') | 
					
						
							|  |  |  |             #Not output, because filtered | 
					
						
							|  |  |  |             logger.warning(self.next_message()) | 
					
						
							|  |  |  |             logger = logging.getLogger('compiler.lexer') | 
					
						
							|  |  |  |             #Not output, because filtered | 
					
						
							|  |  |  |             logger.warning(self.next_message()) | 
					
						
							|  |  |  |             logger = logging.getLogger("compiler.parser.codegen") | 
					
						
							|  |  |  |             #Output, as not filtered | 
					
						
							|  |  |  |             logger.error(self.next_message()) | 
					
						
							|  |  |  |             self.assert_log_lines([ | 
					
						
							|  |  |  |                 ('WARNING', '1'), | 
					
						
							|  |  |  |                 ('ERROR', '4'), | 
					
						
							|  |  |  |             ], stream=output) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_config11_ok(self): | 
					
						
							|  |  |  |         self.test_config1_ok(self.config11) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,77973,77979,77985-77986,78009,78029,78031-78033,78081,78085,78103,78105-78106,78108,78246,78703,78728,78731,78853,78855 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 12:48:53 -0600 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 14:18:28 -0600 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r77973 | vinay.sajip | 2010-02-04 14:23:45 -0600 (Thu, 04 Feb 2010) | 1 line
  Issue #7851: logging: clarification on logging configuration files.
........
  r77979 | vinay.sajip | 2010-02-04 15:40:56 -0600 (Thu, 04 Feb 2010) | 1 line
  Added unit test for cfg:// resolution.
........
  r77985 | vinay.sajip | 2010-02-05 08:52:05 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener test now uses find_unused_port().
........
  r77986 | vinay.sajip | 2010-02-05 09:40:20 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener tests disabled for now.
........
  r78009 | vinay.sajip | 2010-02-05 17:43:11 -0600 (Fri, 05 Feb 2010) | 1 line
  test_logging: minor tweaks to timeouts, listening tests marked as skipped.
........
  r78029 | vinay.sajip | 2010-02-06 14:00:43 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Tentatively re-enabling one test to see effect on buildbots.
........
  r78031 | vinay.sajip | 2010-02-06 14:28:36 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Gave server thread more time to get ready, and re-enabled a skipped test.
........
  r78032 | georg.brandl | 2010-02-06 15:54:40 -0600 (Sat, 06 Feb 2010) | 1 line
  Remove unused imports from test_logging.
........
  r78033 | benjamin.peterson | 2010-02-06 16:08:15 -0600 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78081 | vinay.sajip | 2010-02-07 06:56:54 -0600 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 07:06:51 -0600 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78103 | vinay.sajip | 2010-02-08 00:50:14 -0600 (Mon, 08 Feb 2010) | 1 line
  Removed spurious print statement in test.
........
  r78105 | vinay.sajip | 2010-02-08 09:32:08 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: skipped listening tests because they're not working reliably.
........
  r78106 | vinay.sajip | 2010-02-08 10:05:50 -0600 (Mon, 08 Feb 2010) | 1 line
  Issue #7857: Another attempt to keep the buildbots happy.
........
  r78108 | vinay.sajip | 2010-02-08 15:18:15 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
  r78246 | vinay.sajip | 2010-02-19 17:53:17 -0600 (Fri, 19 Feb 2010) | 1 line
  logging: Documented warnings module integration.
........
  r78703 | vinay.sajip | 2010-03-05 16:11:24 -0600 (Fri, 05 Mar 2010) | 1 line
  Factored out time usage determination into a method, to facilitate alternative formatting implementations in the future.
........
  r78728 | vinay.sajip | 2010-03-06 09:12:08 -0600 (Sat, 06 Mar 2010) | 1 line
  Added schema version test in dictConfig.
........
  r78731 | vinay.sajip | 2010-03-06 09:56:03 -0600 (Sat, 06 Mar 2010) | 1 line
  Added checks for tuples in dictConfig.
........
  r78853 | vinay.sajip | 2010-03-12 00:01:21 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: logging: Improved algorithm for computing initial rollover time.
........
  r78855 | vinay.sajip | 2010-03-12 03:16:10 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: Updated NEWS entry and added to logging documentation.
........
											
										 
											2010-03-13 22:30:34 +00:00
										 |  |  |     def test_config12_failure(self): | 
					
						
							|  |  |  |         self.assertRaises(Exception, self.apply_config, self.config12) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_config13_failure(self): | 
					
						
							|  |  |  |         self.assertRaises(Exception, self.apply_config, self.config13) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 80552-80556,80564-80566,80568-80571 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r80552 | victor.stinner | 2010-04-27 23:46:03 +0200 (mar., 27 avril 2010) | 3 lines
  Issue #7449, part 1: fix test_support.py for Python compiled without thread
........
  r80553 | victor.stinner | 2010-04-27 23:47:01 +0200 (mar., 27 avril 2010) | 1 line
  Issue #7449, part 2: regrtest.py -j option requires thread support
........
  r80554 | victor.stinner | 2010-04-27 23:51:26 +0200 (mar., 27 avril 2010) | 9 lines
  Issue #7449 part 3, test_doctest: import trace module in test_coverage()
  Import trace module fail if the threading module is missing. test_coverage() is
  only used if test_doctest.py is used with the -c option. This commit allows to
  execute the test suite without thread support.
  Move "import trace" in test_coverage() and use
  test_support.import_module('trace').
........
  r80555 | victor.stinner | 2010-04-27 23:56:26 +0200 (mar., 27 avril 2010) | 6 lines
  Issue #7449, part 4: skip test_multiprocessing if thread support is disabled
  import threading after _multiprocessing to raise a more revelant error message:
  "No module named _multiprocessing". _multiprocessing is not compiled without
  thread support.
........
  r80556 | victor.stinner | 2010-04-28 00:01:24 +0200 (mer., 28 avril 2010) | 8 lines
  Issue #7449, part 5: split Test.test_open() of ctypes/test/test_errno.py
   * Split Test.test_open() in 2 functions: test_open() and test_thread_open()
   * Skip test_open() and test_thread_open() if we are unable to find the C
     library
   * Skip test_thread_open() if thread support is disabled
   * Use unittest.skipUnless(os.name == "nt", ...) on test_GetLastError()
........
  r80564 | victor.stinner | 2010-04-28 00:59:35 +0200 (mer., 28 avril 2010) | 4 lines
  Issue #7449, part 6: fix test_hashlib for missing threading module
  Move @test_support.reap_thread decorator from test_main() to test_threaded_hashing().
........
  r80565 | victor.stinner | 2010-04-28 01:01:29 +0200 (mer., 28 avril 2010) | 6 lines
  Issue #7449, part 7: simplify threading detection in test_capi
   * Skip TestPendingCalls if threading module is missing
   * Test if threading module is present or not, instead of test the presence of
     _testcapi._test_thread_state
........
  r80566 | victor.stinner | 2010-04-28 01:03:16 +0200 (mer., 28 avril 2010) | 4 lines
  Issue #7449, part 8: don't skip the whole test_asynchat if threading is missing
  TestFifo can be executed without the threading module
........
  r80568 | victor.stinner | 2010-04-28 01:14:58 +0200 (mer., 28 avril 2010) | 6 lines
  Issue #7449, part 9: fix test_xmlrpclib for missing threading module
   * Skip testcases using threads if threading module is missing
   * Use "http://" instead of URL in ServerProxyTestCase if threading is missing
     because URL is not set in this case
........
  r80569 | victor.stinner | 2010-04-28 01:33:58 +0200 (mer., 28 avril 2010) | 6 lines
  Partial revert of r80556 (Issue #7449, part 5, fix ctypes test)
  Rewrite r80556: the thread test have to be executed just after the test on
  libc_open() and so the test cannot be splitted in two functions (without
  duplicating code, and I don't want to duplicate code).
........
  r80570 | victor.stinner | 2010-04-28 01:51:16 +0200 (mer., 28 avril 2010) | 8 lines
  Issue #7449, part 10: test_cmd imports trace module using test_support.import_module()
  Use test_support.import_module() instead of import to raise a SkipTest
  exception if the import fail. Import trace fails if the threading module is
  missing.
  See also part 3: test_doctest: import trace module in test_coverage().
........
  r80571 | victor.stinner | 2010-04-28 01:55:59 +0200 (mer., 28 avril 2010) | 6 lines
  Issue #7449, last part (11): fix many tests if thread support is disabled
   * Use try/except ImportError or test_support.import_module() to import thread
     and threading modules
   * Add @unittest.skipUnless(threading, ...) to testcases using threads
........
											
										 
											2010-04-28 22:31:17 +00:00
										 |  |  |     @unittest.skipUnless(threading, 'listen() needs threading to work') | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  |     def setup_via_listener(self, text): | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,77973,77979,77985-77986,78009,78029,78031-78033,78081,78085,78103,78105-78106,78108,78246,78703,78728,78731,78853,78855 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 12:48:53 -0600 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 14:18:28 -0600 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r77973 | vinay.sajip | 2010-02-04 14:23:45 -0600 (Thu, 04 Feb 2010) | 1 line
  Issue #7851: logging: clarification on logging configuration files.
........
  r77979 | vinay.sajip | 2010-02-04 15:40:56 -0600 (Thu, 04 Feb 2010) | 1 line
  Added unit test for cfg:// resolution.
........
  r77985 | vinay.sajip | 2010-02-05 08:52:05 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener test now uses find_unused_port().
........
  r77986 | vinay.sajip | 2010-02-05 09:40:20 -0600 (Fri, 05 Feb 2010) | 1 line
  Issue #7857: test_logging: listener tests disabled for now.
........
  r78009 | vinay.sajip | 2010-02-05 17:43:11 -0600 (Fri, 05 Feb 2010) | 1 line
  test_logging: minor tweaks to timeouts, listening tests marked as skipped.
........
  r78029 | vinay.sajip | 2010-02-06 14:00:43 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Tentatively re-enabling one test to see effect on buildbots.
........
  r78031 | vinay.sajip | 2010-02-06 14:28:36 -0600 (Sat, 06 Feb 2010) | 1 line
  Issue #7857: Gave server thread more time to get ready, and re-enabled a skipped test.
........
  r78032 | georg.brandl | 2010-02-06 15:54:40 -0600 (Sat, 06 Feb 2010) | 1 line
  Remove unused imports from test_logging.
........
  r78033 | benjamin.peterson | 2010-02-06 16:08:15 -0600 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78081 | vinay.sajip | 2010-02-07 06:56:54 -0600 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 07:06:51 -0600 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78103 | vinay.sajip | 2010-02-08 00:50:14 -0600 (Mon, 08 Feb 2010) | 1 line
  Removed spurious print statement in test.
........
  r78105 | vinay.sajip | 2010-02-08 09:32:08 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: skipped listening tests because they're not working reliably.
........
  r78106 | vinay.sajip | 2010-02-08 10:05:50 -0600 (Mon, 08 Feb 2010) | 1 line
  Issue #7857: Another attempt to keep the buildbots happy.
........
  r78108 | vinay.sajip | 2010-02-08 15:18:15 -0600 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
  r78246 | vinay.sajip | 2010-02-19 17:53:17 -0600 (Fri, 19 Feb 2010) | 1 line
  logging: Documented warnings module integration.
........
  r78703 | vinay.sajip | 2010-03-05 16:11:24 -0600 (Fri, 05 Mar 2010) | 1 line
  Factored out time usage determination into a method, to facilitate alternative formatting implementations in the future.
........
  r78728 | vinay.sajip | 2010-03-06 09:12:08 -0600 (Sat, 06 Mar 2010) | 1 line
  Added schema version test in dictConfig.
........
  r78731 | vinay.sajip | 2010-03-06 09:56:03 -0600 (Sat, 06 Mar 2010) | 1 line
  Added checks for tuples in dictConfig.
........
  r78853 | vinay.sajip | 2010-03-12 00:01:21 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: logging: Improved algorithm for computing initial rollover time.
........
  r78855 | vinay.sajip | 2010-03-12 03:16:10 -0600 (Fri, 12 Mar 2010) | 1 line
  Issue #8117: Updated NEWS entry and added to logging documentation.
........
											
										 
											2010-03-13 22:30:34 +00:00
										 |  |  |         text = text.encode("utf-8") | 
					
						
							| 
									
										
										
										
											2010-08-15 20:16:27 +00:00
										 |  |  |         # Ask for a randomly assigned port (by using port 0) | 
					
						
							|  |  |  |         t = logging.config.listen(0) | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  |         t.start() | 
					
						
							|  |  |  |         t.ready.wait() | 
					
						
							| 
									
										
										
										
											2010-06-27 20:54:28 +00:00
										 |  |  |         # Now get the port allocated | 
					
						
							|  |  |  |         port = t.port | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  |         t.ready.clear() | 
					
						
							|  |  |  |         try: | 
					
						
							|  |  |  |             sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) | 
					
						
							|  |  |  |             sock.settimeout(2.0) | 
					
						
							|  |  |  |             sock.connect(('localhost', port)) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |             slen = struct.pack('>L', len(text)) | 
					
						
							|  |  |  |             s = slen + text | 
					
						
							|  |  |  |             sentsofar = 0 | 
					
						
							|  |  |  |             left = len(s) | 
					
						
							|  |  |  |             while left > 0: | 
					
						
							|  |  |  |                 sent = sock.send(s[sentsofar:]) | 
					
						
							|  |  |  |                 sentsofar += sent | 
					
						
							|  |  |  |                 left -= sent | 
					
						
							|  |  |  |             sock.close() | 
					
						
							|  |  |  |         finally: | 
					
						
							|  |  |  |             t.ready.wait(2.0) | 
					
						
							|  |  |  |             logging.config.stopListening() | 
					
						
							|  |  |  |             t.join(2.0) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-05-17 07:41:18 +01:00
										 |  |  |     @unittest.skipUnless(threading, 'Threading required for this test.') | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  |     def test_listen_config_10_ok(self): | 
					
						
							|  |  |  |         with captured_stdout() as output: | 
					
						
							|  |  |  |             self.setup_via_listener(json.dumps(self.config10)) | 
					
						
							|  |  |  |             logger = logging.getLogger("compiler.parser") | 
					
						
							|  |  |  |             logger.warning(self.next_message()) | 
					
						
							|  |  |  |             logger = logging.getLogger('compiler') | 
					
						
							|  |  |  |             #Not output, because filtered | 
					
						
							|  |  |  |             logger.warning(self.next_message()) | 
					
						
							|  |  |  |             logger = logging.getLogger('compiler.lexer') | 
					
						
							|  |  |  |             #Not output, because filtered | 
					
						
							|  |  |  |             logger.warning(self.next_message()) | 
					
						
							|  |  |  |             logger = logging.getLogger("compiler.parser.codegen") | 
					
						
							|  |  |  |             #Output, as not filtered | 
					
						
							|  |  |  |             logger.error(self.next_message()) | 
					
						
							|  |  |  |             self.assert_log_lines([ | 
					
						
							|  |  |  |                 ('WARNING', '1'), | 
					
						
							|  |  |  |                 ('ERROR', '4'), | 
					
						
							|  |  |  |             ], stream=output) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-05-17 07:41:18 +01:00
										 |  |  |     @unittest.skipUnless(threading, 'Threading required for this test.') | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  |     def test_listen_config_1_ok(self): | 
					
						
							|  |  |  |         with captured_stdout() as output: | 
					
						
							|  |  |  |             self.setup_via_listener(textwrap.dedent(ConfigFileTest.config1)) | 
					
						
							|  |  |  |             logger = logging.getLogger("compiler.parser") | 
					
						
							|  |  |  |             # Both will output a message | 
					
						
							|  |  |  |             logger.info(self.next_message()) | 
					
						
							|  |  |  |             logger.error(self.next_message()) | 
					
						
							|  |  |  |             self.assert_log_lines([ | 
					
						
							|  |  |  |                 ('INFO', '1'), | 
					
						
							|  |  |  |                 ('ERROR', '2'), | 
					
						
							|  |  |  |             ], stream=output) | 
					
						
							|  |  |  |             # Original logger output is empty. | 
					
						
							|  |  |  |             self.assert_log_lines([]) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-04-26 20:05:24 +01:00
										 |  |  |     def test_baseconfig(self): | 
					
						
							|  |  |  |         d = { | 
					
						
							|  |  |  |             'atuple': (1, 2, 3), | 
					
						
							|  |  |  |             'alist': ['a', 'b', 'c'], | 
					
						
							|  |  |  |             'adict': {'d': 'e', 'f': 3 }, | 
					
						
							|  |  |  |             'nest1': ('g', ('h', 'i'), 'j'), | 
					
						
							|  |  |  |             'nest2': ['k', ['l', 'm'], 'n'], | 
					
						
							|  |  |  |             'nest3': ['o', 'cfg://alist', 'p'], | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  |         bc = logging.config.BaseConfigurator(d) | 
					
						
							|  |  |  |         self.assertEqual(bc.convert('cfg://atuple[1]'), 2) | 
					
						
							|  |  |  |         self.assertEqual(bc.convert('cfg://alist[1]'), 'b') | 
					
						
							|  |  |  |         self.assertEqual(bc.convert('cfg://nest1[1][0]'), 'h') | 
					
						
							|  |  |  |         self.assertEqual(bc.convert('cfg://nest2[1][1]'), 'm') | 
					
						
							|  |  |  |         self.assertEqual(bc.convert('cfg://adict.d'), 'e') | 
					
						
							|  |  |  |         self.assertEqual(bc.convert('cfg://adict[f]'), 3) | 
					
						
							|  |  |  |         v = bc.convert('cfg://nest3') | 
					
						
							|  |  |  |         self.assertEqual(v.pop(1), ['a', 'b', 'c']) | 
					
						
							|  |  |  |         self.assertRaises(KeyError, bc.convert, 'cfg://nosuch') | 
					
						
							|  |  |  |         self.assertRaises(ValueError, bc.convert, 'cfg://!') | 
					
						
							|  |  |  |         self.assertRaises(KeyError, bc.convert, 'cfg://adict[2]') | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | class ManagerTest(BaseTest): | 
					
						
							|  |  |  |     def test_manager_loggerclass(self): | 
					
						
							|  |  |  |         logged = [] | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         class MyLogger(logging.Logger): | 
					
						
							|  |  |  |             def _log(self, level, msg, args, exc_info=None, extra=None): | 
					
						
							|  |  |  |                 logged.append(msg) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         man = logging.Manager(None) | 
					
						
							|  |  |  |         self.assertRaises(TypeError, man.setLoggerClass, int) | 
					
						
							|  |  |  |         man.setLoggerClass(MyLogger) | 
					
						
							|  |  |  |         logger = man.getLogger('test') | 
					
						
							|  |  |  |         logger.warning('should appear in logged') | 
					
						
							|  |  |  |         logging.warning('should not appear in logged') | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         self.assertEqual(logged, ['should appear in logged']) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-03-29 17:20:34 +01:00
										 |  |  |     def test_set_log_record_factory(self): | 
					
						
							|  |  |  |         man = logging.Manager(None) | 
					
						
							|  |  |  |         expected = object() | 
					
						
							|  |  |  |         man.setLogRecordFactory(expected) | 
					
						
							|  |  |  |         self.assertEqual(man.logRecordFactory, expected) | 
					
						
							| 
									
										
											  
											
												Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line
  Logging: Implemented PEP 391.
........
  r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line
  Removed spurious print statement.
........
  r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line
  make waiting for the server to start robust
........
  r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7868: logging: added loggerClass attribute to Manager.
........
  r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line
  Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code.
........
  r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line
  logging: Removed some more 1.5.2 support code.
........
  r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line
  logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
........
											
										 
											2010-02-25 23:13:06 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 79279,79284,79293,79373,79376,79379,79876,79888 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r79279 | vinay.sajip | 2010-03-22 07:33:08 -0500 (Mon, 22 Mar 2010) | 1 line
  Issue #8200: logging: Handle errors when multiprocessing is not fully loaded when logging occurs.
........
  r79284 | vinay.sajip | 2010-03-22 08:02:28 -0500 (Mon, 22 Mar 2010) | 1 line
  Issue #8201: logging: Handle config errors when non-ASCII and Unicode logger names exist at the same time.
........
  r79293 | vinay.sajip | 2010-03-22 10:29:01 -0500 (Mon, 22 Mar 2010) | 1 line
  logging: Added getChild utility method to Logger and added isEnabledFor method to LoggerAdapter.
........
  r79373 | vinay.sajip | 2010-03-24 09:31:21 -0500 (Wed, 24 Mar 2010) | 1 line
  logging: Added LOG_FTP for SysLogHandler and updated documentation.
........
  r79376 | vinay.sajip | 2010-03-24 10:10:40 -0500 (Wed, 24 Mar 2010) | 1 line
  logging: Documentation tweak.
........
  r79379 | vinay.sajip | 2010-03-24 12:36:35 -0500 (Wed, 24 Mar 2010) | 1 line
  logging: Updated SysLogHandler documentation.
........
  r79876 | vinay.sajip | 2010-04-06 17:32:37 -0500 (Tue, 06 Apr 2010) | 1 line
  Issue #8327: logging: Clarification of propagation functionality in documentation.
........
  r79888 | vinay.sajip | 2010-04-07 04:40:52 -0500 (Wed, 07 Apr 2010) | 1 line
  Issue #8331: logging: fixed some grammatical errors in documentation.
........
											
										 
											2010-04-11 16:25:06 +00:00
										 |  |  | class ChildLoggerTest(BaseTest): | 
					
						
							|  |  |  |     def test_child_loggers(self): | 
					
						
							|  |  |  |         r = logging.getLogger() | 
					
						
							|  |  |  |         l1 = logging.getLogger('abc') | 
					
						
							|  |  |  |         l2 = logging.getLogger('def.ghi') | 
					
						
							|  |  |  |         c1 = r.getChild('xyz') | 
					
						
							|  |  |  |         c2 = r.getChild('uvw.xyz') | 
					
						
							|  |  |  |         self.assertTrue(c1 is logging.getLogger('xyz')) | 
					
						
							|  |  |  |         self.assertTrue(c2 is logging.getLogger('uvw.xyz')) | 
					
						
							|  |  |  |         c1 = l1.getChild('def') | 
					
						
							|  |  |  |         c2 = c1.getChild('ghi') | 
					
						
							|  |  |  |         c3 = l1.getChild('def.ghi') | 
					
						
							|  |  |  |         self.assertTrue(c1 is logging.getLogger('abc.def')) | 
					
						
							|  |  |  |         self.assertTrue(c2 is logging.getLogger('abc.def.ghi')) | 
					
						
							|  |  |  |         self.assertTrue(c2 is c3) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2010-10-19 20:44:14 +00:00
										 |  |  | class DerivedLogRecord(logging.LogRecord): | 
					
						
							|  |  |  |     pass | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2010-12-03 11:50:38 +00:00
										 |  |  | class LogRecordFactoryTest(BaseTest): | 
					
						
							| 
									
										
										
										
											2010-10-19 20:44:14 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def setUp(self): | 
					
						
							|  |  |  |         class CheckingFilter(logging.Filter): | 
					
						
							|  |  |  |             def __init__(self, cls): | 
					
						
							|  |  |  |                 self.cls = cls | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |             def filter(self, record): | 
					
						
							|  |  |  |                 t = type(record) | 
					
						
							|  |  |  |                 if t is not self.cls: | 
					
						
							|  |  |  |                     msg = 'Unexpected LogRecord type %s, expected %s' % (t, | 
					
						
							|  |  |  |                             self.cls) | 
					
						
							|  |  |  |                     raise TypeError(msg) | 
					
						
							|  |  |  |                 return True | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         BaseTest.setUp(self) | 
					
						
							|  |  |  |         self.filter = CheckingFilter(DerivedLogRecord) | 
					
						
							|  |  |  |         self.root_logger.addFilter(self.filter) | 
					
						
							| 
									
										
										
										
											2010-12-03 11:50:38 +00:00
										 |  |  |         self.orig_factory = logging.getLogRecordFactory() | 
					
						
							| 
									
										
										
										
											2010-10-19 20:44:14 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def tearDown(self): | 
					
						
							|  |  |  |         self.root_logger.removeFilter(self.filter) | 
					
						
							|  |  |  |         BaseTest.tearDown(self) | 
					
						
							| 
									
										
										
										
											2010-12-03 11:50:38 +00:00
										 |  |  |         logging.setLogRecordFactory(self.orig_factory) | 
					
						
							| 
									
										
										
										
											2010-10-19 20:44:14 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_logrecord_class(self): | 
					
						
							|  |  |  |         self.assertRaises(TypeError, self.root_logger.warning, | 
					
						
							|  |  |  |                           self.next_message()) | 
					
						
							| 
									
										
										
										
											2010-12-03 11:50:38 +00:00
										 |  |  |         logging.setLogRecordFactory(DerivedLogRecord) | 
					
						
							| 
									
										
										
										
											2010-10-19 20:44:14 +00:00
										 |  |  |         self.root_logger.error(self.next_message()) | 
					
						
							|  |  |  |         self.assert_log_lines([ | 
					
						
							|  |  |  |            ('root', 'ERROR', '2'), | 
					
						
							|  |  |  |         ]) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2010-09-14 09:34:09 +00:00
										 |  |  | class QueueHandlerTest(BaseTest): | 
					
						
							|  |  |  |     # Do not bother with a logger name group. | 
					
						
							|  |  |  |     expected_log_pat = r"^[\w.]+ -> ([\w]+): ([\d]+)$" | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def setUp(self): | 
					
						
							|  |  |  |         BaseTest.setUp(self) | 
					
						
							|  |  |  |         self.queue = queue.Queue(-1) | 
					
						
							|  |  |  |         self.que_hdlr = logging.handlers.QueueHandler(self.queue) | 
					
						
							|  |  |  |         self.que_logger = logging.getLogger('que') | 
					
						
							|  |  |  |         self.que_logger.propagate = False | 
					
						
							|  |  |  |         self.que_logger.setLevel(logging.WARNING) | 
					
						
							|  |  |  |         self.que_logger.addHandler(self.que_hdlr) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def tearDown(self): | 
					
						
							|  |  |  |         self.que_hdlr.close() | 
					
						
							|  |  |  |         BaseTest.tearDown(self) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_queue_handler(self): | 
					
						
							|  |  |  |         self.que_logger.debug(self.next_message()) | 
					
						
							|  |  |  |         self.assertRaises(queue.Empty, self.queue.get_nowait) | 
					
						
							|  |  |  |         self.que_logger.info(self.next_message()) | 
					
						
							|  |  |  |         self.assertRaises(queue.Empty, self.queue.get_nowait) | 
					
						
							|  |  |  |         msg = self.next_message() | 
					
						
							|  |  |  |         self.que_logger.warning(msg) | 
					
						
							|  |  |  |         data = self.queue.get_nowait() | 
					
						
							|  |  |  |         self.assertTrue(isinstance(data, logging.LogRecord)) | 
					
						
							|  |  |  |         self.assertEqual(data.name, self.que_logger.name) | 
					
						
							|  |  |  |         self.assertEqual((data.msg, data.args), (msg, None)) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-05-02 16:11:28 +02:00
										 |  |  |     @unittest.skipUnless(hasattr(logging.handlers, 'QueueListener'), | 
					
						
							|  |  |  |                          'logging.handlers.QueueListener required for this test') | 
					
						
							| 
									
										
										
										
											2011-04-15 22:27:17 +01:00
										 |  |  |     def test_queue_listener(self): | 
					
						
							|  |  |  |         handler = TestHandler(Matcher()) | 
					
						
							|  |  |  |         listener = logging.handlers.QueueListener(self.queue, handler) | 
					
						
							|  |  |  |         listener.start() | 
					
						
							|  |  |  |         try: | 
					
						
							|  |  |  |             self.que_logger.warning(self.next_message()) | 
					
						
							|  |  |  |             self.que_logger.error(self.next_message()) | 
					
						
							|  |  |  |             self.que_logger.critical(self.next_message()) | 
					
						
							|  |  |  |         finally: | 
					
						
							|  |  |  |             listener.stop() | 
					
						
							|  |  |  |         self.assertTrue(handler.matches(levelno=logging.WARNING, message='1')) | 
					
						
							|  |  |  |         self.assertTrue(handler.matches(levelno=logging.ERROR, message='2')) | 
					
						
							|  |  |  |         self.assertTrue(handler.matches(levelno=logging.CRITICAL, message='3')) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-04-26 20:26:41 +01:00
										 |  |  | ZERO = datetime.timedelta(0) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | class UTC(datetime.tzinfo): | 
					
						
							|  |  |  |     def utcoffset(self, dt): | 
					
						
							|  |  |  |         return ZERO | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     dst = utcoffset | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def tzname(self, dt): | 
					
						
							|  |  |  |         return 'UTC' | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | utc = UTC() | 
					
						
							| 
									
										
										
										
											2011-04-15 22:27:17 +01:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2010-10-25 13:57:39 +00:00
										 |  |  | class FormatterTest(unittest.TestCase): | 
					
						
							|  |  |  |     def setUp(self): | 
					
						
							|  |  |  |         self.common = { | 
					
						
							|  |  |  |             'name': 'formatter.test', | 
					
						
							|  |  |  |             'level': logging.DEBUG, | 
					
						
							|  |  |  |             'pathname': os.path.join('path', 'to', 'dummy.ext'), | 
					
						
							|  |  |  |             'lineno': 42, | 
					
						
							|  |  |  |             'exc_info': None, | 
					
						
							|  |  |  |             'func': None, | 
					
						
							|  |  |  |             'msg': 'Message with %d %s', | 
					
						
							|  |  |  |             'args': (2, 'placeholders'), | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  |         self.variants = { | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def get_record(self, name=None): | 
					
						
							|  |  |  |         result = dict(self.common) | 
					
						
							|  |  |  |         if name is not None: | 
					
						
							|  |  |  |             result.update(self.variants[name]) | 
					
						
							|  |  |  |         return logging.makeLogRecord(result) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_percent(self): | 
					
						
							| 
									
										
										
										
											2010-12-27 11:18:52 +00:00
										 |  |  |         # Test %-formatting | 
					
						
							| 
									
										
										
										
											2010-10-25 13:57:39 +00:00
										 |  |  |         r = self.get_record() | 
					
						
							|  |  |  |         f = logging.Formatter('${%(message)s}') | 
					
						
							|  |  |  |         self.assertEqual(f.format(r), '${Message with 2 placeholders}') | 
					
						
							|  |  |  |         f = logging.Formatter('%(random)s') | 
					
						
							|  |  |  |         self.assertRaises(KeyError, f.format, r) | 
					
						
							| 
									
										
										
										
											2010-10-26 13:16:11 +00:00
										 |  |  |         self.assertFalse(f.usesTime()) | 
					
						
							|  |  |  |         f = logging.Formatter('%(asctime)s') | 
					
						
							|  |  |  |         self.assertTrue(f.usesTime()) | 
					
						
							| 
									
										
										
										
											2011-02-26 16:06:02 +00:00
										 |  |  |         f = logging.Formatter('%(asctime)-15s') | 
					
						
							|  |  |  |         self.assertTrue(f.usesTime()) | 
					
						
							| 
									
										
										
										
											2010-10-26 13:16:11 +00:00
										 |  |  |         f = logging.Formatter('asctime') | 
					
						
							|  |  |  |         self.assertFalse(f.usesTime()) | 
					
						
							| 
									
										
										
										
											2010-10-25 13:57:39 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_braces(self): | 
					
						
							| 
									
										
										
										
											2010-12-27 11:18:52 +00:00
										 |  |  |         # Test {}-formatting | 
					
						
							| 
									
										
										
										
											2010-10-25 13:57:39 +00:00
										 |  |  |         r = self.get_record() | 
					
						
							|  |  |  |         f = logging.Formatter('$%{message}%$', style='{') | 
					
						
							|  |  |  |         self.assertEqual(f.format(r), '$%Message with 2 placeholders%$') | 
					
						
							|  |  |  |         f = logging.Formatter('{random}', style='{') | 
					
						
							|  |  |  |         self.assertRaises(KeyError, f.format, r) | 
					
						
							| 
									
										
										
										
											2010-10-26 13:16:11 +00:00
										 |  |  |         self.assertFalse(f.usesTime()) | 
					
						
							|  |  |  |         f = logging.Formatter('{asctime}', style='{') | 
					
						
							|  |  |  |         self.assertTrue(f.usesTime()) | 
					
						
							| 
									
										
										
										
											2011-02-26 16:06:02 +00:00
										 |  |  |         f = logging.Formatter('{asctime!s:15}', style='{') | 
					
						
							|  |  |  |         self.assertTrue(f.usesTime()) | 
					
						
							|  |  |  |         f = logging.Formatter('{asctime:15}', style='{') | 
					
						
							|  |  |  |         self.assertTrue(f.usesTime()) | 
					
						
							| 
									
										
										
										
											2010-10-26 13:16:11 +00:00
										 |  |  |         f = logging.Formatter('asctime', style='{') | 
					
						
							|  |  |  |         self.assertFalse(f.usesTime()) | 
					
						
							| 
									
										
										
										
											2010-10-25 13:57:39 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_dollars(self): | 
					
						
							| 
									
										
										
										
											2010-12-27 11:18:52 +00:00
										 |  |  |         # Test $-formatting | 
					
						
							| 
									
										
										
										
											2010-10-25 13:57:39 +00:00
										 |  |  |         r = self.get_record() | 
					
						
							|  |  |  |         f = logging.Formatter('$message', style='$') | 
					
						
							|  |  |  |         self.assertEqual(f.format(r), 'Message with 2 placeholders') | 
					
						
							|  |  |  |         f = logging.Formatter('$$%${message}%$$', style='$') | 
					
						
							|  |  |  |         self.assertEqual(f.format(r), '$%Message with 2 placeholders%$') | 
					
						
							|  |  |  |         f = logging.Formatter('${random}', style='$') | 
					
						
							|  |  |  |         self.assertRaises(KeyError, f.format, r) | 
					
						
							| 
									
										
										
										
											2010-10-26 13:16:11 +00:00
										 |  |  |         self.assertFalse(f.usesTime()) | 
					
						
							|  |  |  |         f = logging.Formatter('${asctime}', style='$') | 
					
						
							|  |  |  |         self.assertTrue(f.usesTime()) | 
					
						
							| 
									
										
										
										
											2011-02-26 16:06:02 +00:00
										 |  |  |         f = logging.Formatter('${asctime', style='$') | 
					
						
							|  |  |  |         self.assertFalse(f.usesTime()) | 
					
						
							| 
									
										
										
										
											2010-10-26 13:16:11 +00:00
										 |  |  |         f = logging.Formatter('$asctime', style='$') | 
					
						
							|  |  |  |         self.assertTrue(f.usesTime()) | 
					
						
							|  |  |  |         f = logging.Formatter('asctime', style='$') | 
					
						
							|  |  |  |         self.assertFalse(f.usesTime()) | 
					
						
							| 
									
										
										
										
											2010-10-25 13:57:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-04-26 18:43:05 +01:00
										 |  |  |     def test_invalid_style(self): | 
					
						
							|  |  |  |         self.assertRaises(ValueError, logging.Formatter, None, None, 'x') | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-04-27 08:30:30 +01:00
										 |  |  |     def test_time(self): | 
					
						
							| 
									
										
										
										
											2011-04-26 18:43:05 +01:00
										 |  |  |         r = self.get_record() | 
					
						
							| 
									
										
										
										
											2011-04-26 20:26:41 +01:00
										 |  |  |         dt = datetime.datetime(1993,4,21,8,3,0,0,utc) | 
					
						
							| 
									
										
										
										
											2011-04-27 08:30:30 +01:00
										 |  |  |         r.created = time.mktime(dt.timetuple()) - time.timezone | 
					
						
							| 
									
										
										
										
											2011-04-26 18:43:05 +01:00
										 |  |  |         r.msecs = 123 | 
					
						
							|  |  |  |         f = logging.Formatter('%(asctime)s %(message)s') | 
					
						
							| 
									
										
										
										
											2011-04-26 20:26:41 +01:00
										 |  |  |         f.converter = time.gmtime | 
					
						
							| 
									
										
										
										
											2011-04-26 18:43:05 +01:00
										 |  |  |         self.assertEqual(f.formatTime(r), '1993-04-21 08:03:00,123') | 
					
						
							|  |  |  |         self.assertEqual(f.formatTime(r, '%Y:%d'), '1993:21') | 
					
						
							| 
									
										
										
										
											2011-04-26 19:34:04 +01:00
										 |  |  |         f.format(r) | 
					
						
							|  |  |  |         self.assertEqual(r.asctime, '1993-04-21 08:03:00,123') | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | class TestBufferingFormatter(logging.BufferingFormatter): | 
					
						
							|  |  |  |     def formatHeader(self, records): | 
					
						
							|  |  |  |         return '[(%d)' % len(records) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def formatFooter(self, records): | 
					
						
							|  |  |  |         return '(%d)]' % len(records) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | class BufferingFormatterTest(unittest.TestCase): | 
					
						
							|  |  |  |     def setUp(self): | 
					
						
							|  |  |  |         self.records = [ | 
					
						
							|  |  |  |             logging.makeLogRecord({'msg': 'one'}), | 
					
						
							|  |  |  |             logging.makeLogRecord({'msg': 'two'}), | 
					
						
							|  |  |  |         ] | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_default(self): | 
					
						
							|  |  |  |         f = logging.BufferingFormatter() | 
					
						
							|  |  |  |         self.assertEqual('', f.format([])) | 
					
						
							|  |  |  |         self.assertEqual('onetwo', f.format(self.records)) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_custom(self): | 
					
						
							|  |  |  |         f = TestBufferingFormatter() | 
					
						
							|  |  |  |         self.assertEqual('[(2)onetwo(2)]', f.format(self.records)) | 
					
						
							|  |  |  |         lf = logging.Formatter('<%(message)s>') | 
					
						
							|  |  |  |         f = TestBufferingFormatter(lf) | 
					
						
							|  |  |  |         self.assertEqual('[(2)<one><two>(2)]', f.format(self.records)) | 
					
						
							| 
									
										
										
										
											2011-04-26 18:43:05 +01:00
										 |  |  | 
 | 
					
						
							|  |  |  | class ExceptionTest(BaseTest): | 
					
						
							|  |  |  |     def test_formatting(self): | 
					
						
							|  |  |  |         r = self.root_logger | 
					
						
							|  |  |  |         h = RecordingHandler() | 
					
						
							|  |  |  |         r.addHandler(h) | 
					
						
							|  |  |  |         try: | 
					
						
							|  |  |  |             raise RuntimeError('deliberate mistake') | 
					
						
							|  |  |  |         except: | 
					
						
							|  |  |  |             logging.exception('failed', stack_info=True) | 
					
						
							|  |  |  |         r.removeHandler(h) | 
					
						
							|  |  |  |         h.close() | 
					
						
							|  |  |  |         r = h.records[0] | 
					
						
							|  |  |  |         self.assertTrue(r.exc_text.startswith('Traceback (most recent ' | 
					
						
							|  |  |  |                                               'call last):\n')) | 
					
						
							|  |  |  |         self.assertTrue(r.exc_text.endswith('\nRuntimeError: ' | 
					
						
							|  |  |  |                                             'deliberate mistake')) | 
					
						
							|  |  |  |         self.assertTrue(r.stack_info.startswith('Stack (most recent ' | 
					
						
							|  |  |  |                                               'call last):\n')) | 
					
						
							|  |  |  |         self.assertTrue(r.stack_info.endswith('logging.exception(\'failed\', ' | 
					
						
							|  |  |  |                                             'stack_info=True)')) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2010-12-10 11:42:57 +00:00
										 |  |  | class LastResortTest(BaseTest): | 
					
						
							|  |  |  |     def test_last_resort(self): | 
					
						
							| 
									
										
										
										
											2010-12-27 11:18:52 +00:00
										 |  |  |         # Test the last resort handler | 
					
						
							| 
									
										
										
										
											2010-12-10 11:42:57 +00:00
										 |  |  |         root = self.root_logger | 
					
						
							|  |  |  |         root.removeHandler(self.root_hdlr) | 
					
						
							|  |  |  |         old_stderr = sys.stderr | 
					
						
							|  |  |  |         old_lastresort = logging.lastResort | 
					
						
							|  |  |  |         old_raise_exceptions = logging.raiseExceptions | 
					
						
							|  |  |  |         try: | 
					
						
							|  |  |  |             sys.stderr = sio = io.StringIO() | 
					
						
							| 
									
										
										
										
											2011-07-25 19:58:13 +01:00
										 |  |  |             root.debug('This should not appear') | 
					
						
							|  |  |  |             self.assertEqual(sio.getvalue(), '') | 
					
						
							| 
									
										
										
										
											2010-12-10 11:42:57 +00:00
										 |  |  |             root.warning('This is your final chance!') | 
					
						
							|  |  |  |             self.assertEqual(sio.getvalue(), 'This is your final chance!\n') | 
					
						
							|  |  |  |             #No handlers and no last resort, so 'No handlers' message | 
					
						
							|  |  |  |             logging.lastResort = None | 
					
						
							|  |  |  |             sys.stderr = sio = io.StringIO() | 
					
						
							|  |  |  |             root.warning('This is your final chance!') | 
					
						
							|  |  |  |             self.assertEqual(sio.getvalue(), 'No handlers could be found for logger "root"\n') | 
					
						
							|  |  |  |             # 'No handlers' message only printed once | 
					
						
							|  |  |  |             sys.stderr = sio = io.StringIO() | 
					
						
							|  |  |  |             root.warning('This is your final chance!') | 
					
						
							|  |  |  |             self.assertEqual(sio.getvalue(), '') | 
					
						
							|  |  |  |             root.manager.emittedNoHandlerWarning = False | 
					
						
							|  |  |  |             #If raiseExceptions is False, no message is printed | 
					
						
							|  |  |  |             logging.raiseExceptions = False | 
					
						
							|  |  |  |             sys.stderr = sio = io.StringIO() | 
					
						
							|  |  |  |             root.warning('This is your final chance!') | 
					
						
							|  |  |  |             self.assertEqual(sio.getvalue(), '') | 
					
						
							|  |  |  |         finally: | 
					
						
							|  |  |  |             sys.stderr = old_stderr | 
					
						
							|  |  |  |             root.addHandler(self.root_hdlr) | 
					
						
							|  |  |  |             logging.lastResort = old_lastresort | 
					
						
							|  |  |  |             logging.raiseExceptions = old_raise_exceptions | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-03-29 17:20:34 +01:00
										 |  |  | class FakeHandler: | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def __init__(self, identifier, called): | 
					
						
							|  |  |  |         for method in ('acquire', 'flush', 'close', 'release'): | 
					
						
							|  |  |  |             setattr(self, method, self.record_call(identifier, method, called)) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def record_call(self, identifier, method_name, called): | 
					
						
							|  |  |  |         def inner(): | 
					
						
							|  |  |  |             called.append('{} - {}'.format(identifier, method_name)) | 
					
						
							|  |  |  |         return inner | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | class RecordingHandler(logging.NullHandler): | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def __init__(self, *args, **kwargs): | 
					
						
							|  |  |  |         super(RecordingHandler, self).__init__(*args, **kwargs) | 
					
						
							|  |  |  |         self.records = [] | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def handle(self, record): | 
					
						
							|  |  |  |         """Keep track of all the emitted records.""" | 
					
						
							|  |  |  |         self.records.append(record) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | class ShutdownTest(BaseTest): | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-04-20 15:41:14 +01:00
										 |  |  |     """Test suite for the shutdown method.""" | 
					
						
							| 
									
										
										
										
											2011-03-29 17:20:34 +01:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def setUp(self): | 
					
						
							|  |  |  |         super(ShutdownTest, self).setUp() | 
					
						
							|  |  |  |         self.called = [] | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         raise_exceptions = logging.raiseExceptions | 
					
						
							| 
									
										
										
										
											2011-06-05 09:31:34 +01:00
										 |  |  |         self.addCleanup(setattr, logging, 'raiseExceptions', raise_exceptions) | 
					
						
							| 
									
										
										
										
											2011-03-29 17:20:34 +01:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def raise_error(self, error): | 
					
						
							|  |  |  |         def inner(): | 
					
						
							|  |  |  |             raise error() | 
					
						
							|  |  |  |         return inner | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_no_failure(self): | 
					
						
							|  |  |  |         # create some fake handlers | 
					
						
							|  |  |  |         handler0 = FakeHandler(0, self.called) | 
					
						
							|  |  |  |         handler1 = FakeHandler(1, self.called) | 
					
						
							|  |  |  |         handler2 = FakeHandler(2, self.called) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         # create live weakref to those handlers | 
					
						
							|  |  |  |         handlers = map(logging.weakref.ref, [handler0, handler1, handler2]) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         logging.shutdown(handlerList=list(handlers)) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         expected = ['2 - acquire', '2 - flush', '2 - close', '2 - release', | 
					
						
							|  |  |  |                     '1 - acquire', '1 - flush', '1 - close', '1 - release', | 
					
						
							|  |  |  |                     '0 - acquire', '0 - flush', '0 - close', '0 - release'] | 
					
						
							|  |  |  |         self.assertEqual(expected, self.called) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def _test_with_failure_in_method(self, method, error): | 
					
						
							|  |  |  |         handler = FakeHandler(0, self.called) | 
					
						
							|  |  |  |         setattr(handler, method, self.raise_error(error)) | 
					
						
							|  |  |  |         handlers = [logging.weakref.ref(handler)] | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         logging.shutdown(handlerList=list(handlers)) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         self.assertEqual('0 - release', self.called[-1]) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_with_ioerror_in_acquire(self): | 
					
						
							|  |  |  |         self._test_with_failure_in_method('acquire', IOError) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_with_ioerror_in_flush(self): | 
					
						
							|  |  |  |         self._test_with_failure_in_method('flush', IOError) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_with_ioerror_in_close(self): | 
					
						
							|  |  |  |         self._test_with_failure_in_method('close', IOError) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_with_valueerror_in_acquire(self): | 
					
						
							|  |  |  |         self._test_with_failure_in_method('acquire', ValueError) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_with_valueerror_in_flush(self): | 
					
						
							|  |  |  |         self._test_with_failure_in_method('flush', ValueError) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_with_valueerror_in_close(self): | 
					
						
							|  |  |  |         self._test_with_failure_in_method('close', ValueError) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_with_other_error_in_acquire_without_raise(self): | 
					
						
							|  |  |  |         logging.raiseExceptions = False | 
					
						
							|  |  |  |         self._test_with_failure_in_method('acquire', IndexError) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_with_other_error_in_flush_without_raise(self): | 
					
						
							|  |  |  |         logging.raiseExceptions = False | 
					
						
							|  |  |  |         self._test_with_failure_in_method('flush', IndexError) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_with_other_error_in_close_without_raise(self): | 
					
						
							|  |  |  |         logging.raiseExceptions = False | 
					
						
							|  |  |  |         self._test_with_failure_in_method('close', IndexError) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_with_other_error_in_acquire_with_raise(self): | 
					
						
							|  |  |  |         logging.raiseExceptions = True | 
					
						
							|  |  |  |         self.assertRaises(IndexError, self._test_with_failure_in_method, | 
					
						
							|  |  |  |                           'acquire', IndexError) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_with_other_error_in_flush_with_raise(self): | 
					
						
							|  |  |  |         logging.raiseExceptions = True | 
					
						
							|  |  |  |         self.assertRaises(IndexError, self._test_with_failure_in_method, | 
					
						
							|  |  |  |                           'flush', IndexError) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_with_other_error_in_close_with_raise(self): | 
					
						
							|  |  |  |         logging.raiseExceptions = True | 
					
						
							|  |  |  |         self.assertRaises(IndexError, self._test_with_failure_in_method, | 
					
						
							|  |  |  |                           'close', IndexError) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | class ModuleLevelMiscTest(BaseTest): | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-04-20 15:41:14 +01:00
										 |  |  |     """Test suite for some module level methods.""" | 
					
						
							| 
									
										
										
										
											2011-03-29 17:20:34 +01:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_disable(self): | 
					
						
							|  |  |  |         old_disable = logging.root.manager.disable | 
					
						
							|  |  |  |         # confirm our assumptions are correct | 
					
						
							| 
									
										
										
										
											2011-06-05 09:31:34 +01:00
										 |  |  |         self.assertEqual(old_disable, 0) | 
					
						
							|  |  |  |         self.addCleanup(logging.disable, old_disable) | 
					
						
							| 
									
										
										
										
											2011-03-29 17:20:34 +01:00
										 |  |  | 
 | 
					
						
							|  |  |  |         logging.disable(83) | 
					
						
							|  |  |  |         self.assertEqual(logging.root.manager.disable, 83) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def _test_log(self, method, level=None): | 
					
						
							|  |  |  |         called = [] | 
					
						
							|  |  |  |         patch(self, logging, 'basicConfig', | 
					
						
							| 
									
										
										
										
											2011-04-22 00:17:46 +01:00
										 |  |  |               lambda *a, **kw: called.append((a, kw))) | 
					
						
							| 
									
										
										
										
											2011-03-29 17:20:34 +01:00
										 |  |  | 
 | 
					
						
							|  |  |  |         recording = RecordingHandler() | 
					
						
							|  |  |  |         logging.root.addHandler(recording) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         log_method = getattr(logging, method) | 
					
						
							|  |  |  |         if level is not None: | 
					
						
							|  |  |  |             log_method(level, "test me: %r", recording) | 
					
						
							|  |  |  |         else: | 
					
						
							|  |  |  |             log_method("test me: %r", recording) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         self.assertEqual(len(recording.records), 1) | 
					
						
							|  |  |  |         record = recording.records[0] | 
					
						
							|  |  |  |         self.assertEqual(record.getMessage(), "test me: %r" % recording) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         expected_level = level if level is not None else getattr(logging, method.upper()) | 
					
						
							|  |  |  |         self.assertEqual(record.levelno, expected_level) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         # basicConfig was not called! | 
					
						
							|  |  |  |         self.assertEqual(called, []) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_log(self): | 
					
						
							|  |  |  |         self._test_log('log', logging.ERROR) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_debug(self): | 
					
						
							|  |  |  |         self._test_log('debug') | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_info(self): | 
					
						
							|  |  |  |         self._test_log('info') | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_warning(self): | 
					
						
							|  |  |  |         self._test_log('warning') | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_error(self): | 
					
						
							|  |  |  |         self._test_log('error') | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_critical(self): | 
					
						
							|  |  |  |         self._test_log('critical') | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_set_logger_class(self): | 
					
						
							|  |  |  |         self.assertRaises(TypeError, logging.setLoggerClass, object) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         class MyLogger(logging.Logger): | 
					
						
							|  |  |  |             pass | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         logging.setLoggerClass(MyLogger) | 
					
						
							|  |  |  |         self.assertEqual(logging.getLoggerClass(), MyLogger) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         logging.setLoggerClass(logging.Logger) | 
					
						
							|  |  |  |         self.assertEqual(logging.getLoggerClass(), logging.Logger) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-04-26 18:43:05 +01:00
										 |  |  | class LogRecordTest(BaseTest): | 
					
						
							|  |  |  |     def test_str_rep(self): | 
					
						
							|  |  |  |         r = logging.makeLogRecord({}) | 
					
						
							|  |  |  |         s = str(r) | 
					
						
							|  |  |  |         self.assertTrue(s.startswith('<LogRecord: ')) | 
					
						
							|  |  |  |         self.assertTrue(s.endswith('>')) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_dict_arg(self): | 
					
						
							|  |  |  |         h = RecordingHandler() | 
					
						
							|  |  |  |         r = logging.getLogger() | 
					
						
							|  |  |  |         r.addHandler(h) | 
					
						
							|  |  |  |         d = {'less' : 'more' } | 
					
						
							|  |  |  |         logging.warning('less is %(less)s', d) | 
					
						
							|  |  |  |         self.assertIs(h.records[0].args, d) | 
					
						
							|  |  |  |         self.assertEqual(h.records[0].message, 'less is more') | 
					
						
							|  |  |  |         r.removeHandler(h) | 
					
						
							|  |  |  |         h.close() | 
					
						
							| 
									
										
										
										
											2011-03-29 17:20:34 +01:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-04-28 12:04:58 +01:00
										 |  |  |     def test_multiprocessing(self): | 
					
						
							|  |  |  |         r = logging.makeLogRecord({}) | 
					
						
							|  |  |  |         self.assertEqual(r.processName, 'MainProcess') | 
					
						
							| 
									
										
										
										
											2011-05-17 07:41:18 +01:00
										 |  |  |         try: | 
					
						
							|  |  |  |             import multiprocessing as mp | 
					
						
							|  |  |  |             r = logging.makeLogRecord({}) | 
					
						
							|  |  |  |             self.assertEqual(r.processName, mp.current_process().name) | 
					
						
							|  |  |  |         except ImportError: | 
					
						
							|  |  |  |             pass | 
					
						
							| 
									
										
										
										
											2011-04-28 12:04:58 +01:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_optional(self): | 
					
						
							|  |  |  |         r = logging.makeLogRecord({}) | 
					
						
							|  |  |  |         NOT_NONE = self.assertIsNotNone | 
					
						
							| 
									
										
										
										
											2011-05-17 07:41:18 +01:00
										 |  |  |         if threading: | 
					
						
							|  |  |  |             NOT_NONE(r.thread) | 
					
						
							|  |  |  |             NOT_NONE(r.threadName) | 
					
						
							| 
									
										
										
										
											2011-04-28 12:04:58 +01:00
										 |  |  |         NOT_NONE(r.process) | 
					
						
							|  |  |  |         NOT_NONE(r.processName) | 
					
						
							|  |  |  |         log_threads = logging.logThreads | 
					
						
							|  |  |  |         log_processes = logging.logProcesses | 
					
						
							|  |  |  |         log_multiprocessing = logging.logMultiprocessing | 
					
						
							|  |  |  |         try: | 
					
						
							|  |  |  |             logging.logThreads = False | 
					
						
							|  |  |  |             logging.logProcesses = False | 
					
						
							|  |  |  |             logging.logMultiprocessing = False | 
					
						
							|  |  |  |             r = logging.makeLogRecord({}) | 
					
						
							|  |  |  |             NONE = self.assertIsNone | 
					
						
							|  |  |  |             NONE(r.thread) | 
					
						
							|  |  |  |             NONE(r.threadName) | 
					
						
							|  |  |  |             NONE(r.process) | 
					
						
							|  |  |  |             NONE(r.processName) | 
					
						
							|  |  |  |         finally: | 
					
						
							|  |  |  |             logging.logThreads = log_threads | 
					
						
							|  |  |  |             logging.logProcesses = log_processes | 
					
						
							|  |  |  |             logging.logMultiprocessing = log_multiprocessing | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-03-29 17:20:34 +01:00
										 |  |  | class BasicConfigTest(unittest.TestCase): | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-04-20 11:50:56 +01:00
										 |  |  |     """Test suite for logging.basicConfig.""" | 
					
						
							| 
									
										
										
										
											2011-03-29 17:20:34 +01:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def setUp(self): | 
					
						
							|  |  |  |         super(BasicConfigTest, self).setUp() | 
					
						
							| 
									
										
										
										
											2011-04-20 10:58:06 +01:00
										 |  |  |         self.handlers = logging.root.handlers | 
					
						
							| 
									
										
										
										
											2011-04-20 11:50:56 +01:00
										 |  |  |         self.saved_handlers = logging._handlers.copy() | 
					
						
							|  |  |  |         self.saved_handler_list = logging._handlerList[:] | 
					
						
							| 
									
										
										
										
											2011-04-20 12:20:44 +01:00
										 |  |  |         self.original_logging_level = logging.root.level | 
					
						
							| 
									
										
										
										
											2011-04-20 10:58:06 +01:00
										 |  |  |         self.addCleanup(self.cleanup) | 
					
						
							| 
									
										
										
										
											2011-03-29 17:20:34 +01:00
										 |  |  |         logging.root.handlers = [] | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def tearDown(self): | 
					
						
							| 
									
										
										
										
											2011-04-20 10:58:06 +01:00
										 |  |  |         for h in logging.root.handlers[:]: | 
					
						
							|  |  |  |             logging.root.removeHandler(h) | 
					
						
							|  |  |  |             h.close() | 
					
						
							| 
									
										
										
										
											2011-03-29 17:20:34 +01:00
										 |  |  |         super(BasicConfigTest, self).tearDown() | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-04-20 10:58:06 +01:00
										 |  |  |     def cleanup(self): | 
					
						
							|  |  |  |         setattr(logging.root, 'handlers', self.handlers) | 
					
						
							| 
									
										
										
										
											2011-04-20 11:50:56 +01:00
										 |  |  |         logging._handlers.clear() | 
					
						
							|  |  |  |         logging._handlers.update(self.saved_handlers) | 
					
						
							|  |  |  |         logging._handlerList[:] = self.saved_handler_list | 
					
						
							| 
									
										
										
										
											2011-04-20 12:20:44 +01:00
										 |  |  |         logging.root.level = self.original_logging_level | 
					
						
							| 
									
										
										
										
											2011-04-20 10:58:06 +01:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-03-29 17:20:34 +01:00
										 |  |  |     def test_no_kwargs(self): | 
					
						
							|  |  |  |         logging.basicConfig() | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         # handler defaults to a StreamHandler to sys.stderr | 
					
						
							|  |  |  |         self.assertEqual(len(logging.root.handlers), 1) | 
					
						
							|  |  |  |         handler = logging.root.handlers[0] | 
					
						
							|  |  |  |         self.assertIsInstance(handler, logging.StreamHandler) | 
					
						
							|  |  |  |         self.assertEqual(handler.stream, sys.stderr) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         formatter = handler.formatter | 
					
						
							|  |  |  |         # format defaults to logging.BASIC_FORMAT | 
					
						
							|  |  |  |         self.assertEqual(formatter._style._fmt, logging.BASIC_FORMAT) | 
					
						
							|  |  |  |         # datefmt defaults to None | 
					
						
							|  |  |  |         self.assertIsNone(formatter.datefmt) | 
					
						
							|  |  |  |         # style defaults to % | 
					
						
							|  |  |  |         self.assertIsInstance(formatter._style, logging.PercentStyle) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         # level is not explicitely set | 
					
						
							| 
									
										
										
										
											2011-04-20 12:50:42 +01:00
										 |  |  |         self.assertEqual(logging.root.level, self.original_logging_level) | 
					
						
							| 
									
										
										
										
											2011-03-29 17:20:34 +01:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_filename(self): | 
					
						
							|  |  |  |         logging.basicConfig(filename='test.log') | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         self.assertEqual(len(logging.root.handlers), 1) | 
					
						
							|  |  |  |         handler = logging.root.handlers[0] | 
					
						
							|  |  |  |         self.assertIsInstance(handler, logging.FileHandler) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         expected = logging.FileHandler('test.log', 'a') | 
					
						
							|  |  |  |         self.addCleanup(expected.close) | 
					
						
							|  |  |  |         self.assertEqual(handler.stream.mode, expected.stream.mode) | 
					
						
							|  |  |  |         self.assertEqual(handler.stream.name, expected.stream.name) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_filemode(self): | 
					
						
							|  |  |  |         logging.basicConfig(filename='test.log', filemode='wb') | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         handler = logging.root.handlers[0] | 
					
						
							|  |  |  |         expected = logging.FileHandler('test.log', 'wb') | 
					
						
							|  |  |  |         self.addCleanup(expected.close) | 
					
						
							|  |  |  |         self.assertEqual(handler.stream.mode, expected.stream.mode) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_stream(self): | 
					
						
							|  |  |  |         stream = io.StringIO() | 
					
						
							|  |  |  |         self.addCleanup(stream.close) | 
					
						
							|  |  |  |         logging.basicConfig(stream=stream) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         self.assertEqual(len(logging.root.handlers), 1) | 
					
						
							|  |  |  |         handler = logging.root.handlers[0] | 
					
						
							|  |  |  |         self.assertIsInstance(handler, logging.StreamHandler) | 
					
						
							|  |  |  |         self.assertEqual(handler.stream, stream) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_format(self): | 
					
						
							|  |  |  |         logging.basicConfig(format='foo') | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         formatter = logging.root.handlers[0].formatter | 
					
						
							|  |  |  |         self.assertEqual(formatter._style._fmt, 'foo') | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_datefmt(self): | 
					
						
							|  |  |  |         logging.basicConfig(datefmt='bar') | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         formatter = logging.root.handlers[0].formatter | 
					
						
							|  |  |  |         self.assertEqual(formatter.datefmt, 'bar') | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_style(self): | 
					
						
							|  |  |  |         logging.basicConfig(style='$') | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         formatter = logging.root.handlers[0].formatter | 
					
						
							|  |  |  |         self.assertIsInstance(formatter._style, logging.StringTemplateStyle) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_level(self): | 
					
						
							|  |  |  |         old_level = logging.root.level | 
					
						
							| 
									
										
										
										
											2011-06-05 09:31:34 +01:00
										 |  |  |         self.addCleanup(logging.root.setLevel, old_level) | 
					
						
							| 
									
										
										
										
											2011-03-29 17:20:34 +01:00
										 |  |  | 
 | 
					
						
							|  |  |  |         logging.basicConfig(level=57) | 
					
						
							|  |  |  |         self.assertEqual(logging.root.level, 57) | 
					
						
							| 
									
										
										
										
											2011-04-26 18:43:05 +01:00
										 |  |  |         # Test that second call has no effect | 
					
						
							|  |  |  |         logging.basicConfig(level=58) | 
					
						
							|  |  |  |         self.assertEqual(logging.root.level, 57) | 
					
						
							| 
									
										
										
										
											2011-03-29 17:20:34 +01:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-04-11 08:42:07 +01:00
										 |  |  |     def test_incompatible(self): | 
					
						
							|  |  |  |         assertRaises = self.assertRaises | 
					
						
							|  |  |  |         handlers = [logging.StreamHandler()] | 
					
						
							|  |  |  |         stream = sys.stderr | 
					
						
							|  |  |  |         assertRaises(ValueError, logging.basicConfig, filename='test.log', | 
					
						
							|  |  |  |                                                      stream=stream) | 
					
						
							|  |  |  |         assertRaises(ValueError, logging.basicConfig, filename='test.log', | 
					
						
							|  |  |  |                                                      handlers=handlers) | 
					
						
							|  |  |  |         assertRaises(ValueError, logging.basicConfig, stream=stream, | 
					
						
							|  |  |  |                                                      handlers=handlers) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_handlers(self): | 
					
						
							| 
									
										
										
										
											2011-04-26 18:43:05 +01:00
										 |  |  |         handlers = [ | 
					
						
							|  |  |  |             logging.StreamHandler(), | 
					
						
							|  |  |  |             logging.StreamHandler(sys.stdout), | 
					
						
							|  |  |  |             logging.StreamHandler(), | 
					
						
							|  |  |  |         ] | 
					
						
							|  |  |  |         f = logging.Formatter() | 
					
						
							|  |  |  |         handlers[2].setFormatter(f) | 
					
						
							| 
									
										
										
										
											2011-04-11 08:42:07 +01:00
										 |  |  |         logging.basicConfig(handlers=handlers) | 
					
						
							|  |  |  |         self.assertIs(handlers[0], logging.root.handlers[0]) | 
					
						
							|  |  |  |         self.assertIs(handlers[1], logging.root.handlers[1]) | 
					
						
							| 
									
										
										
										
											2011-04-26 18:43:05 +01:00
										 |  |  |         self.assertIs(handlers[2], logging.root.handlers[2]) | 
					
						
							| 
									
										
										
										
											2011-04-11 08:42:07 +01:00
										 |  |  |         self.assertIsNotNone(handlers[0].formatter) | 
					
						
							|  |  |  |         self.assertIsNotNone(handlers[1].formatter) | 
					
						
							| 
									
										
										
										
											2011-04-26 18:43:05 +01:00
										 |  |  |         self.assertIs(handlers[2].formatter, f) | 
					
						
							| 
									
										
										
										
											2011-04-11 08:42:07 +01:00
										 |  |  |         self.assertIs(handlers[0].formatter, handlers[1].formatter) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-03-29 17:20:34 +01:00
										 |  |  |     def _test_log(self, method, level=None): | 
					
						
							|  |  |  |         # logging.root has no handlers so basicConfig should be called | 
					
						
							|  |  |  |         called = [] | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         old_basic_config = logging.basicConfig | 
					
						
							|  |  |  |         def my_basic_config(*a, **kw): | 
					
						
							|  |  |  |             old_basic_config() | 
					
						
							|  |  |  |             old_level = logging.root.level | 
					
						
							|  |  |  |             logging.root.setLevel(100)  # avoid having messages in stderr | 
					
						
							| 
									
										
										
										
											2011-06-05 09:31:34 +01:00
										 |  |  |             self.addCleanup(logging.root.setLevel, old_level) | 
					
						
							| 
									
										
										
										
											2011-03-29 17:20:34 +01:00
										 |  |  |             called.append((a, kw)) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         patch(self, logging, 'basicConfig', my_basic_config) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         log_method = getattr(logging, method) | 
					
						
							|  |  |  |         if level is not None: | 
					
						
							|  |  |  |             log_method(level, "test me") | 
					
						
							|  |  |  |         else: | 
					
						
							|  |  |  |             log_method("test me") | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         # basicConfig was called with no arguments | 
					
						
							|  |  |  |         self.assertEqual(called, [((), {})]) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_log(self): | 
					
						
							|  |  |  |         self._test_log('log', logging.WARNING) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_debug(self): | 
					
						
							|  |  |  |         self._test_log('debug') | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_info(self): | 
					
						
							|  |  |  |         self._test_log('info') | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_warning(self): | 
					
						
							|  |  |  |         self._test_log('warning') | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_error(self): | 
					
						
							|  |  |  |         self._test_log('error') | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_critical(self): | 
					
						
							|  |  |  |         self._test_log('critical') | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | class LoggerAdapterTest(unittest.TestCase): | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def setUp(self): | 
					
						
							|  |  |  |         super(LoggerAdapterTest, self).setUp() | 
					
						
							|  |  |  |         old_handler_list = logging._handlerList[:] | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         self.recording = RecordingHandler() | 
					
						
							|  |  |  |         self.logger = logging.root | 
					
						
							|  |  |  |         self.logger.addHandler(self.recording) | 
					
						
							| 
									
										
										
										
											2011-06-05 09:31:34 +01:00
										 |  |  |         self.addCleanup(self.logger.removeHandler, self.recording) | 
					
						
							| 
									
										
										
										
											2011-03-29 17:20:34 +01:00
										 |  |  |         self.addCleanup(self.recording.close) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         def cleanup(): | 
					
						
							|  |  |  |             logging._handlerList[:] = old_handler_list | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         self.addCleanup(cleanup) | 
					
						
							|  |  |  |         self.addCleanup(logging.shutdown) | 
					
						
							|  |  |  |         self.adapter = logging.LoggerAdapter(logger=self.logger, extra=None) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_exception(self): | 
					
						
							|  |  |  |         msg = 'testing exception: %r' | 
					
						
							|  |  |  |         exc = None | 
					
						
							|  |  |  |         try: | 
					
						
							| 
									
										
										
										
											2011-06-05 09:31:34 +01:00
										 |  |  |             1 / 0 | 
					
						
							|  |  |  |         except ZeroDivisionError as e: | 
					
						
							| 
									
										
										
										
											2011-03-29 17:20:34 +01:00
										 |  |  |             exc = e | 
					
						
							|  |  |  |             self.adapter.exception(msg, self.recording) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         self.assertEqual(len(self.recording.records), 1) | 
					
						
							|  |  |  |         record = self.recording.records[0] | 
					
						
							|  |  |  |         self.assertEqual(record.levelno, logging.ERROR) | 
					
						
							|  |  |  |         self.assertEqual(record.msg, msg) | 
					
						
							|  |  |  |         self.assertEqual(record.args, (self.recording,)) | 
					
						
							|  |  |  |         self.assertEqual(record.exc_info, | 
					
						
							|  |  |  |                          (exc.__class__, exc, exc.__traceback__)) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_critical(self): | 
					
						
							|  |  |  |         msg = 'critical test! %r' | 
					
						
							|  |  |  |         self.adapter.critical(msg, self.recording) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         self.assertEqual(len(self.recording.records), 1) | 
					
						
							|  |  |  |         record = self.recording.records[0] | 
					
						
							|  |  |  |         self.assertEqual(record.levelno, logging.CRITICAL) | 
					
						
							|  |  |  |         self.assertEqual(record.msg, msg) | 
					
						
							|  |  |  |         self.assertEqual(record.args, (self.recording,)) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_is_enabled_for(self): | 
					
						
							|  |  |  |         old_disable = self.adapter.logger.manager.disable | 
					
						
							|  |  |  |         self.adapter.logger.manager.disable = 33 | 
					
						
							| 
									
										
										
										
											2011-06-05 09:31:34 +01:00
										 |  |  |         self.addCleanup(setattr, self.adapter.logger.manager, 'disable', | 
					
						
							|  |  |  |                         old_disable) | 
					
						
							| 
									
										
										
										
											2011-03-29 17:20:34 +01:00
										 |  |  |         self.assertFalse(self.adapter.isEnabledFor(32)) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_has_handlers(self): | 
					
						
							|  |  |  |         self.assertTrue(self.adapter.hasHandlers()) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         for handler in self.logger.handlers: | 
					
						
							|  |  |  |             self.logger.removeHandler(handler) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-06-05 09:31:34 +01:00
										 |  |  |         self.assertFalse(self.logger.hasHandlers()) | 
					
						
							| 
									
										
										
										
											2011-03-29 17:20:34 +01:00
										 |  |  |         self.assertFalse(self.adapter.hasHandlers()) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | class LoggerTest(BaseTest): | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def setUp(self): | 
					
						
							|  |  |  |         super(LoggerTest, self).setUp() | 
					
						
							|  |  |  |         self.recording = RecordingHandler() | 
					
						
							|  |  |  |         self.logger = logging.Logger(name='blah') | 
					
						
							|  |  |  |         self.logger.addHandler(self.recording) | 
					
						
							| 
									
										
										
										
											2011-06-05 09:31:34 +01:00
										 |  |  |         self.addCleanup(self.logger.removeHandler, self.recording) | 
					
						
							| 
									
										
										
										
											2011-03-29 17:20:34 +01:00
										 |  |  |         self.addCleanup(self.recording.close) | 
					
						
							|  |  |  |         self.addCleanup(logging.shutdown) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_set_invalid_level(self): | 
					
						
							|  |  |  |         self.assertRaises(TypeError, self.logger.setLevel, object()) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_exception(self): | 
					
						
							|  |  |  |         msg = 'testing exception: %r' | 
					
						
							|  |  |  |         exc = None | 
					
						
							|  |  |  |         try: | 
					
						
							| 
									
										
										
										
											2011-06-05 09:31:34 +01:00
										 |  |  |             1 / 0 | 
					
						
							|  |  |  |         except ZeroDivisionError as e: | 
					
						
							| 
									
										
										
										
											2011-03-29 17:20:34 +01:00
										 |  |  |             exc = e | 
					
						
							|  |  |  |             self.logger.exception(msg, self.recording) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         self.assertEqual(len(self.recording.records), 1) | 
					
						
							|  |  |  |         record = self.recording.records[0] | 
					
						
							|  |  |  |         self.assertEqual(record.levelno, logging.ERROR) | 
					
						
							|  |  |  |         self.assertEqual(record.msg, msg) | 
					
						
							|  |  |  |         self.assertEqual(record.args, (self.recording,)) | 
					
						
							|  |  |  |         self.assertEqual(record.exc_info, | 
					
						
							|  |  |  |                          (exc.__class__, exc, exc.__traceback__)) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_log_invalid_level_with_raise(self): | 
					
						
							|  |  |  |         old_raise = logging.raiseExceptions | 
					
						
							| 
									
										
										
										
											2011-06-05 09:31:34 +01:00
										 |  |  |         self.addCleanup(setattr, logging, 'raiseExecptions', old_raise) | 
					
						
							| 
									
										
										
										
											2011-03-29 17:20:34 +01:00
										 |  |  | 
 | 
					
						
							|  |  |  |         logging.raiseExceptions = True | 
					
						
							|  |  |  |         self.assertRaises(TypeError, self.logger.log, '10', 'test message') | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_log_invalid_level_no_raise(self): | 
					
						
							|  |  |  |         old_raise = logging.raiseExceptions | 
					
						
							| 
									
										
										
										
											2011-06-05 09:31:34 +01:00
										 |  |  |         self.addCleanup(setattr, logging, 'raiseExecptions', old_raise) | 
					
						
							| 
									
										
										
										
											2011-03-29 17:20:34 +01:00
										 |  |  | 
 | 
					
						
							|  |  |  |         logging.raiseExceptions = False | 
					
						
							|  |  |  |         self.logger.log('10', 'test message')  # no exception happens | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_find_caller_with_stack_info(self): | 
					
						
							|  |  |  |         called = [] | 
					
						
							|  |  |  |         patch(self, logging.traceback, 'print_stack', | 
					
						
							|  |  |  |               lambda f, file: called.append(file.getvalue())) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         self.logger.findCaller(stack_info=True) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         self.assertEqual(len(called), 1) | 
					
						
							|  |  |  |         self.assertEqual('Stack (most recent call last):\n', called[0]) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_make_record_with_extra_overwrite(self): | 
					
						
							|  |  |  |         name = 'my record' | 
					
						
							|  |  |  |         level = 13 | 
					
						
							|  |  |  |         fn = lno = msg = args = exc_info = func = sinfo = None | 
					
						
							|  |  |  |         rv = logging._logRecordFactory(name, level, fn, lno, msg, args, | 
					
						
							|  |  |  |                                        exc_info, func, sinfo) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         for key in ('message', 'asctime') + tuple(rv.__dict__.keys()): | 
					
						
							|  |  |  |             extra = {key: 'some value'} | 
					
						
							|  |  |  |             self.assertRaises(KeyError, self.logger.makeRecord, name, level, | 
					
						
							|  |  |  |                               fn, lno, msg, args, exc_info, | 
					
						
							|  |  |  |                               extra=extra, sinfo=sinfo) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_make_record_with_extra_no_overwrite(self): | 
					
						
							|  |  |  |         name = 'my record' | 
					
						
							|  |  |  |         level = 13 | 
					
						
							|  |  |  |         fn = lno = msg = args = exc_info = func = sinfo = None | 
					
						
							|  |  |  |         extra = {'valid_key': 'some value'} | 
					
						
							|  |  |  |         result = self.logger.makeRecord(name, level, fn, lno, msg, args, | 
					
						
							|  |  |  |                                         exc_info, extra=extra, sinfo=sinfo) | 
					
						
							|  |  |  |         self.assertIn('valid_key', result.__dict__) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_has_handlers(self): | 
					
						
							|  |  |  |         self.assertTrue(self.logger.hasHandlers()) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         for handler in self.logger.handlers: | 
					
						
							|  |  |  |             self.logger.removeHandler(handler) | 
					
						
							|  |  |  |         self.assertFalse(self.logger.hasHandlers()) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_has_handlers_no_propagate(self): | 
					
						
							|  |  |  |         child_logger = logging.getLogger('blah.child') | 
					
						
							|  |  |  |         child_logger.propagate = False | 
					
						
							|  |  |  |         self.assertFalse(child_logger.hasHandlers()) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_is_enabled_for(self): | 
					
						
							|  |  |  |         old_disable = self.logger.manager.disable | 
					
						
							|  |  |  |         self.logger.manager.disable = 23 | 
					
						
							| 
									
										
										
										
											2011-06-05 09:31:34 +01:00
										 |  |  |         self.addCleanup(setattr, self.logger.manager, 'disable', old_disable) | 
					
						
							| 
									
										
										
										
											2011-03-29 17:20:34 +01:00
										 |  |  |         self.assertFalse(self.logger.isEnabledFor(22)) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2010-09-17 18:57:36 +00:00
										 |  |  | class BaseFileTest(BaseTest): | 
					
						
							|  |  |  |     "Base class for handler tests that write log files" | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def setUp(self): | 
					
						
							|  |  |  |         BaseTest.setUp(self) | 
					
						
							| 
									
										
										
										
											2010-12-27 11:18:52 +00:00
										 |  |  |         fd, self.fn = tempfile.mkstemp(".log", "test_logging-2-") | 
					
						
							|  |  |  |         os.close(fd) | 
					
						
							| 
									
										
										
										
											2010-09-17 18:57:36 +00:00
										 |  |  |         self.rmfiles = [] | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def tearDown(self): | 
					
						
							|  |  |  |         for fn in self.rmfiles: | 
					
						
							|  |  |  |             os.unlink(fn) | 
					
						
							| 
									
										
										
										
											2010-12-27 11:18:52 +00:00
										 |  |  |         if os.path.exists(self.fn): | 
					
						
							|  |  |  |             os.unlink(self.fn) | 
					
						
							| 
									
										
										
										
											2010-09-18 03:54:32 +00:00
										 |  |  |         BaseTest.tearDown(self) | 
					
						
							| 
									
										
										
										
											2010-09-17 18:57:36 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def assertLogFile(self, filename): | 
					
						
							|  |  |  |         "Assert a log file is there and register it for deletion" | 
					
						
							|  |  |  |         self.assertTrue(os.path.exists(filename), | 
					
						
							| 
									
										
										
										
											2011-05-02 13:17:27 +01:00
										 |  |  |                         msg="Log file %r does not exist" % filename) | 
					
						
							| 
									
										
										
										
											2010-09-17 18:57:36 +00:00
										 |  |  |         self.rmfiles.append(filename) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-04-26 18:43:05 +01:00
										 |  |  | class FileHandlerTest(BaseFileTest): | 
					
						
							|  |  |  |     def test_delay(self): | 
					
						
							|  |  |  |         os.unlink(self.fn) | 
					
						
							|  |  |  |         fh = logging.FileHandler(self.fn, delay=True) | 
					
						
							|  |  |  |         self.assertIsNone(fh.stream) | 
					
						
							|  |  |  |         self.assertFalse(os.path.exists(self.fn)) | 
					
						
							|  |  |  |         fh.handle(logging.makeLogRecord({})) | 
					
						
							|  |  |  |         self.assertIsNotNone(fh.stream) | 
					
						
							|  |  |  |         self.assertTrue(os.path.exists(self.fn)) | 
					
						
							|  |  |  |         fh.close() | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2010-09-17 18:57:36 +00:00
										 |  |  | class RotatingFileHandlerTest(BaseFileTest): | 
					
						
							|  |  |  |     def next_rec(self): | 
					
						
							|  |  |  |         return logging.LogRecord('n', logging.DEBUG, 'p', 1, | 
					
						
							|  |  |  |                                  self.next_message(), None, None, None) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_should_not_rollover(self): | 
					
						
							|  |  |  |         # If maxbytes is zero rollover never occurs | 
					
						
							|  |  |  |         rh = logging.handlers.RotatingFileHandler(self.fn, maxBytes=0) | 
					
						
							|  |  |  |         self.assertFalse(rh.shouldRollover(None)) | 
					
						
							| 
									
										
										
										
											2010-10-30 09:50:18 +00:00
										 |  |  |         rh.close() | 
					
						
							| 
									
										
										
										
											2010-09-17 18:57:36 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_should_rollover(self): | 
					
						
							|  |  |  |         rh = logging.handlers.RotatingFileHandler(self.fn, maxBytes=1) | 
					
						
							|  |  |  |         self.assertTrue(rh.shouldRollover(self.next_rec())) | 
					
						
							| 
									
										
										
										
											2010-10-30 09:50:18 +00:00
										 |  |  |         rh.close() | 
					
						
							| 
									
										
										
										
											2010-09-17 18:57:36 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_file_created(self): | 
					
						
							|  |  |  |         # checks that the file is created and assumes it was created | 
					
						
							|  |  |  |         # by us | 
					
						
							|  |  |  |         rh = logging.handlers.RotatingFileHandler(self.fn) | 
					
						
							|  |  |  |         rh.emit(self.next_rec()) | 
					
						
							|  |  |  |         self.assertLogFile(self.fn) | 
					
						
							| 
									
										
										
										
											2010-10-30 09:50:18 +00:00
										 |  |  |         rh.close() | 
					
						
							| 
									
										
										
										
											2010-09-17 18:57:36 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_rollover_filenames(self): | 
					
						
							|  |  |  |         rh = logging.handlers.RotatingFileHandler( | 
					
						
							|  |  |  |             self.fn, backupCount=2, maxBytes=1) | 
					
						
							|  |  |  |         rh.emit(self.next_rec()) | 
					
						
							|  |  |  |         self.assertLogFile(self.fn) | 
					
						
							|  |  |  |         rh.emit(self.next_rec()) | 
					
						
							|  |  |  |         self.assertLogFile(self.fn + ".1") | 
					
						
							|  |  |  |         rh.emit(self.next_rec()) | 
					
						
							|  |  |  |         self.assertLogFile(self.fn + ".2") | 
					
						
							|  |  |  |         self.assertFalse(os.path.exists(self.fn + ".3")) | 
					
						
							| 
									
										
										
										
											2010-10-30 09:50:18 +00:00
										 |  |  |         rh.close() | 
					
						
							| 
									
										
										
										
											2010-09-17 18:57:36 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | class TimedRotatingFileHandlerTest(BaseFileTest): | 
					
						
							| 
									
										
										
										
											2011-05-02 13:17:27 +01:00
										 |  |  |     # other test methods added below | 
					
						
							|  |  |  |     def test_rollover(self): | 
					
						
							| 
									
										
										
										
											2011-05-05 12:59:14 +01:00
										 |  |  |         fh = logging.handlers.TimedRotatingFileHandler(self.fn, 'S', | 
					
						
							|  |  |  |                                                        backupCount=1) | 
					
						
							| 
									
										
										
										
											2011-05-07 17:01:22 +01:00
										 |  |  |         r = logging.makeLogRecord({'msg': 'testing'}) | 
					
						
							|  |  |  |         fh.emit(r) | 
					
						
							|  |  |  |         self.assertLogFile(self.fn) | 
					
						
							| 
									
										
										
										
											2011-05-24 07:12:41 +01:00
										 |  |  |         time.sleep(1.01)    # just a little over a second ... | 
					
						
							| 
									
										
										
										
											2011-05-07 17:01:22 +01:00
										 |  |  |         fh.emit(r) | 
					
						
							|  |  |  |         fh.close() | 
					
						
							|  |  |  |         # At this point, we should have a recent rotated file which we | 
					
						
							|  |  |  |         # can test for the existence of. However, in practice, on some | 
					
						
							|  |  |  |         # machines which run really slowly, we don't know how far back | 
					
						
							| 
									
										
										
										
											2011-05-13 07:09:40 +01:00
										 |  |  |         # in time to go to look for the log file. So, we go back a fair | 
					
						
							|  |  |  |         # bit, and stop as soon as we see a rotated file. In theory this | 
					
						
							|  |  |  |         # could of course still fail, but the chances are lower. | 
					
						
							| 
									
										
										
										
											2011-05-07 17:01:22 +01:00
										 |  |  |         found = False | 
					
						
							|  |  |  |         now = datetime.datetime.now() | 
					
						
							| 
									
										
										
										
											2011-05-13 16:41:57 +01:00
										 |  |  |         GO_BACK = 5 * 60 # seconds | 
					
						
							| 
									
										
										
										
											2011-05-13 07:09:40 +01:00
										 |  |  |         for secs in range(GO_BACK): | 
					
						
							|  |  |  |             prev = now - datetime.timedelta(seconds=secs) | 
					
						
							| 
									
										
										
										
											2011-05-07 17:01:22 +01:00
										 |  |  |             fn = self.fn + prev.strftime(".%Y-%m-%d_%H-%M-%S") | 
					
						
							|  |  |  |             found = os.path.exists(fn) | 
					
						
							|  |  |  |             if found: | 
					
						
							|  |  |  |                 self.rmfiles.append(fn) | 
					
						
							|  |  |  |                 break | 
					
						
							| 
									
										
										
										
											2011-05-13 07:09:40 +01:00
										 |  |  |         msg = 'No rotated files found, went back %d seconds' % GO_BACK | 
					
						
							|  |  |  |         if not found: | 
					
						
							|  |  |  |             #print additional diagnostics | 
					
						
							| 
									
										
										
										
											2011-05-13 14:45:08 +01:00
										 |  |  |             dn, fn = os.path.split(self.fn) | 
					
						
							|  |  |  |             files = [f for f in os.listdir(dn) if f.startswith(fn)] | 
					
						
							| 
									
										
										
										
											2011-05-23 01:16:44 +02:00
										 |  |  |             print('Test time: %s' % now.strftime("%Y-%m-%d %H-%M-%S"), file=sys.stderr) | 
					
						
							|  |  |  |             print('The only matching files are: %s' % files, file=sys.stderr) | 
					
						
							| 
									
										
										
										
											2011-05-07 17:01:22 +01:00
										 |  |  |         self.assertTrue(found, msg=msg) | 
					
						
							| 
									
										
										
										
											2010-09-17 18:57:36 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-05-05 12:59:14 +01:00
										 |  |  |     def test_invalid(self): | 
					
						
							|  |  |  |         assertRaises = self.assertRaises | 
					
						
							|  |  |  |         assertRaises(ValueError, logging.handlers.TimedRotatingFileHandler, | 
					
						
							| 
									
										
										
										
											2011-05-07 17:01:22 +01:00
										 |  |  |                      self.fn, 'X', delay=True) | 
					
						
							| 
									
										
										
										
											2011-05-05 12:59:14 +01:00
										 |  |  |         assertRaises(ValueError, logging.handlers.TimedRotatingFileHandler, | 
					
						
							| 
									
										
										
										
											2011-05-07 17:01:22 +01:00
										 |  |  |                      self.fn, 'W', delay=True) | 
					
						
							| 
									
										
										
										
											2011-05-05 12:59:14 +01:00
										 |  |  |         assertRaises(ValueError, logging.handlers.TimedRotatingFileHandler, | 
					
						
							| 
									
										
										
										
											2011-05-07 17:01:22 +01:00
										 |  |  |                      self.fn, 'W7', delay=True) | 
					
						
							| 
									
										
										
										
											2011-05-05 12:59:14 +01:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2010-09-17 18:57:36 +00:00
										 |  |  | def secs(**kw): | 
					
						
							|  |  |  |     return datetime.timedelta(**kw) // datetime.timedelta(seconds=1) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | for when, exp in (('S', 1), | 
					
						
							|  |  |  |                   ('M', 60), | 
					
						
							|  |  |  |                   ('H', 60 * 60), | 
					
						
							|  |  |  |                   ('D', 60 * 60 * 24), | 
					
						
							| 
									
										
										
										
											2011-02-26 15:35:38 +00:00
										 |  |  |                   ('MIDNIGHT', 60 * 60 * 24), | 
					
						
							| 
									
										
										
										
											2010-09-17 18:57:36 +00:00
										 |  |  |                   # current time (epoch start) is a Thursday, W0 means Monday | 
					
						
							| 
									
										
										
										
											2011-02-26 15:35:38 +00:00
										 |  |  |                   ('W0', secs(days=4, hours=24)), | 
					
						
							|  |  |  |                  ): | 
					
						
							| 
									
										
										
										
											2010-09-17 18:57:36 +00:00
										 |  |  |     def test_compute_rollover(self, when=when, exp=exp): | 
					
						
							|  |  |  |         rh = logging.handlers.TimedRotatingFileHandler( | 
					
						
							| 
									
										
										
										
											2011-02-26 15:35:38 +00:00
										 |  |  |             self.fn, when=when, interval=1, backupCount=0, utc=True) | 
					
						
							|  |  |  |         currentTime = 0.0 | 
					
						
							|  |  |  |         actual = rh.computeRollover(currentTime) | 
					
						
							|  |  |  |         if exp != actual: | 
					
						
							|  |  |  |             # Failures occur on some systems for MIDNIGHT and W0. | 
					
						
							|  |  |  |             # Print detailed calculation for MIDNIGHT so we can try to see | 
					
						
							|  |  |  |             # what's going on | 
					
						
							|  |  |  |             import time | 
					
						
							|  |  |  |             if when == 'MIDNIGHT': | 
					
						
							|  |  |  |                 try: | 
					
						
							|  |  |  |                     if rh.utc: | 
					
						
							|  |  |  |                         t = time.gmtime(currentTime) | 
					
						
							|  |  |  |                     else: | 
					
						
							|  |  |  |                         t = time.localtime(currentTime) | 
					
						
							|  |  |  |                     currentHour = t[3] | 
					
						
							|  |  |  |                     currentMinute = t[4] | 
					
						
							|  |  |  |                     currentSecond = t[5] | 
					
						
							|  |  |  |                     # r is the number of seconds left between now and midnight | 
					
						
							|  |  |  |                     r = logging.handlers._MIDNIGHT - ((currentHour * 60 + | 
					
						
							|  |  |  |                                                        currentMinute) * 60 + | 
					
						
							|  |  |  |                             currentSecond) | 
					
						
							|  |  |  |                     result = currentTime + r | 
					
						
							|  |  |  |                     print('t: %s (%s)' % (t, rh.utc), file=sys.stderr) | 
					
						
							|  |  |  |                     print('currentHour: %s' % currentHour, file=sys.stderr) | 
					
						
							|  |  |  |                     print('currentMinute: %s' % currentMinute, file=sys.stderr) | 
					
						
							|  |  |  |                     print('currentSecond: %s' % currentSecond, file=sys.stderr) | 
					
						
							|  |  |  |                     print('r: %s' % r, file=sys.stderr) | 
					
						
							|  |  |  |                     print('result: %s' % result, file=sys.stderr) | 
					
						
							|  |  |  |                 except Exception: | 
					
						
							|  |  |  |                     print('exception in diagnostic code: %s' % sys.exc_info()[1], file=sys.stderr) | 
					
						
							|  |  |  |         self.assertEqual(exp, actual) | 
					
						
							| 
									
										
										
										
											2010-10-30 09:50:18 +00:00
										 |  |  |         rh.close() | 
					
						
							| 
									
										
										
										
											2010-09-17 18:57:36 +00:00
										 |  |  |     setattr(TimedRotatingFileHandlerTest, "test_compute_rollover_%s" % when, test_compute_rollover) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-05-09 17:32:09 +01:00
										 |  |  | 
 | 
					
						
							|  |  |  | @unittest.skipUnless(win32evtlog, 'win32evtlog/win32evtlogutil required for this test.') | 
					
						
							|  |  |  | class NTEventLogHandlerTest(BaseTest): | 
					
						
							|  |  |  |     def test_basic(self): | 
					
						
							|  |  |  |         logtype = 'Application' | 
					
						
							|  |  |  |         elh = win32evtlog.OpenEventLog(None, logtype) | 
					
						
							|  |  |  |         num_recs = win32evtlog.GetNumberOfEventLogRecords(elh) | 
					
						
							|  |  |  |         h = logging.handlers.NTEventLogHandler('test_logging') | 
					
						
							|  |  |  |         r = logging.makeLogRecord({'msg': 'Test Log Message'}) | 
					
						
							|  |  |  |         h.handle(r) | 
					
						
							|  |  |  |         h.close() | 
					
						
							|  |  |  |         # Now see if the event is recorded | 
					
						
							|  |  |  |         self.assertTrue(num_recs < win32evtlog.GetNumberOfEventLogRecords(elh)) | 
					
						
							|  |  |  |         flags = win32evtlog.EVENTLOG_BACKWARDS_READ | \ | 
					
						
							|  |  |  |                 win32evtlog.EVENTLOG_SEQUENTIAL_READ | 
					
						
							|  |  |  |         found = False | 
					
						
							|  |  |  |         GO_BACK = 100 | 
					
						
							|  |  |  |         events = win32evtlog.ReadEventLog(elh, flags, GO_BACK) | 
					
						
							|  |  |  |         for e in events: | 
					
						
							|  |  |  |             if e.SourceName != 'test_logging': | 
					
						
							|  |  |  |                 continue | 
					
						
							|  |  |  |             msg = win32evtlogutil.SafeFormatMessage(e, logtype) | 
					
						
							|  |  |  |             if msg != 'Test Log Message\r\n': | 
					
						
							|  |  |  |                 continue | 
					
						
							|  |  |  |             found = True | 
					
						
							|  |  |  |             break | 
					
						
							|  |  |  |         msg = 'Record not found in event log, went back %d records' % GO_BACK | 
					
						
							|  |  |  |         self.assertTrue(found, msg=msg) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  | # Set the locale to the platform-dependent default.  I have no idea | 
					
						
							|  |  |  | # why the test does this, but in any case we save the current locale | 
					
						
							|  |  |  | # first and restore it at the end. | 
					
						
							|  |  |  | @run_with_locale('LC_ALL', '') | 
					
						
							| 
									
										
										
										
											2003-07-23 00:05:07 +00:00
										 |  |  | def test_main(): | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  |     run_unittest(BuiltinLevelsTest, BasicFilterTest, | 
					
						
							| 
									
										
										
										
											2011-04-26 18:43:05 +01:00
										 |  |  |                  CustomLevelsAndFiltersTest, HandlerTest, MemoryHandlerTest, | 
					
						
							| 
									
										
										
										
											2011-05-02 13:17:27 +01:00
										 |  |  |                  ConfigFileTest, SocketHandlerTest, DatagramHandlerTest, | 
					
						
							|  |  |  |                  MemoryTest, EncodingTest, WarningsTest, ConfigDictTest, | 
					
						
							|  |  |  |                  ManagerTest, FormatterTest, BufferingFormatterTest, | 
					
						
							|  |  |  |                  StreamHandlerTest, LogRecordFactoryTest, ChildLoggerTest, | 
					
						
							|  |  |  |                  QueueHandlerTest, ShutdownTest, ModuleLevelMiscTest, | 
					
						
							|  |  |  |                  BasicConfigTest, LoggerAdapterTest, LoggerTest, | 
					
						
							|  |  |  |                  SMTPHandlerTest, FileHandlerTest, RotatingFileHandlerTest, | 
					
						
							| 
									
										
										
										
											2011-04-26 18:43:05 +01:00
										 |  |  |                  LastResortTest, LogRecordTest, ExceptionTest, | 
					
						
							| 
									
										
										
										
											2011-05-09 17:32:09 +01:00
										 |  |  |                  SysLogHandlerTest, HTTPHandlerTest, NTEventLogHandlerTest, | 
					
						
							| 
									
										
										
										
											2011-02-26 16:06:02 +00:00
										 |  |  |                  TimedRotatingFileHandlerTest | 
					
						
							| 
									
										
										
										
											2010-09-17 23:35:29 +00:00
										 |  |  |                 ) | 
					
						
							| 
									
										
										
										
											2003-07-18 03:19:20 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
  Refactor test_logging to use unittest. This should finally solve the flakiness
  issues.
  Thanks to Antoine Pitrou for the patch.
........
  r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
  compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
  ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
  r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
  Move test_largefile over to using 'with' statements for open files.
  Also rename the driver function to test_main() instead of main_test().
........
  r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
  Add a note in the main test class' docstring that the order of execution of the
  tests is important.
........
  r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
  Add test_main() functions to various tests where it was simple to do. Done so
  that regrtest can execute the test_main() directly instead of relying on import
  side-effects.
........
  r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
  Only DECREF if ret != NULL
........
											
										 
											2008-03-03 19:15:45 +00:00
										 |  |  | if __name__ == "__main__": | 
					
						
							| 
									
										
										
										
											2003-01-02 14:56:39 +00:00
										 |  |  |     test_main() |