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
........

2008-05-08 14:29:10 +00:00

..

_ctypes

Silence a compiler warning

2008-05-06 23:15:46 +00:00

_sqlite

Merged revisions 62425-62429,62434-62436,62441,62444,62446-62448,62450-62455,62463,62465-62466,62469,62474,62476-62478,62480,62485,62492,62497-62498,62500,62507,62513-62514,62516,62521,62531,62535,62545-62546,62548-62551,62553-62559,62569,62574,62577,62593,62595,62604-62606,62608,62616,62626-62627,62636,62638,62644-62645,62647-62648,62651-62653,62656,62661,62663,62680,62686-62687,62696,62699-62703,62711 via svnmerge from

2008-05-04 22:42:01 +00:00

cjkcodecs

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-60678 via svnmerge from

2008-02-09 02:18:51 +00:00

expat

Remove support for BeOS

2007-08-17 12:57:41 +00:00

zlib

Remove RISCOS support

2007-08-16 14:35:24 +00:00

_bisectmodule.c

Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h

2007-12-02 14:31:20 +00:00

_bsddb.c

use PyBUF_LOCK instead of PyBUF_SIMPLE for bsddb data access as it'll often

2008-03-17 20:16:47 +00:00

_bytesio.c

Fixed bytes naming in the docstrings of _bytesio.c.

2008-05-08 01:34:41 +00:00

_codecsmodule.c

Merged revisions 59056-59076 via svnmerge from

2007-11-20 23:38:09 +00:00

_collectionsmodule.c

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,60735-60751 via svnmerge from

2008-02-12 22:59:25 +00:00

_csv.c

#1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT.

2007-12-19 02:45:37 +00:00

_curses_panel.c

#1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT.

2007-12-19 02:45:37 +00:00

_cursesmodule.c

Merged revisions 60284-60349 via svnmerge from

2008-01-27 15:18:18 +00:00

_elementtree.c

Merged revisions 59985-60000,60002,60005-60007,60009-60042 via svnmerge from

2008-01-18 09:56:22 +00:00

_fileio.c

Added fast alternate io.BytesIO implementation and its test suite.

2008-05-06 19:48:38 +00:00

_functoolsmodule.c

#1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT.

2007-12-19 02:45:37 +00:00

_hashopenssl.c

#1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT.

2007-12-19 02:45:37 +00:00

_heapqmodule.c

Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from

2008-03-16 00:07:10 +00:00

_json.c

Merged revisions 62734,62736,62748,62769 via svnmerge from

2008-05-08 14:29:10 +00:00

_localemodule.c

Fix another buffer overflow.

2008-03-08 13:39:58 +00:00

_lsprof.c

#1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT.

2007-12-19 02:45:37 +00:00

_randommodule.c

Remove defunct parts of the random module

2008-01-13 23:40:30 +00:00

_sre.c

Merged revisions 60053-60078 via svnmerge from

2008-01-19 16:21:02 +00:00

_ssl.c

Merged revisions 61964-61979 via svnmerge from

2008-03-28 00:55:15 +00:00

_struct.c

Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from

2008-03-16 00:07:10 +00:00

_testcapimodule.c

Merged revisions 62425-62429,62434-62436,62441,62444,62446-62448,62450-62455,62463,62465-62466,62469,62474,62476-62478,62480,62485,62492,62497-62498,62500,62507,62513-62514,62516,62521,62531,62535,62545-62546,62548-62551,62553-62559,62569,62574,62577,62593,62595,62604-62606,62608,62616,62626-62627,62636,62638,62644-62645,62647-62648,62651-62653,62656,62661,62663,62680,62686-62687,62696,62699-62703,62711 via svnmerge from

2008-05-04 22:42:01 +00:00

_tkinter.c

Change command line processing API to use wchar_t.

2008-04-05 20:41:37 +00:00

_weakref.c

#1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT.

2007-12-19 02:45:37 +00:00

addrinfo.h

Cruft removal:

2006-12-28 04:47:50 +00:00

ar_beos

…

arraymodule.c

Remove the deprecated array.read/write methods.

2008-02-01 11:30:18 +00:00

atexitmodule.c

missing docstrings

2007-08-06 20:59:28 +00:00

audioop.c

Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h

2007-12-02 14:31:20 +00:00

binascii.c

Merged revisions 61834,61841-61842,61851-61853,61863-61864,61869-61870,61874,61889 via svnmerge from

2008-03-25 14:56:36 +00:00

bsddb.h

Merged revisions 59488-59511 via svnmerge from

2007-12-15 01:27:15 +00:00

bz2module.c

#1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT.

2007-12-19 02:45:37 +00:00

cmathmodule.c

Merged revisions 62420-62421,62423-62424 via svnmerge from

2008-04-21 13:08:03 +00:00

config.c.in

Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from

2008-04-13 13:53:33 +00:00

cryptmodule.c

Merged revisions 46753-51188 via svnmerge from

2006-08-11 14:57:12 +00:00

cStringIO.c

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

2008-02-17 13:31:39 +00:00

datetimemodule.c

Issue #1950: Fixed misusage of PyUnicode_AsString().

2008-05-03 18:24:43 +00:00

dbmmodule.c

Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61061-61064,61066-61080 via svnmerge from

2008-02-26 08:18:30 +00:00

errnomodule.c

Some VS 6.0 compatibility fixes from Hirokazu Yamamoto which are also useful for later versions of MSVC. VS6 claims that fortran is a reserved word

2008-01-04 13:33:00 +00:00

fcntlmodule.c

