Antoine Pitrou cdb63fbc57 Merged revisions 83442 via svnmerge from ...

svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

................
  r83442 | antoine.pitrou | 2010-08-01 22:13:11 +0200 (dim., 01 août 2010) | 10 lines

  Merged revisions 83440 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/branches/py3k

  ........
    r83440 | antoine.pitrou | 2010-08-01 22:08:46 +0200 (dim., 01 août 2010) | 4 lines

    Issue #8397: Raise an error when attempting to mix iteration and regular
    reads on a BZ2File object, rather than returning incorrect results.
  ........
................

2010-08-01 20:16:12 +00:00

..

_ctypes

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

_multiprocessing

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

_sqlite

Merged revisions 78898 via svnmerge from

2010-03-21 13:52:56 +00:00

cjkcodecs

Merged revisions 81454 via svnmerge from

2010-05-21 22:55:31 +00:00

expat

Merged revisions 77680 via svnmerge from

2010-01-22 01:05:13 +00:00

zlib

…

_bisectmodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

_bsddb.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

_bytesio.c

Merged revisions 80720 via svnmerge from

2010-05-03 16:48:13 +00:00

_codecsmodule.c

Merged revisions 79779 via svnmerge from

2010-06-09 17:55:28 +00:00

_collectionsmodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

_csv.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

_curses_panel.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

_cursesmodule.c

Recorded merge of revisions 81213 via svnmerge from

2010-05-15 22:26:41 +00:00

_elementtree.c

…

_fileio.c

Merged revisions 80796 via svnmerge from

2010-05-05 16:29:25 +00:00

_functoolsmodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

_hashopenssl.c

Merged revisions 77120,77151,77155,77209,77229,77256,77317,77331,77333,77359-77360,77382,77561,77570 via svnmerge from

2010-03-21 19:16:28 +00:00

_heapqmodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

_hotshot.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

_json.c

…

_localemodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

_lsprof.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

_randommodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

_sre.c

Merged revisions 77499 via svnmerge from

2010-01-14 17:34:09 +00:00

_ssl.c

Merged revisions 82210 via svnmerge from

2010-06-25 00:09:05 +00:00

_struct.c

Merged revisions 83241 via svnmerge from

2010-07-29 21:47:28 +00:00

_testcapimodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

_tkinter.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

_weakref.c

…

addrinfo.h

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

almodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

ar_beos

…

arraymodule.c

Merged revisions 83031 via svnmerge from

2010-07-21 16:50:52 +00:00

audioop.c

Merged revisions 82492 via svnmerge from

2010-07-03 13:39:22 +00:00

binascii.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

bsddb.h

…

bsddbmodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

bz2module.c

Merged revisions 83442 via svnmerge from

2010-08-01 20:16:12 +00:00

cdmodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

cgen.py

…

cgensupport.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

cgensupport.h

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

clmodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

cmathmodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

config.c.in

Merged revisions 81602 via svnmerge from

2010-05-29 21:03:13 +00:00

cPickle.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

cryptmodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

cStringIO.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

cstubs

…

datetimemodule.c

Merged revisions 81566 via svnmerge from

2010-05-27 21:53:16 +00:00

dbmmodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

dlmodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

errnomodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

fcntlmodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

flmodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

fmmodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

fpectlmodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

fpetestmodule.c

…

future_builtins.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

gc_weakref.txt

…

gcmodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

gdbmmodule.c

…

getaddrinfo.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

getbuildinfo.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

getnameinfo.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

getpath.c

Merged revisions 83098 via svnmerge from

2010-07-24 10:09:36 +00:00

glmodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

grpmodule.c

Merged revisions 73016 via svnmerge from

2009-05-29 16:00:23 +00:00

imageop.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

imgfile.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

itertoolsmodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

ld_so_aix

Merged revisions 72180 via svnmerge from

2009-05-01 21:24:56 +00:00

ld_so_beos

…

linuxaudiodev.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

main.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

makesetup

…

makexp_aix

…

mathmodule.c

Merged revisions 82221 via svnmerge from

2010-06-25 20:21:43 +00:00

md5.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

md5.h

…

md5module.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

mmapmodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

nismodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

operator.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

ossaudiodev.c

…

parsermodule.c

Issue #9130: Fix validation of relative imports in parser module.

2010-07-04 16:59:04 +00:00

posixmodule.c

Merged revisions 83124 via svnmerge from

2010-07-24 10:05:19 +00:00

puremodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

pwdmodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

pyexpat.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

python.c

…

readline.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

resource.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

rotatingtree.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

rotatingtree.h

…

selectmodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

Setup.config.in

…

Setup.dist

…

sgimodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

sha256module.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

sha512module.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

shamodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

signalmodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

socketmodule.c

Merged revisions 74426 via svnmerge from

2010-05-23 15:22:08 +00:00

socketmodule.h

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

spwdmodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

sre_constants.h

…

sre.h

…

stropmodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

sunaudiodev.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

svmodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

symtablemodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

syslogmodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

termios.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

testcapi_long.h

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

threadmodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

timemodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

timing.h

…

timingmodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

tkappinit.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

unicodedata_db.h

…

unicodedata.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

unicodename_db.h

…

xxmodule.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

xxsubtype.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

yuv.h

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

yuvconvert.c

Recorded merge of revisions 81029 via svnmerge from

2010-05-09 15:15:40 +00:00

zipimport.c

Merged revisions 83007 via svnmerge from

2010-07-21 01:40:15 +00:00

zlibmodule.c

Merged revisions 81098 via svnmerge from

2010-05-11 23:45:55 +00:00