Benjamin Peterson 5a1ca6e368 Merged revisions 86587 via svnmerge from ...

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86587 | benjamin.peterson | 2010-11-20 11:24:04 -0600 (Sat, 20 Nov 2010) | 1 line

  correct logic when pos is after the string #10467
........

2010-11-20 17:26:25 +00:00

..

_ctypes

Merged revisions 83841,84741 via svnmerge from

2010-09-12 16:19:05 +00:00

_io

Merged revisions 86587 via svnmerge from

2010-11-20 17:26:25 +00:00

_multiprocessing

Merged revisions 85665 via svnmerge from

2010-10-17 21:14:36 +00:00

_sqlite

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

cjkcodecs

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

expat

Merged revisions 84743 via svnmerge from

2010-09-12 16:50:20 +00:00

zlib

…

_bisectmodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

_codecsmodule.c

Merged revisions 79780 via svnmerge from

2010-06-09 17:56:11 +00:00

_collectionsmodule.c

Merged revisions 84146-84147,84150 via svnmerge from

2010-08-17 19:39:39 +00:00

_csv.c

Merged revisions 84078 via svnmerge from

2010-08-15 19:13:19 +00:00

_curses_panel.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

_cursesmodule.c

Recorded merge of revisions 81215 via svnmerge from

2010-05-15 22:30:53 +00:00

_dbmmodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

_elementtree.c

add a replacement API for PyCObject, PyCapsule #5630

2009-05-05 22:31:58 +00:00

_functoolsmodule.c

Merged revisions 84098 via svnmerge from

2010-08-16 19:46:32 +00:00

_gdbmmodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

_gestalt.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

_hashopenssl.c

Merged revisions 78875 via svnmerge from

2010-03-21 21:05:53 +00:00

_heapqmodule.c

Merged revisions 84472 via svnmerge from

2010-09-03 22:05:17 +00:00

_json.c

Merged revisions 85342 via svnmerge from

2010-10-09 15:26:41 +00:00

_localemodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

_lsprof.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

_pickle.c

Merged revisions 84502 via svnmerge from

2010-09-04 18:46:56 +00:00

_randommodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

_scproxy.c

Merged revisions 85062 via svnmerge from

2010-09-28 14:40:22 +00:00

_sre.c

Merged revisions 78664 via svnmerge from

2010-03-04 22:01:47 +00:00

_ssl.c

Merged revisions 85432 via svnmerge from

2010-10-13 22:20:48 +00:00

_struct.c

Merged revisions 83239 via svnmerge from

2010-07-29 21:43:24 +00:00

_testcapimodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

_threadmodule.c

Merged revisions 84344 via svnmerge from

2010-08-28 18:27:09 +00:00

_tkinter.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

_weakref.c

…

addrinfo.h

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

ar_beos

…

arraymodule.c

Merged revisions 83751-83752 via svnmerge from

2010-08-06 09:42:28 +00:00

atexitmodule.c

…

audioop.c

Merged revisions 82527 via svnmerge from

2010-07-04 10:15:59 +00:00

binascii.c

Merged revisions 84078 via svnmerge from

2010-08-15 19:13:19 +00:00

bz2module.c

Merged revisions 84980 via svnmerge from

2010-09-23 19:54:28 +00:00

cmathmodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

config.c.in

Merged revisions 81604 via svnmerge from

2010-05-29 21:11:05 +00:00

cryptmodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

datetimemodule.c

Merged revisions 82301 via svnmerge from

2010-07-11 10:41:07 +00:00

errnomodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

fcntlmodule.c

Merged revisions 84249,84264,84326-84327,84407,84476,84480-84482,84484,84530-84531,84553,84619,84684,84915-84916 via svnmerge from

2010-10-06 08:54:16 +00:00

fpectlmodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

fpetestmodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

gc_weakref.txt

…

gcmodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

getaddrinfo.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

getbuildinfo.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

getnameinfo.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

getpath.c

copy_absolute(): keep the relative path if _wgetcwd() failed

2010-10-07 23:39:04 +00:00

grpmodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

hashlib.h

Fixes Issue #3745: Fix hashlib to always reject unicode and non

2009-02-12 07:35:29 +00:00

itertoolsmodule.c

Merged revisions 81891 via svnmerge from

2010-06-11 02:28:37 +00:00

ld_so_aix.in

Merged revisions 84680 via svnmerge from

2010-09-10 19:55:19 +00:00

ld_so_beos

…

main.c

Merged revisions 81250-81253 via svnmerge from

2010-05-17 09:35:44 +00:00

makesetup

…

makexp_aix

…

mathmodule.c

Merged revisions 82223 via svnmerge from

2010-06-25 20:23:41 +00:00

md5module.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

mmapmodule.c

Merged revisions 86159 via svnmerge from

2010-11-04 12:35:21 +00:00

nismodule.c

Merged revisions 84172 via svnmerge from

2010-08-19 09:03:03 +00:00

operator.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

ossaudiodev.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

parsermodule.c

Merged revisions 82555 via svnmerge from

2010-07-04 18:39:48 +00:00

posixmodule.c

Merged revisions 84489 via svnmerge from

2010-09-04 17:26:01 +00:00

pwdmodule.c

Merged revisions 84106 via svnmerge from

2010-08-16 20:26:04 +00:00

pyexpat.c

Merged revisions 85536 via svnmerge from

2010-10-24 14:20:36 +00:00

python.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

readline.c

Merged revisions 83670 via svnmerge from

2010-08-03 16:52:23 +00:00

resource.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

rotatingtree.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

rotatingtree.h

…

selectmodule.c

Merged revisions 83561,83563,83565-83566,83569,83571,83574-83575,83580,83584,83599,83612,83659,83977,84015-84018,84020,84141 via svnmerge from

2010-10-06 08:35:38 +00:00

Setup.config.in

…

Setup.dist

#3791: remove last traces of bsddb.

2009-06-04 09:30:30 +00:00

sha1module.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

sha256module.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

sha512module.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

signalmodule.c

Merged revisions 86214 via svnmerge from

2010-11-05 19:54:58 +00:00

socketmodule.c

Merged revisions 85868 via svnmerge from

2010-10-27 20:27:14 +00:00

socketmodule.h

Merged revisions 84347 via svnmerge from

2010-08-28 20:53:24 +00:00

spwdmodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

sre_constants.h

…

sre.h

…

symtablemodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

syslogmodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

termios.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

testcapi_long.h

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

timemodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

tkappinit.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

tkinter.h

Merged revisions 71210 via svnmerge from

2009-04-10 22:19:09 +00:00

unicodedata_db.h

Merged revisions 72054 via svnmerge from

2009-04-27 22:31:40 +00:00

unicodedata.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

unicodename_db.h

…

xxmodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

xxsubtype.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

zipimport.c

Merged revisions 83009 via svnmerge from

2010-07-21 01:46:44 +00:00

zlibmodule.c

Merged revisions 81100 via svnmerge from

2010-05-11 23:49:58 +00:00