Merged revisions 61644,61646-61647,61649-61652,61656-61658,61663,61665,61667 via svnmerge from

2008-03-20 10:49:03 +00:00

fpectlmodule.c

Merged revisions 46753-51188 via svnmerge from

2006-08-11 14:57:12 +00:00

fpetestmodule.c

…

gc_weakref.txt

…

gcmodule.c

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-60845 via svnmerge from

2008-02-16 07:38:31 +00:00

gdbmmodule.c

Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from

2008-03-16 00:07:10 +00:00

getaddrinfo.c

SF patch #1670209, Remove Py_PROTO from socket by Pete Shinners.

2007-02-27 19:06:23 +00:00

getbuildinfo.c

Merged revisions 55817-55961 via svnmerge from

2007-06-13 18:07:49 +00:00

getnameinfo.c

SF patch #1670209, Remove Py_PROTO from socket by Pete Shinners.

2007-02-27 19:06:23 +00:00

getpath.c

Change command line processing API to use wchar_t.

2008-04-05 20:41:37 +00:00

grpmodule.c

Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h

2007-12-02 14:31:20 +00:00

itertoolsmodule.c

Fix a refleak

2008-04-01 07:37:58 +00:00

ld_so_aix

…

ld_so_beos

…

main.c

Merged revisions 62774-62775,62785,62787-62788 via svnmerge from

2008-05-06 23:45:46 +00:00

makesetup

Merged revisions 57778-58052 via svnmerge from

2007-09-08 17:39:28 +00:00

makexp_aix

…

mathmodule.c

Merged revisions 62425-62429,62434-62436,62441,62444,62446-62448,62450-62455,62463,62465-62466,62469,62474,62476-62478,62480,62485,62492,62497-62498,62500,62507,62513-62514,62516,62521,62531,62535,62545-62546,62548-62551,62553-62559,62569,62574,62577,62593,62595,62604-62606,62608,62616,62626-62627,62636,62638,62644-62645,62647-62648,62651-62653,62656,62661,62663,62680,62686-62687,62696,62699-62703,62711 via svnmerge from

2008-05-04 22:42:01 +00:00

md5module.c

#1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT.

2007-12-19 02:45:37 +00:00

mmapmodule.c

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-60849,60852-60854,60856-60859,60861-60870,60874-60878,60880-60892,60894-60898 via svnmerge from

2008-02-19 14:21:46 +00:00

nismodule.c

Use s# instead of t# for nis_match.

2007-08-30 10:21:51 +00:00

operator.c

Remove __{get,set,del}slice__ dingleberries.

2008-03-17 18:02:30 +00:00

ossaudiodev.c

Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h

2007-12-02 14:31:20 +00:00

parsermodule.c

Issue #1950: Fixed misusage of PyUnicode_AsString().

2008-05-03 18:24:43 +00:00

posixmodule.c

Removed unused variable.

2008-04-12 21:40:56 +00:00

pwdmodule.c

Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h

2007-12-02 14:31:20 +00:00

pyexpat.c

Merged revisions 59843-59863 via svnmerge from

2008-01-09 00:17:24 +00:00

python.c

Change command line processing API to use wchar_t.

2008-04-05 20:41:37 +00:00

readline.c

Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h

2007-12-02 14:31:20 +00:00

resource.c

Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h

2007-12-02 14:31:20 +00:00

rotatingtree.c

…

rotatingtree.h

…

selectmodule.c

Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from

2008-03-26 13:45:42 +00:00

Setup.config.in

…

Setup.dist

Remove the dl module per PEP 3108.

2008-03-24 06:22:57 +00:00

sha1module.c

#1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT.

2007-12-19 02:45:37 +00:00

sha256module.c

#1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT.

2007-12-19 02:45:37 +00:00

sha512module.c

#1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT.

2007-12-19 02:45:37 +00:00

signalmodule.c

Merged revisions 61849 via svnmerge from

2008-03-24 14:05:07 +00:00

socketmodule.c

Merged revisions 61520,61523-61528,61532 via svnmerge from

2008-03-18 18:26:33 +00:00

socketmodule.h

Copied doc for reload() from trunk's function.rst to imp.rst

2008-01-07 17:19:16 +00:00

spwdmodule.c

Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h

2007-12-02 14:31:20 +00:00

sre_constants.h

…

sre.h

Merged revisions 46753-51188 via svnmerge from

2006-08-11 14:57:12 +00:00

symtablemodule.c

Hide list comp variables and support set comprehensions

2007-04-15 12:05:43 +00:00

syslogmodule.c

Merged revisions 60990-61002 via svnmerge from

2008-02-23 18:30:17 +00:00

termios.c

Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h

2007-12-02 14:31:20 +00:00

testcapi_long.h

…

threadmodule.c

#1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT.

2007-12-19 02:45:37 +00:00

timemodule.c

Merged revisions 62177-62178,62180-62193 via svnmerge from

2008-04-07 03:17:54 +00:00

tkappinit.c

…

unicodedata_db.h

…

unicodedata.c

#1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT.

2007-12-19 02:45:37 +00:00

unicodename_db.h

…

xxmodule.c

#1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT.

2007-12-19 02:45:37 +00:00

xxsubtype.c

Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h

2007-12-02 14:31:20 +00:00

yuv.h

…

yuvconvert.c

…

zipimport.c

Reverted (partially) patch r62667 to zipimport.c.

2008-05-07 02:48:42 +00:00

zlibmodule.c

Merged revisions 62194,62197-62198,62204-62205,62214,62219-62221,62227,62229-62231,62233-62235,62237-62239 via svnmerge from

2008-04-09 08:37:03 +00:00