Florent Xicluna 
								
							 
						 
						
							
							
							
							
								
							
							
								aabbda5354 
								
							 
						 
						
							
							
								
								Merge 3.2  
							
							
							
						 
						
							2011-10-28 14:52:29 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Florent Xicluna 
								
							 
						 
						
							
							
							
							
								
							
							
								5d1155c08e 
								
							 
						 
						
							
							
								
								Closes   #13258 : Use callable() built-in in the standard library.  
							
							
							
						 
						
							2011-10-28 14:45:05 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Éric Araujo 
								
							 
						 
						
							
							
							
							
								
							
							
								4c3124c2b9 
								
							 
						 
						
							
							
								
								Merge 3.2  
							
							
							
						 
						
							2011-09-12 17:41:24 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Éric Araujo 
								
							 
						 
						
							
							
							
							
								
							
							
								647ef8cd68 
								
							 
						 
						
							
							
								
								Wrap pydoc output under 80 characters  
							
							
							
						 
						
							2011-09-11 00:43:20 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Éric Araujo 
								
							 
						 
						
							
							
							
							
								
							
							
								c473f8ceac 
								
							 
						 
						
							
							
								
								Merge fix for  #8887  from 3.2  
							
							
							
						 
						
							2011-07-29 17:38:23 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Éric Araujo 
								
							 
						 
						
							
							
							
							
								
							
							
								e64e51bfa7 
								
							 
						 
						
							
							
								
								Make “pydoc somebuiltin.somemethod” work ( #8887 )  
							
							
							
						 
						
							2011-07-29 17:03:55 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Charles-François Natali 
								
							 
						 
						
							
							
							
							
								
							
							
								7a2f0c7802 
								
							 
						 
						
							
							
								
								Issue  #12603 : Fix pydoc.synopsis() on files with non-negative st_mtime.  
							
							
							
						 
						
							2011-07-27 19:42:05 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Charles-François Natali 
								
							 
						 
						
							
							
							
							
								
							
							
								27c4e88552 
								
							 
						 
						
							
							
								
								Issue  #12603 : Fix pydoc.synopsis() on files with non-negative st_mtime.  
							
							
							
						 
						
							2011-07-27 19:40:02 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Victor Stinner 
								
							 
						 
						
							
							
							
							
								
							
							
								d7772bc4cb 
								
							 
						 
						
							
							
								
								(merge 3.2) Issue  #12451 : pydoc: html_getfile() now uses tokenize.open() to  
							
							... 
							
							
							
							support Python scripts using a encoding different than UTF-8 (read the coding
cookie of the script). 
							
						 
						
							2011-07-05 14:31:28 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Victor Stinner 
								
							 
						 
						
							
							
							
							
								
							
							
								91e08772a6 
								
							 
						 
						
							
							
								
								Issue  #12451 : pydoc: html_getfile() now uses tokenize.open() to support Python  
							
							... 
							
							
							
							scripts using a encoding different than UTF-8 (read the coding cookie of the
script). 
							
						 
						
							2011-07-05 14:30:41 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Victor Stinner 
								
							 
						 
						
							
							
							
							
								
							
							
								5f9a995ad7 
								
							 
						 
						
							
							
								
								(merge 3.2) Issue  #12451 : pydoc: importfile() now opens the Python script in  
							
							... 
							
							
							
							binary mode, instead of text mode using the locale encoding, to avoid encoding
issues. 
							
						 
						
							2011-07-04 02:09:44 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Victor Stinner 
								
							 
						 
						
							
							
							
							
								
							
							
								e975af62f2 
								
							 
						 
						
							
							
								
								Issue  #12451 : pydoc: importfile() now opens the Python script in binary mode,  
							
							... 
							
							
							
							instead of text mode using the locale encoding, to avoid encoding issues. 
							
						 
						
							2011-07-04 02:08:50 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Victor Stinner 
								
							 
						 
						
							
							
							
							
								
							
							
								319672e8a6 
								
							 
						 
						
							
							
								
								(merge 3.2) Issue  #12451 : pydoc.synopsis() now reads the encoding cookie if  
							
							... 
							
							
							
							available, to read the Python script from the right encoding. 
							
						 
						
							2011-06-30 15:58:29 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Victor Stinner 
								
							 
						 
						
							
							
							
							
								
							
							
								e6c910e953 
								
							 
						 
						
							
							
								
								Issue  #12451 : pydoc.synopsis() now reads the encoding cookie if available, to  
							
							... 
							
							
							
							read the Python script from the right encoding. 
							
						 
						
							2011-06-30 15:55:43 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Benjamin Peterson 
								
							 
						 
						
							
							
							
							
								
							
							
								8c6f88efa2 
								
							 
						 
						
							
							
								
								remove __version__s dependent on subversion keyword expansion ( closes   #12221 )  
							
							
							
						 
						
							2011-05-31 20:52:17 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Victor Stinner 
								
							 
						 
						
							
							
							
							
								
							
							
								6daa33c8ac 
								
							 
						 
						
							
							
								
								Issue  #10818 : Remove deprecated pydoc.serve() function  
							
							... 
							
							
							
							The pydoc module has a new enhanced web server. 
							
						 
						
							2011-05-25 01:41:22 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Victor Stinner 
								
							 
						 
						
							
							
							
							
								
							
							
								383c3fc6b4 
								
							 
						 
						
							
							
								
								Issue  #10818 : Remove the Tk GUI of the pydoc module (pydoc -g has been  
							
							... 
							
							
							
							deprecated in Python 3.2). 
							
						 
						
							2011-05-25 01:35:05 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ezio Melotti 
								
							 
						 
						
							
							
							
							
								
							
							
								60811c215f 
								
							 
						 
						
							
							
								
								#11926 : merge with 3.2.  
							
							
							
						 
						
							2011-04-28 07:55:29 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ezio Melotti 
								
							 
						 
						
							
							
							
							
								
							
							
								44aad855dd 
								
							 
						 
						
							
							
								
								#11926 : merge with 3.1.  
							
							
							
						 
						
							2011-04-28 07:51:14 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ezio Melotti 
								
							 
						 
						
							
							
							
							
								
							
							
								b185a04aa1 
								
							 
						 
						
							
							
								
								#11926 : add missing keywords to help("keywords").  
							
							
							
						 
						
							2011-04-28 07:42:55 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Victor Stinner 
								
							 
						 
						
							
							
							
							
								
							
							
								4d65224f68 
								
							 
						 
						
							
							
								
								Issue  #11186 : pydoc ignores a module if its name contains a surrogate character  
							
							... 
							
							
							
							in the index of modules. 
							
						 
						
							2011-04-12 23:41:50 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Raymond Hettinger 
								
							 
						 
						
							
							
							
							
								
							
							
								007bdbd7ab 
								
							 
						 
						
							
							
								
								Issue  #11666 : Teach pydoc to display full help for named tuples  
							
							
							
						 
						
							2011-03-25 14:16:13 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Raymond Hettinger 
								
							 
						 
						
							
							
							
							
								
							
							
								1103d05775 
								
							 
						 
						
							
							
								
								Issue  #11666 : Teach pydoc to display full help for named tuples  
							
							
							
						 
						
							2011-03-25 14:15:24 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Raymond Hettinger 
								
							 
						 
						
							
							
							
							
								
							
							
								6827294e05 
								
							 
						 
						
							
							
								
								Speed-up search for hidden names by using a set instead of a tuple.  
							
							
							
						 
						
							2011-03-18 02:22:15 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Georg Brandl 
								
							 
						 
						
							
							
							
							
								
							
							
								f6c8fd62b9 
								
							 
						 
						
							
							
								
								Merged revisions 86537,86867-86868,86881,86887,86913-86915,86931-86933,86960,86964,86974,86980,86996,87008,87050 via svnmerge from  
							
							... 
							
							
							
							svn+ssh://svn.python.org/python/branches/py3k
........
  r86537 | georg.brandl | 2010-11-19 23:09:04 +0100 (Fr, 19 Nov 2010) | 1 line
  Do not put a raw REPLACEMENT CHARACTER in the document.
........
  r86867 | georg.brandl | 2010-11-29 15:50:54 +0100 (Mo, 29 Nov 2010) | 1 line
  Fix indentation bug.
........
  r86868 | georg.brandl | 2010-11-29 15:53:15 +0100 (Mo, 29 Nov 2010) | 1 line
  Fix heading style inconsistencies.
........
  r86881 | georg.brandl | 2010-11-30 08:43:28 +0100 (Di, 30 Nov 2010) | 1 line
  #10584 : fix bad links.
........
  r86887 | georg.brandl | 2010-11-30 15:57:54 +0100 (Di, 30 Nov 2010) | 1 line
  Fix typo.
........
  r86913 | georg.brandl | 2010-12-01 16:32:43 +0100 (Mi, 01 Dez 2010) | 1 line
  Add missing word, and add a better reference to the actual function.
........
  r86914 | georg.brandl | 2010-12-01 16:36:33 +0100 (Mi, 01 Dez 2010) | 1 line
  #10594 : fix parameter names in PyList API docs.
........
  r86915 | georg.brandl | 2010-12-01 16:44:25 +0100 (Mi, 01 Dez 2010) | 1 line
  Fix some markup and style in the unittest docs.
........
  r86931 | georg.brandl | 2010-12-02 10:06:12 +0100 (Do, 02 Dez 2010) | 1 line
  Fix-up documentation of makedirs().
........
  r86932 | david.malcolm | 2010-12-02 17:41:00 +0100 (Do, 02 Dez 2010) | 2 lines
  Fix spelling of Jamie Zawinski's surname in urllib.parse docstring (issue 10606)
........
  r86933 | georg.brandl | 2010-12-02 19:02:01 +0100 (Do, 02 Dez 2010) | 1 line
  #10597 : fix Py_SetPythonHome docs by pointing to where the meaning of PYTHONHOME is already documented.
........
  r86960 | georg.brandl | 2010-12-03 08:55:44 +0100 (Fr, 03 Dez 2010) | 1 line
  #10360 : catch TypeError in WeakSet.__contains__, just like WeakKeyDictionary does.
........
  r86964 | georg.brandl | 2010-12-03 10:58:38 +0100 (Fr, 03 Dez 2010) | 1 line
  #10549 : fix interface of docclass() for text documenter.
........
  r86974 | georg.brandl | 2010-12-03 16:30:09 +0100 (Fr, 03 Dez 2010) | 1 line
  Markup consistency fixes.
........
  r86980 | georg.brandl | 2010-12-03 18:19:27 +0100 (Fr, 03 Dez 2010) | 1 line
  Fix punctuation.
........
  r86996 | georg.brandl | 2010-12-03 20:56:42 +0100 (Fr, 03 Dez 2010) | 1 line
  Fix indentation.
........
  r87008 | georg.brandl | 2010-12-04 10:04:04 +0100 (Sa, 04 Dez 2010) | 1 line
  Fix typo.
........
  r87050 | georg.brandl | 2010-12-04 18:09:30 +0100 (Sa, 04 Dez 2010) | 1 line
  Fix typo.
........ 
							
						 
						
							2011-02-25 09:48:21 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Georg Brandl 
								
							 
						 
						
							
							
							
							
								
							
							
								d2f3857c40 
								
							 
						 
						
							
							
								
								#10961 : fix exception handling in new pydoc server code.  
							
							... 
							
							
							
							Patch by Ron Adam, reviewed by Eric Araujo. 
							
						 
						
							2011-01-30 08:37:19 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Belopolsky 
								
							 
						 
						
							
							
							
							
								
							
							
								7be05b221d 
								
							 
						 
						
							
							
								
								Merged revisions 82547 via svnmerge from  
							
							... 
							
							
							
							svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
  r82547 | alexander.belopolsky | 2010-07-04 13:00:20 -0400 (Sun, 04 Jul 2010) | 3 lines
  Issue #9118 : help(None) will now return NoneType doc instead of
  starting interactive help.
........ 
							
						 
						
							2011-01-11 15:23:22 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Victor Stinner 
								
							 
						 
						
							
							
							
							
								
							
							
								a3abd1d240 
								
							 
						 
						
							
							
								
								pydoc: close the DocServer when done  
							
							
							
						 
						
							2011-01-03 16:12:39 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Georg Brandl 
								
							 
						 
						
							
							
							
							
								
							
							
								cbd2ab1311 
								
							 
						 
						
							
							
								
								#1513299 : cleanup some map() uses where a comprehension works better.  
							
							
							
						 
						
							2010-12-04 10:39:14 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Coghlan 
								
							 
						 
						
							
							
							
							
								
							
							
								ecace28ef4 
								
							 
						 
						
							
							
								
								Handle Windows paths and don't double up on HTML header sections in new pydoc URL handler  
							
							
							
						 
						
							2010-12-03 16:08:46 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Georg Brandl 
								
							 
						 
						
							
							
							
							
								
							
							
								9bd45f995f 
								
							 
						 
						
							
							
								
								#10549 : fix interface of docclass() for text documenter.  
							
							
							
						 
						
							2010-12-03 09:58:38 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Coghlan 
								
							 
						 
						
							
							
							
							
								
							
							
								7bb30b72d8 
								
							 
						 
						
							
							
								
								Improve Pydoc interactive browsing ( #2001 ).  Patch by Ron Adam.  
							
							... 
							
							
							
							* A -b option to start an enhanced browsing session.
* Allow -b and -p options to be used together.
* Specifying port 0 will pick an arbitrary unused socket port.
* A new browse() function to start the new server and browser.
* Show Python version information in the header.
* A *Get* field which takes the same input as the help() function.
* A *Search* field which replaces the Tkinter search box.
* Links to *Module Index*, *Topics*, and *Keywords*.
* Improved source file viewing.
* An HTMLDoc.filelink() method.
* The -g option and the gui() and serve() functions are deprecated. 
							
						 
						
							2010-12-03 09:29:11 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Georg Brandl 
								
							 
						 
						
							
							
							
							
								
							
							
								d80d5f4ee8 
								
							 
						 
						
							
							
								
								#940286 : pydoc.Helper.help() ignores input/output init parameters.  
							
							
							
						 
						
							2010-12-03 07:47:22 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Georg Brandl 
								
							 
						 
						
							
							
							
							
								
							
							
								74abf6f873 
								
							 
						 
						
							
							
								
								#9724 : add nonlocal to pydoc topics.  
							
							
							
						 
						
							2010-11-20 19:54:36 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Belopolsky 
								
							 
						 
						
							
							
							
							
								
							
							
								4979b9b91e 
								
							 
						 
						
							
							
								
								Merged revisions 86504 via svnmerge from  
							
							... 
							
							
							
							svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
  r86504 | alexander.belopolsky | 2010-11-17 20:52:54 -0500 (Wed, 17 Nov 2010) | 15 lines
  Issue #10446 : Several changes to module documentation generated by pydoc:
  1. Online reference manual link is now version-specific and the
     'MODULE DOCS' section renamed to 'MODULE REFERENCE'.
  2. 'FILE' section is moved to the end of the file.
  3. Special names processed by pydoc such as __version__ or __credits__
     are now excluded from the DATA section.
  4. Defined __all__ to prevent pydoc from exposing undocumented details
     about itself.
  5. Removed Python 2.3 compatibility code.
........ 
							
						 
						
							2010-11-18 01:58:16 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Belopolsky 
								
							 
						 
						
							
							
							
							
								
							
							
								a47bbf5a4b 
								
							 
						 
						
							
							
								
								Issue  #10446 : Several changes to module documentation generated by pydoc:  
							
							... 
							
							
							
							1. Online reference manual link is now version-specific and the
   'MODULE DOCS' section renamed to 'MODULE REFERENCE'.
2. 'FILE' section is moved to the end of the file.
3. Special names processed by pydoc such as __version__ or __credits__
   are now excluded from the DATA section.
4. Defined __all__ to prevent pydoc from exposing undocumented details
   about itself.
5. Removed Python 2.3 compatibility code. 
							
						 
						
							2010-11-18 01:52:54 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Belopolsky 
								
							 
						 
						
							
							
							
							
								
							
							
								e8f583244a 
								
							 
						 
						
							
							
								
								Issue  #9308 : Removed redundant coding cookies.  Added tests for  
							
							... 
							
							
							
							importing encoded modules that do not depend on specific stdlib
modules being encoded in a certain way. 
							
						 
						
							2010-10-15 16:28:20 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Senthil Kumaran 
								
							 
						 
						
							
							
							
							
								
							
							
								7ff59131f8 
								
							 
						 
						
							
							
								
								Fix Issue672656 - Securing pydoc server.  
							
							
							
						 
						
							2010-08-18 19:32:21 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Georg Brandl 
								
							 
						 
						
							
							
							
							
								
							
							
								e5d518f252 
								
							 
						 
						
							
							
								
								Merged revisions 83370,83372-83374,83384 via svnmerge from  
							
							... 
							
							
							
							svn+ssh://svn.python.org/python/branches/py3k
........
  r83370 | georg.brandl | 2010-07-31 23:51:48 +0200 (Sa, 31 Jul 2010) | 5 lines
  #8198 : the Helper class should not save the stdin and stdout objects
  at import time, rather by default use the current streams like the
  other APIs that output help.
........
  r83372 | georg.brandl | 2010-08-01 00:05:54 +0200 (So, 01 Aug 2010) | 1 line
  #4007 : remove *.a and *.so.X.Y files in "make clean".
........
  r83373 | georg.brandl | 2010-08-01 00:11:11 +0200 (So, 01 Aug 2010) | 1 line
  #5147 : revert accidental indentation of header constant for MozillaCookieJar.
........
  r83374 | georg.brandl | 2010-08-01 00:32:52 +0200 (So, 01 Aug 2010) | 1 line
  #5146 : handle UID THREAD command correctly.
........
  r83384 | georg.brandl | 2010-08-01 08:32:55 +0200 (So, 01 Aug 2010) | 1 line
  Build properties using lambdas.  This makes test_pyclbr pass again, because it does not think that input and output are methods anymore.
........ 
							
						 
						
							2010-08-01 19:09:07 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Georg Brandl 
								
							 
						 
						
							
							
							
							
								
							
							
								76ae397583 
								
							 
						 
						
							
							
								
								Build properties using lambdas.  This makes test_pyclbr pass again, because it does not think that input and output are methods anymore.  
							
							
							
						 
						
							2010-08-01 06:32:55 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Georg Brandl 
								
							 
						 
						
							
							
							
							
								
							
							
								78aa396415 
								
							 
						 
						
							
							
								
								#8198 : the Helper class should not save the stdin and stdout objects  
							
							... 
							
							
							
							at import time, rather by default use the current streams like the
other APIs that output help. 
							
						 
						
							2010-07-31 21:51:48 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Belopolsky 
								
							 
						 
						
							
							
							
							
								
							
							
								2e733c9625 
								
							 
						 
						
							
							
								
								Issue  #9118 : help(None) will now return NoneType doc instead of  
							
							... 
							
							
							
							starting interactive help. 
							
						 
						
							2010-07-04 17:00:20 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ronald Oussoren 
								
							 
						 
						
							
							
							
							
								
							
							
								94f25283c9 
								
							 
						 
						
							
							
								
								Remove traces of MacOS9 support.  
							
							... 
							
							
							
							Fix for issue #7908  
							
						 
						
							2010-05-05 19:11:21 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Barry Warsaw 
								
							 
						 
						
							
							
							
							
								
							
							
								28a691b7fd 
								
							 
						 
						
							
							
								
								PEP 3147  
							
							
							
						 
						
							2010-04-17 00:19:56 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Brian Curtin 
								
							 
						 
						
							
							
							
							
								
							
							
								1f03f6e691 
								
							 
						 
						
							
							
								
								Merged revisions 79545 via svnmerge from  
							
							... 
							
							
							
							svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
  r79545 | brian.curtin | 2010-03-31 23:05:25 -0500 (Wed, 31 Mar 2010) | 9 lines
  Merged revisions 79543 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk
  ........
    r79543 | brian.curtin | 2010-03-31 23:02:00 -0500 (Wed, 31 Mar 2010) | 2 lines
    Fix a test_pydoc failure on Neal Norwitz's buildbot.
  ........
................ 
							
						 
						
							2010-04-01 04:06:54 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Brian Curtin 
								
							 
						 
						
							
							
							
							
								
							
							
								edef05b0a3 
								
							 
						 
						
							
							
								
								Merged revisions 79543 via svnmerge from  
							
							... 
							
							
							
							svn+ssh://pythondev@svn.python.org/python/trunk
........
  r79543 | brian.curtin | 2010-03-31 23:02:00 -0500 (Wed, 31 Mar 2010) | 2 lines
  Fix a test_pydoc failure on Neal Norwitz's buildbot.
........ 
							
						 
						
							2010-04-01 04:05:25 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Brian Curtin 
								
							 
						 
						
							
							
							
							
								
							
							
								a94cbd8fad 
								
							 
						 
						
							
							
								
								Merged revisions 79531 via svnmerge from  
							
							... 
							
							
							
							svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
  r79531 | brian.curtin | 2010-03-31 11:46:38 -0600 (Wed, 31 Mar 2010) | 4 lines
  Merged revisions 79529 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk
........ 
							
						 
						
							2010-03-31 17:49:27 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Brian Curtin 
								
							 
						 
						
							
							
							
							
								
							
							
								fd2bfb02db 
								
							 
						 
						
							
							
								
								Merged revisions 79529 via svnmerge from  
							
							... 
							
							
							
							svn+ssh://pythondev@svn.python.org/python/trunk 
							
						 
						
							2010-03-31 17:46:38 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Brian Curtin 
								
							 
						 
						
							
							
							
							
								
							
							
								0d8a1dd647 
								
							 
						 
						
							
							
								
								Merged revisions 79520 via svnmerge from  
							
							... 
							
							
							
							svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
  r79520 | brian.curtin | 2010-03-30 22:19:28 -0500 (Tue, 30 Mar 2010) | 9 lines
  Merged revisions 79518 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk
  ........
    r79518 | brian.curtin | 2010-03-30 22:10:21 -0500 (Tue, 30 Mar 2010) | 2 lines
    Fix  #8225 . xml.etree was displaying an incorrect link when viewed in help.
  ........
................ 
							
						 
						
							2010-03-31 03:22:46 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Brian Curtin 
								
							 
						 
						
							
							
							
							
								
							
							
								49c284c174 
								
							 
						 
						
							
							
								
								Merged revisions 79518 via svnmerge from  
							
							... 
							
							
							
							svn+ssh://pythondev@svn.python.org/python/trunk
........
  r79518 | brian.curtin | 2010-03-30 22:10:21 -0500 (Tue, 30 Mar 2010) | 2 lines
  Fix  #8225 . xml.etree was displaying an incorrect link when viewed in help.
........ 
							
						 
						
							2010-03-31 03:19:28 +00:00