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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge with 3.2.	Ezio Melotti	2011-04-13	1	-1/+1
\|\
\| *	Merge with 3.1.	Ezio Melotti	2011-04-13	1	-1/+1
\| \|\
\| \| *	Fix typo in docstring.	Ezio Melotti	2011-04-13	1	-1/+1

* \| \|	Merge with 3.2.	Ezio Melotti	2011-04-13	4	-6/+28
\|\ \ \ \| \|/ /
\| * \|	Merge with 3.1.	Ezio Melotti	2011-04-13	4	-6/+28
\| \|\ \ \| \| \|/
\| \| *	#9233: Fix json.loads({}) to return a dict (instead of a list), when _json is...	Ezio Melotti	2011-04-13	2	-0/+11

\| \| *	Remove unnecessary imports and use assertIs instead of assertTrue.	Ezio Melotti	2011-04-13	2	-5/+3

\| \| *	#9233: Fix json to work properly even when _json is not available.	Ezio Melotti	2011-04-13	2	-1/+2

\| \| *	#9233: skip _json-specific tests when _json is not available.	Ezio Melotti	2011-04-13	2	-2/+14

* \| \|	Merge	Alexander Belopolsky	2011-04-13	1	-17/+14
\|\ \ \ \| \|/ /
\| * \|	Issue #11830: Remove unnecessary introspection code in the decimal module.	Alexander Belopolsky	2011-04-13	1	-17/+14

* \| \|	Merge	Raymond Hettinger	2011-04-13	1	-1/+1
\|\ \ \ \| \|/ /
\| * \|	Fix nit.	Raymond Hettinger	2011-04-13	1	-1/+1

\| * \|	Issue 11718: Teach IDLE's open module dialog to find packages.	Raymond Hettinger	2011-04-13	1	-0/+11

* \| \|	Issue 11718: Teach IDLE's open module dialog to find packages.	Raymond Hettinger	2011-04-13	1	-0/+11

* \| \|	Merge #10019: Fix regression relative to 2.6: add newlines if indent=0	R David Murray	2011-04-13	2	-1/+17
\|\ \ \ \| \|/ /
\| * \|	Merge #10019: Fix regression relative to 2.6: add newlines if indent=0	R David Murray	2011-04-13	2	-1/+17
\| \|\ \ \| \| \|/
\| \| *	#10019: Fix regression relative to 2.6: add newlines if indent=0	R David Murray	2011-04-13	2	-1/+17

* \| \|	merge 3.2	Benjamin Peterson	2011-04-12	1	-0/+4
\|\ \ \ \| \|/ /
\| * \|	merge 3.1	Benjamin Peterson	2011-04-12	1	-0/+4
\| \|\ \ \| \| \|/
\| \| *	merge heads	Benjamin Peterson	2011-04-12	4	-5/+31
\| \| \|\
\| \| * \|	make assigning to a bytes literal a syntax error (closes #11506)	Benjamin Peterson	2011-04-12	1	-0/+4

* \| \| \|	merge the change update.	Senthil Kumaran	2011-04-12	1	-1/+9
\|\ \ \ \
\| * \| \| \|	Fix #11825: disable regrtest timeout if Python doesn't support threads	Victor Stinner	2011-04-12	1	-1/+9

* \| \| \| \|	merge from 3.2	Senthil Kumaran	2011-04-12	4	-5/+31
\|\ \ \ \ \ \| \|/ / / / \|/\| / / / \| \|/ / /
\| * \| \|	merge from 3.1	Senthil Kumaran	2011-04-12	4	-5/+31
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	Fix Issue11703 - urllib2.geturl() does not return correct url when the origin...	Senthil Kumaran	2011-04-12	4	-5/+31
\| \| \|/
\| \| *	Issue 11747: Fix output format for context diffs.	Raymond Hettinger	2011-04-12	2	-37/+136

\| * \|	Issue 11747: Fix output format for context diffs.	Raymond Hettinger	2011-04-12	2	-7/+52

* \| \|	Issue 11747: Fix output format for context diffs.	Raymond Hettinger	2011-04-12	2	-7/+52

* \| \|	Issue #11186: pydoc ignores a module if its name contains a surrogate character	Victor Stinner	2011-04-12	1	-0/+3

* \| \|	Fix 64-bit safety issue in BZ2Compressor and BZ2Decompressor.	Nadeem Vawda	2011-04-12	1	-1/+35

* \| \|	Merge: Add maxlinelen to docstring, delete obsolete wording	R David Murray	2011-04-12	1	-6/+6
\|\ \ \ \| \|/ /
\| * \|	Merge: Add maxlinelen to docstring, delete obsolete wording	R David Murray	2011-04-12	1	-6/+6
\| \|\ \ \| \| \|/
\| \| *	Add maxlinelen to docstring, delete obsolete wording	R David Murray	2011-04-12	1	-6/+6

* \| \|	Issue #11815: Use a light-weight SimpleQueue for the result queue in concurre...	Antoine Pitrou	2011-04-12	1	-2/+3

* \| \|	Issue #11815: Remove dead code in concurrent.futures (since a blocking Queue	Antoine Pitrou	2011-04-12	2	-52/+29
\|\ \ \ \| \|/ /
\| * \|	Issue #11815: Remove dead code in concurrent.futures (since a blocking Queue	Antoine Pitrou	2011-04-12	2	-52/+29

* \| \|	Fix #5162. Allow child spawning from Windows services (via pywin32).	brian.curtin	2011-04-11	1	-2/+3
\|\ \ \ \| \|/ /
\| * \|	Fix #5162. Allow child spawning from Windows services (via pywin32).	brian.curtin	2011-04-11	1	-2/+3
\| \|\ \ \| \| \|/
\| \| *	Fix #5162. Allow child spawning from Windows services (via pywin32).	brian.curtin	2011-04-11	1	-2/+3

* \| \|	Issue #11747: Fix range formatting in context and unified diffs.	Raymond Hettinger	2011-04-11	2	-11/+39
\|\ \ \ \| \|/ /
\| * \|	Issue #11747: Fix range formatting in context and unified diffs.	Raymond Hettinger	2011-04-11	2	-11/+39

\| * \|	Cleanup and modernize code prior to working on Issue 11747.	Raymond Hettinger	2011-04-11	1	-26/+27

* \| \|	Whitespace normalized.	Vinay Sajip	2011-04-11	1	-1/+1

* \| \|	Added 'handlers' argument to logging.basicConfig.	Vinay Sajip	2011-04-11	2	-9/+53

* \| \|	Cleanup and modernize code prior to working on Issue 11747.	Raymond Hettinger	2011-04-11	1	-26/+27

* \| \|	Merge from 3.2 (issue #11814, issue #8428)	Antoine Pitrou	2011-04-10	1	-3/+8
\|\ \ \ \| \|/ /
\| * \|	Issue #11814: Fix likely typo in multiprocessing.Pool._terminate().	Antoine Pitrou	2011-04-10	1	-1/+1

\| * \|	Issue #8428: Fix a race condition in multiprocessing.Pool when terminating	Antoine Pitrou	2011-04-10	1	-2/+7