9f1ab8530c
Blocked revisions 84189,84532,84537,84540,84549,84551,84602,85226,85786,85891,86247-86248,86253,86275,86326,86486,86513,86617,86630,86661,86668,86758,86993,87056,87304,87446,87461 via svnmerge
...
........
r84189 | eric.araujo | 2010-08-19 00:35:23 +0200 (jeu., 19 août 2010) | 2 lines
Fix typo
........
r84532 | eric.araujo | 2010-09-05 19:32:25 +0200 (dim., 05 sept. 2010) | 11 lines
Fix typos and wording in what’s new 3.2.
- The entry about shutil.copytree is just a revert of r84524 which
looks like an unfinished edition.
- The use of gender-neutral language (s/his/their/) removes the
implicit assumption that programmer == male (change agreed by Antoine).
- Other changes should be uncontroversial fixes.
I haven’t rewrapped under 80 lines to keep the diffs readable; I’ll
rewrap later.
........
r84537 | eric.araujo | 2010-09-05 20:43:07 +0200 (dim., 05 sept. 2010) | 2 lines
Make naming consistent
........
r84540 | eric.araujo | 2010-09-05 20:59:49 +0200 (dim., 05 sept. 2010) | 2 lines
Fix accidental suppression in r84537
........
r84549 | eric.araujo | 2010-09-06 03:27:06 +0200 (lun., 06 sept. 2010) | 1 line
Update
........
r84551 | eric.araujo | 2010-09-06 03:31:11 +0200 (lun., 06 sept. 2010) | 2 lines
Revert accidental commit, apologies for the noise
........
r84602 | eric.araujo | 2010-09-07 23:35:35 +0200 (mar., 07 sept. 2010) | 2 lines
Fix typo in whatsnew (#9793 )
........
r85226 | eric.araujo | 2010-10-05 02:04:20 +0200 (mar., 05 oct. 2010) | 2 lines
Fix news entry formatting nits
........
r85786 | eric.araujo | 2010-10-22 01:02:07 +0200 (ven., 22 oct. 2010) | 8 lines
Apply fix from r85784 on py3k too.
Fixes bug #10126 for Python 3.2 by using $RUNSHARED to find the
directory to the shared library. test_distutils now passes when
Python was built with --enable-shared (Barry didn’t have the error
but I did).
........
r85891 | eric.araujo | 2010-10-28 15:49:17 +0200 (jeu., 28 oct. 2010) | 2 lines
Fix typo from r85874
........
r86247 | eric.araujo | 2010-11-06 05:59:27 +0100 (sam., 06 nov. 2010) | 2 lines
Fix typo from r86170.
........
r86248 | eric.araujo | 2010-11-06 07:00:54 +0100 (sam., 06 nov. 2010) | 6 lines
Remove traces of Mac OS 9 support, again (#9508 ).
This was done in r80805 (#7908 ) and erroneously brought back by the
distutils revert. This commit removes more code than the original,
which was uncomplete. There is no NEWS entry, like in r80805.
........
r86253 | eric.araujo | 2010-11-06 08:03:07 +0100 (sam., 06 nov. 2010) | 4 lines
Tweak example to make clear the argument is a boolean, not any integer.
With Raymond’s approval.
........
r86275 | eric.araujo | 2010-11-06 17:06:37 +0100 (sam., 06 nov. 2010) | 2 lines
Remove traces of setuptools (#10341 )
........
r86326 | eric.araujo | 2010-11-08 18:13:03 +0100 (lun., 08 nov. 2010) | 2 lines
Move a news entry to the right section (+ light reformatting)
........
r86486 | eric.araujo | 2010-11-16 20:13:50 +0100 (mar., 16 nov. 2010) | 4 lines
Provide links to Python source where the code is short, readable and
informative adjunct to the docs. Forward-port of Raymond's r86225 and
r86245 using the new source reST role added in #10334 .
........
r86513 | eric.araujo | 2010-11-18 15:22:08 +0100 (jeu., 18 nov. 2010) | 2 lines
Remove spurious space that was breaking Vim’s reST highlighting.
........
r86617 | eric.araujo | 2010-11-20 22:53:02 +0100 (sam., 20 nov. 2010) | 2 lines
Fix typos and style in compileall.
........
r86630 | eric.araujo | 2010-11-21 03:19:09 +0100 (dim., 21 nov. 2010) | 2 lines
Try to get more useful output from failing buildbot
........
r86661 | eric.araujo | 2010-11-22 02:11:49 +0100 (lun., 22 nov. 2010) | 2 lines
Fix typo
........
r86668 | eric.araujo | 2010-11-22 03:42:43 +0100 (lun., 22 nov. 2010) | 2 lines
Fix one compileall test (#10453 ). Patch by Michele Orrù.
........
r86758 | eric.araujo | 2010-11-26 01:39:59 +0100 (ven., 26 nov. 2010) | 2 lines
#10453 follow-up: Fix test_quiet on Windows, thanks to Stephan Krah.
........
r86993 | eric.araujo | 2010-12-03 20:41:00 +0100 (ven., 03 déc. 2010) | 7 lines
Allow translators to reorder placeholders in localizable messages from
argparse (#10528 ).
There is no unit test; I checked with xgettext that no more warnings
were emitted. Steven approved the change.
........
r87056 | eric.araujo | 2010-12-04 18:31:49 +0100 (sam., 04 déc. 2010) | 2 lines
Use proper plural forms in argparse (#4391 )
........
r87304 | eric.araujo | 2010-12-16 04:13:05 +0100 (jeu., 16 déc. 2010) | 2 lines
Fix one versionchanged
........
r87446 | eric.araujo | 2010-12-23 19:44:31 +0100 (jeu., 23 déc. 2010) | 2 lines
Nits: use a real boolean, make one docstring more similar to the other ones
........
r87461 | eric.araujo | 2010-12-24 00:18:41 +0100 (ven., 24 déc. 2010) | 2 lines
Fix syntax typo
........
2011-02-02 20:44:48 +00:00
a172e2502c
Fix typo: BadZipFile exists in 3.2+ only, not older versions.
2011-02-02 16:58:43 +00:00
07c35eb3b5
Blocked revisions 88299 via svnmerge
...
........
r88299 | eric.smith | 2011-02-01 16:31:22 -0500 (Tue, 01 Feb 2011) | 1 line
Wording fix.
........
2011-02-01 21:34:25 +00:00
2e811c92c7
Merged revisions 88284 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88284 | antoine.pitrou | 2011-01-31 22:08:57 +0100 (lun., 31 janv. 2011) | 4 lines
Issue #8275 : Fix passing of callback arguments with ctypes under Win64.
Patch by Stan Mihai. Ok'ed by Georg.
........
2011-01-31 21:36:33 +00:00
070f050c3a
Merged revisions 88281 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88281 | brian.curtin | 2011-01-31 13:35:02 -0600 (Mon, 31 Jan 2011) | 2 lines
#11083 typo: RuntimeException -> RuntimeError
........
2011-01-31 19:41:53 +00:00
8ce0fac6c8
Merged revisions 88258 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88258 | georg.brandl | 2011-01-30 02:16:07 -0600 (Sun, 30 Jan 2011) | 3 lines
#11069 : fix the IDLE Stack Viewer, by not using "list" as a variable name.
Original patch by Brian Curtin, reviewed by me.
........
2011-01-30 19:40:09 +00:00
7a8e21a6ec
Merged revisions 88234 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88234 | ned.deily | 2011-01-29 10:43:56 -0800 (Sat, 29 Jan 2011) | 5 lines
Issue #11053 : Fix IDLE "Syntax Error" windows to behave as in 2.x,
preventing a confusing hung appearance on OS X with the windows
obscured. (with release manager approval for 3.2rc2)
........
2011-01-29 23:34:19 +00:00
74d31a00d0
Merged revisions 88239 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88239 | alexander.belopolsky | 2011-01-29 14:49:40 -0500 (Sat, 29 Jan 2011) | 1 line
Issue #10939 : Make Internaldate2tuple test more robust.
........
2011-01-29 20:42:46 +00:00
26d55edc2f
Merged revisions 88236 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88236 | ned.deily | 2011-01-29 11:10:26 -0800 (Sat, 29 Jan 2011) | 3 lines
Issue 11052: Correct IDLE menu accelerators on Mac OS X for Save
commands. (with release manager approval for 3.2rc2)
........
2011-01-29 19:22:26 +00:00
87bb6e9b2f
Merged revisions 88231 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88231 | alexander.belopolsky | 2011-01-29 12:19:08 -0500 (Sat, 29 Jan 2011) | 4 lines
Issue #10939 : Fixed imaplib.Internaldate2tuple(). Thanks Joe Peterson
for the report and the patch. Reviewed by Georg Brandl.
........
2011-01-29 18:43:43 +00:00
7376c996d5
Blocked revisions 88226 via svnmerge
...
........
r88226 | eric.smith | 2011-01-29 06:15:35 -0500 (Sat, 29 Jan 2011) | 3 lines
Issue #11302 : missing type check on _string.formatter_field_name_split and _string.formatter_parser caused crash.
Originial patch by haypo, reviewed by me, okayed by Georg.
........
2011-01-29 11:33:25 +00:00
d62522ab56
Issue 11020: command-line pyclbr broken due to missing 2-to-3 conversion.
2011-01-27 00:12:08 +00:00
6c3f01791b
Merged revisions 88204 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88204 | antoine.pitrou | 2011-01-27 00:29:28 +0100 (jeu., 27 janv. 2011) | 4 lines
Issue #11018 : fix a test to not be a no-op in test_bz2.
Found by Nadeem Vawda, reviewed by Brett.
........
2011-01-26 23:31:20 +00:00
ab5dd00927
Merged revisions 88174 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88174 | ned.deily | 2011-01-24 13:46:44 -0800 (Mon, 24 Jan 2011) | 6 lines
#10974 : IDLE no longer crashes if its recent files list includes files
with non-ASCII characters in their path names.
(with approval of release manager for 3.2rc2)
........
2011-01-24 22:22:06 +00:00
e2248f9e6d
Issue #11000 ast.parse doc fix (r88172) + tix fix (r88170)
2011-01-24 21:46:05 +00:00
0f2a61a11e
Merged revisions 88147 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88147 | antoine.pitrou | 2011-01-23 18:12:25 +0100 (dim., 23 janv. 2011) | 3 lines
Issue #10987 : Fix the recursion limit handling in the _pickle module.
........
2011-01-23 17:21:28 +00:00
eb9d5ad6ba
Issue #10949 : Improved robustness of rotating file handlers.
2011-01-21 23:35:57 +00:00
a970e62258
Merged revisions 88137 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88137 | antoine.pitrou | 2011-01-21 22:37:32 +0100 (ven., 21 janv. 2011) | 3 lines
Fix JSON docs about loads() accepting only str objects, not bytes.
........
2011-01-21 21:39:56 +00:00
6107a4e24a
Merged revisions 88131 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88131 | antoine.pitrou | 2011-01-20 22:07:24 +0100 (jeu., 20 janv. 2011) | 6 lines
Issue #10955 : Fix a potential crash when trying to mmap() a file past its
length. Initial patch by Ross Lagerwall.
This fixes a regression introduced by r88022.
........
2011-01-20 21:11:13 +00:00
710e96651d
Merged revisions 88111 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88111 | antoine.pitrou | 2011-01-19 16:21:35 +0100 (mer., 19 janv. 2011) | 4 lines
Issue #10898 : Allow compiling the posix module when the C library defines
a symbol named FSTAT.
........
2011-01-19 15:26:37 +00:00
566facd39b
Merged revisions 88097 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88097 | antoine.pitrou | 2011-01-18 19:57:52 +0100 (mar., 18 janv. 2011) | 4 lines
Issue #10451 : memoryview objects could allow to mutate a readable buffer.
Initial patch by Ross Lagerwall.
........
2011-01-18 19:06:09 +00:00
cbb98950db
Merged revisions 88007 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88007 | ned.deily | 2011-01-14 21:44:21 -0800 (Fri, 14 Jan 2011) | 5 lines
Remove spurious copy of Mac/IDLE/idlemain.py left over from
conversion from Python 2 build process. The correct version
is in Mac/IDLE/IDLE.app/Contents/Resources/
........
2011-01-18 05:00:40 +00:00
59ad4eb491
Merged revisions 88008 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88008 | ned.deily | 2011-01-14 21:53:33 -0800 (Fri, 14 Jan 2011) | 2 lines
Add self to mac platform area in maintainers.rst.
........
2011-01-18 01:43:26 +00:00
221d02492b
Merged revisions 88080 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88080 | benjamin.peterson | 2011-01-17 17:49:51 -0600 (Mon, 17 Jan 2011) | 1 line
very out of date file
........
2011-01-17 23:52:55 +00:00
32a8fe8b56
Merged revisions 88069 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88069 | benjamin.peterson | 2011-01-17 13:54:55 -0600 (Mon, 17 Jan 2011) | 1 line
remove unneeded assertion
........
2011-01-17 20:03:01 +00:00
d82f45b720
Merged revisions 88066 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88066 | benjamin.peterson | 2011-01-17 13:44:46 -0600 (Mon, 17 Jan 2011) | 1 line
correct assertion
........
2011-01-17 19:46:48 +00:00
acd17591f5
Merged revisions 88063 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88063 | benjamin.peterson | 2011-01-17 13:24:34 -0600 (Mon, 17 Jan 2011) | 4 lines
turn some checks into assertions, since they are implied by the caller
Reviewed by Georg.
........
2011-01-17 19:36:44 +00:00
1f3fa04543
Markup fix.
2011-01-17 18:16:16 +00:00
50dc65f6ce
Merged revisions 88036 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88036 | antoine.pitrou | 2011-01-15 18:25:58 +0100 (sam., 15 janv. 2011) | 3 lines
Fix mmap and test_mmap under Windows too (followup to r88022)
........
2011-01-15 17:31:19 +00:00
fb7bc3d2f0
Merged revisions 88022 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88022 | antoine.pitrou | 2011-01-15 17:17:07 +0100 (sam., 15 janv. 2011) | 7 lines
Issue #10916 : mmap should not segfault when a file is mapped using 0 as
length and a non-zero offset, and an attempt to read past the end of file
is made (IndexError is raised instead). Patch by Ross Lagerwall.
Requested by Georg.
........
2011-01-15 16:18:37 +00:00
3acd3e97f2
Merged revisions 88012-88018 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88012 | antoine.pitrou | 2011-01-15 12:39:23 +0100 (sam., 15 janv. 2011) | 3 lines
Avoid ResourceWarnings in ccbench
........
r88013 | antoine.pitrou | 2011-01-15 12:44:17 +0100 (sam., 15 janv. 2011) | 3 lines
Standard streams use file descriptors, not FILE pointers.
........
r88014 | antoine.pitrou | 2011-01-15 12:57:42 +0100 (sam., 15 janv. 2011) | 3 lines
Restructure a bit
........
r88015 | antoine.pitrou | 2011-01-15 13:10:48 +0100 (sam., 15 janv. 2011) | 3 lines
Improve description of issues
........
r88016 | antoine.pitrou | 2011-01-15 13:21:53 +0100 (sam., 15 janv. 2011) | 3 lines
Add mention of how to switch interpreters
........
r88017 | antoine.pitrou | 2011-01-15 13:54:19 +0100 (sam., 15 janv. 2011) | 3 lines
Reword and restructure the GIL API doc
........
r88018 | antoine.pitrou | 2011-01-15 14:11:48 +0100 (sam., 15 janv. 2011) | 4 lines
Issue #10913 : Deprecate misleading functions PyEval_AcquireLock() and
PyEval_ReleaseLock(). The thread-state aware APIs should be used instead.
........
2011-01-15 14:19:53 +00:00
5bcc563cde
Merged revisions 88009 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88009 | eli.bendersky | 2011-01-15 12:23:34 +0200 (Sat, 15 Jan 2011) | 2 lines
Issue #10912 : Clarify the documentation of PyObject_RichCompareBool. Thanks to Devin Jeanpierre for spotting the problem.
........
2011-01-15 10:33:07 +00:00
78ae1fb1b9
Merged revisions 87968,87971-87975 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r87968 | antoine.pitrou | 2011-01-12 21:46:37 +0100 (mer., 12 janv. 2011) | 4 lines
Fix the expected memory use of utf-8 encoding. Also, release the
one reference to a huge object even when an exception is raised.
........
r87971 | antoine.pitrou | 2011-01-12 22:19:59 +0100 (mer., 12 janv. 2011) | 3 lines
Make test skipping message nicer, and remove the rather useless "overhead" parameter.
........
r87972 | antoine.pitrou | 2011-01-12 22:40:20 +0100 (mer., 12 janv. 2011) | 3 lines
Fix @bigmemtest when no limit is given by the user (oops)
........
r87973 | antoine.pitrou | 2011-01-12 22:50:44 +0100 (mer., 12 janv. 2011) | 3 lines
More informative skip message in @bigaddrspace
........
r87974 | antoine.pitrou | 2011-01-12 22:58:39 +0100 (mer., 12 janv. 2011) | 3 lines
A better message again
........
r87975 | antoine.pitrou | 2011-01-12 23:02:45 +0100 (mer., 12 janv. 2011) | 3 lines
Fix test_bigaddrspace (some tests didn't trigger the expected MemoryError)
........
2011-01-14 20:19:57 +00:00
39be2a5210
Merged revisions 87993 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r87993 | eli.bendersky | 2011-01-14 10:25:03 +0200 (Fri, 14 Jan 2011) | 2 lines
Issue #10902 : Fix reference to run* methods
........
2011-01-14 08:55:38 +00:00
44a6c16729
Merged revisions 87991 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r87991 | eli.bendersky | 2011-01-14 09:31:14 +0200 (Fri, 14 Jan 2011) | 2 lines
Remove call to nonexisting function (relic from Python 2.x) under #ifdef __INSURE__. Issue 9844
........
2011-01-14 08:52:17 +00:00
d2b03e1409
Backport 87978: Do not expose function type annotations in the standard library.
2011-01-12 23:52:40 +00:00
3b6e83173c
Remove the funky function annotation from numbers.py.
2011-01-12 20:54:53 +00:00
3bce13d42b
Remove the function annotations from _abcoll.py
2011-01-12 20:46:15 +00:00
ecb6e81d9e
Merged revisions 87895 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r87895 | lukasz.langa | 2011-01-09 12:18:53 -0600 (Sun, 09 Jan 2011) | 5 lines
#10874 : test_urllib2 shouldn't use `is` operator for comparing strings
Patch by Adreas Stührk.
........
2011-01-12 19:29:51 +00:00
a53d2acb3d
Merged revisions 87960 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r87960 | benjamin.peterson | 2011-01-12 12:56:07 -0600 (Wed, 12 Jan 2011) | 1 line
use PyErr_SetString instead of PyErr_Format
........
2011-01-12 19:02:36 +00:00
b633eab98e
Merged revisions 87958 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r87958 | antoine.pitrou | 2011-01-12 19:45:27 +0100 (mer., 12 janv. 2011) | 4 lines
Issue #10822 : Fix test_posix:test_getgroups failure under Solaris. Patch
by Ross Lagerwall.
........
2011-01-12 18:50:35 +00:00
de368717da
Merged revisions 87952-87954 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r87952 | benjamin.peterson | 2011-01-12 09:24:27 -0600 (Wed, 12 Jan 2011) | 1 line
move this test to test_descr; it's not abc specific
........
r87953 | benjamin.peterson | 2011-01-12 09:25:02 -0600 (Wed, 12 Jan 2011) | 1 line
oops, wrong class
........
r87954 | benjamin.peterson | 2011-01-12 09:34:01 -0600 (Wed, 12 Jan 2011) | 1 line
don't segfault on deleting __abstractmethods__ #10892
........
2011-01-12 15:42:34 +00:00
6e1d0a829d
Merged revisions 87949 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r87949 | benjamin.peterson | 2011-01-11 22:44:41 -0600 (Tue, 11 Jan 2011) | 1 line
fix weirdly ambigious sentence
........
2011-01-12 04:51:02 +00:00
7be05b221d
Merged revisions 82547 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r82547 | alexander.belopolsky | 2010-07-04 13:00:20 -0400 (Sun, 04 Jul 2010) | 3 lines
Issue #9118 : help(None) will now return NoneType doc instead of
starting interactive help.
........
2011-01-11 15:23:22 +00:00
cff7e2f4a9
Synchronize maintainers file
2011-01-11 12:21:37 +00:00
23f4fb9a96
Issue #10875 : Update Regular Expression HOWTO; additional backport.
2011-01-10 23:16:24 +00:00
8663e346dc
Issue #10875 : Update Regular Expression HOWTO; patch by 'SilentGhost'.
2011-01-10 21:49:11 +00:00
c842a17d81
Blocked revisions 87890-87891 via svnmerge
...
........
r87890 | georg.brandl | 2011-01-09 10:04:08 +0100 (So, 09 Jan 2011) | 1 line
Wrap some long examples and signatures.
........
r87891 | georg.brandl | 2011-01-09 10:31:01 +0100 (So, 09 Jan 2011) | 1 line
#10871 : "file" does not exist anymore in Python 3. Also adapt the reprs of opened file objects.
........
2011-01-09 09:33:18 +00:00
41d0815a65
Merged revisions 87789-87790 via svnmerge from
...
svn+ssh://svn.python.org/python/branches/py3k
........
r87789 | georg.brandl | 2011-01-06 10:23:56 +0100 (Do, 06 Jan 2011) | 1 line
Fix various issues (mostly Python 2 relics) found by Jacques Ducasse.
........
r87790 | georg.brandl | 2011-01-06 10:25:27 +0100 (Do, 06 Jan 2011) | 1 line
Add acks where acks are due.
........
2011-01-09 08:01:46 +00:00
1caa644ffe
Merged revisions 87791 via svnmerge from
...
svn+ssh://svn.python.org/python/branches/py3k
........
r87791 | georg.brandl | 2011-01-06 11:05:26 +0100 (Do, 06 Jan 2011) | 1 line
#10844 : update copyright years in Mac plists.
........
2011-01-09 07:59:59 +00:00
Éric Araujo
Eric Smith
Antoine Pitrou
Brian Curtin
Ned Deily
Alexander Belopolsky
Raymond Hettinger
Terry Reedy
Vinay Sajip
Benjamin Peterson
Georg Brandl
Eli Bendersky