cpython

Commit Graph

Author	SHA1	Message	Date
R David Murray	35893b7994	#16057 : Clarify why the base method default is called in custom encoders. Original patch by Kushal Das.	13 years ago
R David Murray	dd246171e4	#16057 : Clarify why the base method default is called in custom encoders. Original patch by Kushal Das.	13 years ago
Ezio Melotti	d654dedbbb	#16333 : document a way to get rid of trailing whitespace when indent is used.	13 years ago
Ezio Melotti	3a237ebcaa	#16333 : document a way to get rid of trailing whitespace when indent is used.	13 years ago
Petri Lehtinen	f9e1f1128b	#13769 : Enhance docs for ensure_ascii semantics in JSON decoding functions	14 years ago
Ezio Melotti	898d51da4d	#14875 : Use float('inf') instead of float('1e66666') in the json module.	14 years ago
Ezio Melotti	ed8cf7a543	#14875 : Use float('inf') instead of float('1e66666') in the json module.	14 years ago
R David Murray	3dd02d62c9	#10019 : Fix regression relative to 2.6: add newlines if indent=0 Patch by Amaury Forgeot d'Arc, updated by Sando Tosi.	15 years ago
R David Murray	ea8b6ef15f	#10019 : Fix regression relative to 2.6: add newlines if indent=0 Patch by Amaury Forgeot d'Arc, updated by Sando Tosi.	15 years ago
Raymond Hettinger	b643ef8f8e	Issue #5729 : json.dumps to support using '\t' as an indent string	16 years ago
Georg Brandl	4009c9edfc	Merged revisions 82805-82806,83523-83527,83536,83538,83542,83546-83548,83550-83555,83558,83560 via svnmerge from svn+ssh://svn.python.org/python/branches/py3k ........ r82805 \| georg.brandl \| 2010-07-11 11:42:10 +0200 (So, 11 Jul 2010) \| 1 line #7935: cross-reference to ast.literal_eval() from eval() docs. ........ r82806 \| georg.brandl \| 2010-07-11 12:22:44 +0200 (So, 11 Jul 2010) \| 1 line #9223: link to Command class reference, and move Command interface docs nearer to class docs. ........ r83523 \| georg.brandl \| 2010-08-02 14:06:18 +0200 (Mo, 02 Aug 2010) \| 1 line #9209 and #7781: fix two crashes in pstats interactive browser. ........ r83524 \| georg.brandl \| 2010-08-02 14:20:23 +0200 (Mo, 02 Aug 2010) \| 1 line #9428: fix running scripts from profile/cProfile with their own name and the right namespace. Same fix as for trace.py in #1690103. ........ r83525 \| georg.brandl \| 2010-08-02 14:36:24 +0200 (Mo, 02 Aug 2010) \| 1 line Get rid of spurious "threading" entries in trace output. ........ r83526 \| georg.brandl \| 2010-08-02 14:40:22 +0200 (Mo, 02 Aug 2010) \| 1 line Fix softspace relic. ........ r83527 \| georg.brandl \| 2010-08-02 14:48:46 +0200 (Mo, 02 Aug 2010) \| 1 line #3821: beginnings of a trace.py unittest. ........ r83536 \| georg.brandl \| 2010-08-02 19:49:25 +0200 (Mo, 02 Aug 2010) \| 1 line #8578: mention danger of not incref'ing weak referenced object. ........ r83538 \| georg.brandl \| 2010-08-02 20:10:13 +0200 (Mo, 02 Aug 2010) \| 1 line #6928: fix class docs w.r.t. new metaclasses. ........ r83542 \| georg.brandl \| 2010-08-02 20:56:54 +0200 (Mo, 02 Aug 2010) \| 1 line Move test_SimpleHTTPServer into test_httpservers. ........ r83546 \| georg.brandl \| 2010-08-02 21:16:34 +0200 (Mo, 02 Aug 2010) \| 1 line #7973: Fix distutils options spelling. ........ r83547 \| georg.brandl \| 2010-08-02 21:19:26 +0200 (Mo, 02 Aug 2010) \| 1 line #7386: add example that shows that trailing path separators are stripped. ........ r83548 \| georg.brandl \| 2010-08-02 21:23:34 +0200 (Mo, 02 Aug 2010) \| 1 line #8172: how does one use a property? ........ r83550 \| georg.brandl \| 2010-08-02 21:32:43 +0200 (Mo, 02 Aug 2010) \| 1 line #9451: strengthen warning about __*__ special name usage. ........ r83551 \| georg.brandl \| 2010-08-02 21:35:06 +0200 (Mo, 02 Aug 2010) \| 1 line Remove XXX comment that was displayed. ........ r83552 \| georg.brandl \| 2010-08-02 21:36:36 +0200 (Mo, 02 Aug 2010) \| 1 line #9438: clarify that constant names also cannot be assigned as attributes. ........ r83553 \| georg.brandl \| 2010-08-02 21:39:17 +0200 (Mo, 02 Aug 2010) \| 1 line Remove redundant information. ........ r83554 \| georg.brandl \| 2010-08-02 21:43:05 +0200 (Mo, 02 Aug 2010) \| 1 line #7280: note about nasmw.exe. ........ r83555 \| georg.brandl \| 2010-08-02 21:44:48 +0200 (Mo, 02 Aug 2010) \| 1 line #8861: remove unused variable. ........ r83558 \| georg.brandl \| 2010-08-02 22:05:19 +0200 (Mo, 02 Aug 2010) \| 1 line #8648: document UTF-7 codec functions. ........ r83560 \| georg.brandl \| 2010-08-02 22:16:18 +0200 (Mo, 02 Aug 2010) \| 1 line #9087: update json docstrings -- unicode and long do not exist anymore. ........	16 years ago
Florent Xicluna	b4efb3d81e	Merged revisions 83212,83829,83833,83838-83839,83878,84019,84025,84028,84032,84036 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83212 \| florent.xicluna \| 2010-07-28 18:39:41 +0200 (mer., 28 juil. 2010) \| 2 lines Syntax cleanup. ........ r83829 \| florent.xicluna \| 2010-08-08 18:16:07 +0200 (dim., 08 août 2010) \| 2 lines Use unittest specific methods for some urllib test cases. And replace urllib2 with urllib.request in comments. ........ r83833 \| florent.xicluna \| 2010-08-08 18:25:27 +0200 (dim., 08 août 2010) \| 2 lines Add test case for the HTTPResponse being an iterable. Follow-up of issue #4608. ........ r83838 \| florent.xicluna \| 2010-08-08 20:03:44 +0200 (dim., 08 août 2010) \| 2 lines Typo. ........ r83839 \| florent.xicluna \| 2010-08-08 20:06:13 +0200 (dim., 08 août 2010) \| 2 lines Issue #7564: Skip test_ioctl if another process is attached to /dev/tty. ........ r83878 \| florent.xicluna \| 2010-08-09 10:29:08 +0200 (lun., 09 août 2010) \| 1 line Merge the 2to3 script from /sandbox/trunk/2to3/2to3, revision 72867 (latest). ........ r84019 \| florent.xicluna \| 2010-08-14 17:56:42 +0200 (sam., 14 août 2010) \| 11 lines Merged manually from 2.7 branch to 3.x trunk. ------------------------------------------------------------------------ r79925 \| nick.coghlan \| 2010-04-10 16:24:36 +0200 (sam. 10 avril 2010) Try to turn some buildbots green by allowing test_multiprocessing to pass even if it hits the sys.exc_clear code in the threading module, and improve the test coverage by making the ctypes dependencies a bit more granular (two of the cited ctypes objects don't exist on my system) ------------------------------------------------------------------------ ........ r84025 \| florent.xicluna \| 2010-08-14 18:56:27 +0200 (sam., 14 août 2010) \| 1 line List Misc/python-config.in in Misc/README. Fix few typos. ........ r84028 \| florent.xicluna \| 2010-08-14 19:02:49 +0200 (sam., 14 août 2010) \| 1 line Fix order. ........ r84032 \| florent.xicluna \| 2010-08-14 19:15:31 +0200 (sam., 14 août 2010) \| 1 line Convert to spaces. ........ r84036 \| florent.xicluna \| 2010-08-14 20:03:19 +0200 (sam., 14 août 2010) \| 1 line Remove bad merge (from svnmerge r82301) ........	16 years ago
Georg Brandl	c8284cfc57	#9087 : update json docstrings -- unicode and long do not exist anymore.	16 years ago
Florent Xicluna	02ea12b291	Syntax cleanup.	16 years ago
Ezio Melotti	ffd849618a	#7092 : fix DeprecationWarnings for json when the tests are run with -3 -Wd.	16 years ago
Raymond Hettinger	bcf6f92dc5	* Fix-up a TODO (support the sort_key option). * Fix an error where True/False were being written-out as title-cased strings when used a dictionary keys. * Speed-up iteration over dicts by looping over items() rather than keys() followed by value lookups. * TODO: sort only by keys, not keys and values.	17 years ago
Benjamin Peterson	c6b607d4a9	port simplejson upgrade from the trunk #4136 json also now works only with unicode strings Patch by Antoine Pitrou; updated by me	17 years ago
Bob Ippolito	d914e3f861	merge json library with simplejson 2.0.9 (issue 4136)	17 years ago
Christian Heimes	e4ca8156ef	Merged revisions 62805,62811,62841-62842,62848-62849,62853-62854 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62805 \| christian.heimes \| 2008-05-07 01:59:53 +0200 (Wed, 07 May 2008) \| 1 line Re-added getbuildinfo.c solution item ........ r62811 \| benjamin.peterson \| 2008-05-07 04:23:43 +0200 (Wed, 07 May 2008) \| 2 lines update .bzrignore ........ r62841 \| christian.heimes \| 2008-05-08 00:54:17 +0200 (Thu, 08 May 2008) \| 1 line Replace more float hacks with correct math functions ........ r62842 \| benjamin.peterson \| 2008-05-08 01:11:54 +0200 (Thu, 08 May 2008) \| 2 lines Practice EAFP, and revert 62787 ........ r62848 \| raymond.hettinger \| 2008-05-08 06:35:20 +0200 (Thu, 08 May 2008) \| 1 line Frozensets do not benefit from autoconversion. ........ r62849 \| raymond.hettinger \| 2008-05-08 06:36:12 +0200 (Thu, 08 May 2008) \| 1 line The __all__ variable forgot to expose the gcd() function. ........ r62853 \| raymond.hettinger \| 2008-05-08 09:23:30 +0200 (Thu, 08 May 2008) \| 1 line Fix-up the enumerate type example and move it to the end. ........ r62854 \| ronald.oussoren \| 2008-05-08 12:34:39 +0200 (Thu, 08 May 2008) \| 3 lines Fix for issue 1770190: platform.mac_ver() now returns the right version on OSX 10.4.10 ........	18 years ago
Christian Heimes	90540004d3	Merged revisions 62734,62736,62748,62769 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62734 \| brett.cannon \| 2008-05-05 22:21:38 +0200 (Mon, 05 May 2008) \| 5 lines Add the 'json' package. Code taken from simplejson 1.9 and contributed by Bob Ippolito. Closes issue #2750. ........ r62736 \| georg.brandl \| 2008-05-05 22:53:39 +0200 (Mon, 05 May 2008) \| 2 lines Fix JSON module docs. ........ r62748 \| benjamin.peterson \| 2008-05-06 04:51:10 +0200 (Tue, 06 May 2008) \| 2 lines PEP 8 nits in json package ........ r62769 \| christian.heimes \| 2008-05-06 18:18:41 +0200 (Tue, 06 May 2008) \| 2 lines Intern static string Use float constructors instead of magic code for float constants ........	18 years ago
Christian Heimes	33e4a98a3e	Replace more float hacks with correct math functions	18 years ago
Brett Cannon	4b964f9c90	Add the 'json' package. Code taken from simplejson 1.9 and contributed by Bob Ippolito. Closes issue #2750.	18 years ago

14 Commits (3d596fa90b3c862eb2c0fb67aaf42cf1237c3258)