cpython.git - https://github.com/python/cpython.git

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge #14640: Fix typos/syntax in pyporting.rst.	R David Murray	2012-04-23	1	-5/+5
\|\
\| *	#14640: Fix typos/syntax in pyporting.rst.	R David Murray	2012-04-23	1	-5/+5

* \|	Issue #14650: fix typo in shutil.disk_usage() docstring; patch by Hobson Lane	Sandro Tosi	2012-04-23	1	-1/+1

* \|	merge heads	Benjamin Peterson	2012-04-23	5	-3/+24
\|\ \
\| * \	Issue #14641: merge with 3.2	Sandro Tosi	2012-04-23	1	-2/+2
\| \|\ \ \| \| \|/
\| \| *	Issue #14641: minor fixes to sockets Howto; patch by Dionysios Kalofonos	Sandro Tosi	2012-04-23	1	-2/+2

\| * \|	merge #14638: pydoc now treats non-str __name__ as None instead of raising	R David Murray	2012-04-23	3	-1/+16
\| \|\ \ \| \| \|/
\| \| *	#14638: pydoc now treats non-str __name__ as None instead of raising	R David Murray	2012-04-23	3	-1/+16

\| * \|	merge heads	Senthil Kumaran	2012-04-23	1	-1/+1
\| \|\ \
\| * \ \	news for issue13684	Senthil Kumaran	2012-04-23	1	-0/+3
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	news for issue13684	Senthil Kumaran	2012-04-23	1	-0/+3

\| * \| \|	3.2 - Fix for Issue13684 - httplib tunnel infinite loop	Senthil Kumaran	2012-04-23	1	-0/+3
\| \|\ \ \ \| \| \|/ /
\| \| * \|	3.2 - Fix for Issue13684 - httplib tunnel infinite loop	Senthil Kumaran	2012-04-23	1	-0/+3

* \| \| \|	fix instance dicts with str subclasses (#13903)	Benjamin Peterson	2012-04-23	2	-1/+15
\| \|_\|/ \|/\| \|
* \| \|	don't make shared keys with dict subclasses	Benjamin Peterson	2012-04-23	1	-1/+1
\|/ /
* \|	merge 3.2	Benjamin Peterson	2012-04-23	1	-0/+1
\|\ \ \| \|/
\| *	add Mark Shannon	Benjamin Peterson	2012-04-23	1	-0/+1

* \|	Implement PEP 412: Key-sharing dictionaries (closes #13903)	Benjamin Peterson	2012-04-23	12	-909/+1358

* \|	inherit maxchar of field value where needed (closes #14648)	Benjamin Peterson	2012-04-23	2	-0/+5

* \|	merge 3.2	Benjamin Peterson	2012-04-23	1	-1/+1
\|\ \ \| \|/
\| *	sleep here	Benjamin Peterson	2012-04-23	1	-1/+1

* \|	Issue #14605: Expose importlib.abc.FileLoader and	Brett Cannon	2012-04-22	17	-3062/+3232

* \|	merge	Brett Cannon	2012-04-22	2	-2/+2
\|\ \
\| * \|	Issue #14644: Increased default timeout for SMTPHandler. Note: last commit me...	Vinay Sajip	2012-04-22	1	-1/+1

\| * \|	Issue #14622: Increased default timeout for SMTPHandler.	Vinay Sajip	2012-04-22	1	-1/+1

* \| \|	Change tests for imp.cache_from_source() to follow os.path.join/split	Brett Cannon	2012-04-22	1	-43/+32
\|/ /
* \|	merge	Brett Cannon	2012-04-22	3	-12/+13
\|\ \
\| * \|	Use os.path.samestat() instead of reinventing the wheel.	Charles-François Natali	2012-04-22	1	-9/+2

\| * \|	Resolve #14026 (Merge from 3.2)	Nick Coghlan	2012-04-22	2	-3/+11
\| \|\ \ \| \| \|/
\| \| *	Close issue #14026 by better testing sys.argv handling in test_cmd_line_scrip...	Nick Coghlan	2012-04-22	2	-3/+11

\| \| *	issue2193 - Update 3.2 docs about legal characters allowed in Cookie name	Senthil Kumaran	2012-04-22	1	-2/+8

* \| \|	Issue #13959: Continue to try to accomodate altsep in importlib by not	Brett Cannon	2012-04-22	2	-2971/+2988
\|/ /
* \|	Mention the backwards-incompatible change to imp.cache_from_source()/source_f...	Brett Cannon	2012-04-22	1	-0/+5

* \|	merge	Brett Cannon	2012-04-22	1	-2/+11
\|\ \
\| * \|	issue2193 - Update docs about the legal characters allowed in Cookie name	Senthil Kumaran	2012-04-22	1	-2/+11

* \| \|	Revert to os.path.join() semantics for path manipulation in importlib	Brett Cannon	2012-04-22	2	-2985/+2966
\|/ /
* \|	Update importlib.h	Brett Cannon	2012-04-22	1	-2967/+2967

* \|	Continue the good fight to get Windows to like importlib by fixing a	Brett Cannon	2012-04-22	1	-1/+3

* \|	merge	Brett Cannon	2012-04-22	3	-1/+12
\|\ \
\| * \	merge heads	Senthil Kumaran	2012-04-22	2	-755/+67
\| \|\ \
\| * \| \|	Fix Issue2193 - Allow ":" character in Cookie NAME values	Senthil Kumaran	2012-04-22	3	-1/+12

* \| \| \|	Have importlib look for pre-existing path separators when joining	Brett Cannon	2012-04-22	2	-2979/+2991
\| \|/ / \|/\| \|
* \| \|	Fix whitespace.	Brett Cannon	2012-04-22	1	-1/+0

* \| \|	Issue #13959: Re-implement imp.find_module() in Lib/imp.py.	Brett Cannon	2012-04-22	2	-755/+68
\|/ /
* \|	Issue #14637: Fix the UNC import test under Windows to actually use	Brett Cannon	2012-04-21	1	-4/+8

* \|	Don't worry about moving imp.get_tag() over to Lib/imp.py.	Brett Cannon	2012-04-21	3	-3064/+3069

* \|	merge	Brett Cannon	2012-04-21	6	-61/+61
\|\ \
\| * \|	Remove incorrect comment	Michael Foord	2012-04-21	1	-1/+0

\| * \|	Closes issue 14634. unittest.mock.create_autospec now supports keyword only a...	Michael Foord	2012-04-21	3	-8/+31

\| * \|	Closes issue 14636. mock objects raise exceptions from an iterable side_effect	Michael Foord	2012-04-21	4	-53/+31