Commit Graph

7998 Commits

Author SHA1 Message Date
Guido van Rossum b885a5bbc8 Merge cleanup. 2011-03-29 13:04:24 -07:00
Guido van Rossum 07ef62c47c Merge issue 11662 from 2.6. 2011-03-29 12:53:55 -07:00
Guido van Rossum 079381d236 Merge issue 11662 from 2.5. 2011-03-29 12:51:16 -07:00
guido@google.com b7ef35b582 Merge urllib/urllib2 security fix from 2.6 branch. 2011-03-29 11:14:01 -07:00
guido@google.com 9a9fdfad59 Merge urllib/urllib2 security fix from 2.5 branch. 2011-03-29 10:48:23 -07:00
Benjamin Peterson 77d466079a Correct handling of functions with only kwarg args in getcallargs (closes #11256)
A patch from Daniel Urban.
2011-03-28 17:32:31 -05:00
guido@google.com f1509306d2 Add tests for the urllib[2] vulnerability. Change to raise exceptions. 2011-03-28 13:47:01 -07:00
Martin v. Löwis 7aea63ff65 Add missing file from #11696. 2011-03-27 21:01:03 +02:00
Mark Dickinson d687be09b4 Issue #9696: Fix exception incorrectly raised by xdrlib.Packer.pack_int when trying to pack a negative (in-range) integer. 2011-03-27 16:15:24 +01:00
Steven Bethard bc3b104e46 Issue #9026: Fix order of argparse sub-commands in help messages. (Merged from 3.2.) 2011-03-27 13:57:55 +02:00
Steven Bethard 539586296d Issue #9348: Raise an early error if argparse nargs and metavar don't match. (Merge from 3.2.) 2011-03-26 17:57:52 +01:00
Mark Dickinson 874d59ee91 Issue #11144: Fix corner cases where float-to-int conversion unnecessarily returned a long. 2011-03-26 12:18:00 +00:00
Mark Dickinson d3cb2f6e2c Issue #11675: Zero-out newly-created multiprocessing.[Raw]Array objects. 2011-03-26 10:02:37 +00:00
Raymond Hettinger 9aa5a34b6b Issue #11666: Teach pydoc to display full help for named tuples 2011-03-25 16:00:13 -07:00
Mark Dickinson f9e9a6f403 Issue #11673: Fix multiprocessing.[Raw]Array constructor to accept a size of type long. Thanks Robert Kern. 2011-03-25 22:01:06 +00:00
Ezio Melotti 4664563f34 #2650: Refactor re.escape and its tests. 2011-03-25 14:50:52 +02:00
Éric Araujo f079c9bfbf Fix obscure set crashers (#4420). Backport of d56b3cafb1e6, reviewed by Raymond. 2011-03-22 23:47:32 +01:00
Éric Araujo 374274db7f Fix the total_ordering decorator to handle cross-type comparisons
that could lead to infinite recursion (closes #10042).
2011-03-19 04:29:36 +01:00
Ezio Melotti c2077b0d9b #11565: Fix several typos. Patch by Piotr Kasprzyk. 2011-03-16 12:34:31 +02:00
Jesus Cea 6905de14fe Close issue #8600: test_gdb failures because innocuous warnings 2011-03-16 01:19:49 +01:00
Ezio Melotti 24b07bcba3 #11515: fix several typos. Patch by Piotr Kasprzyk. 2011-03-15 18:55:01 +02:00
R David Murray b44e1841d5 Port #11488 patch from 3.1 (changeset f816841bab03) 2011-03-14 10:01:12 -04:00
R David Murray 8c76c53019 merge heads 2011-03-13 22:40:59 -04:00
R David Murray cdd5fc9013 #11490: EACCES can also mean command not found 2011-03-13 22:37:18 -04:00
Mark Dickinson 2c8c62e64d Issue 11131: Fix sign of zero result on plus and minus operations in ROUND_FLOOR rounding mode. 2011-03-12 11:05:32 +00:00
Vinay Sajip 3ae81137c8 Reverted bug fixes for #11444 (fc4d045e3170) and #11424 (b9d76846bb1c), which should not have been made in this branch. 2011-03-11 18:44:10 +00:00
Vinay Sajip 923e6d29e5 Whitespace normalization. 2011-03-07 18:20:27 +00:00
Vinay Sajip 44b740ff28 #Issue 11424: merged fix from 2.6. 2011-03-07 15:07:58 +00:00
Vinay Sajip 8dd2a40bc7 Issue #11424: Fix bug in determining child loggers. 2011-03-07 15:02:11 +00:00
Antoine Pitrou d6f3a3e3a8 Issue #11391: Writing to a mmap object created with
`mmap.PROT_READ|mmap.PROT_EXEC` would segfault instead of raising a
TypeError.  Patch by Charles-François Natali.
2011-03-06 02:03:34 +01:00
Georg Brandl faa9ad2a46 Add updated .hgeol file and fix newlines in the 2.7 branch. 2011-03-05 15:06:13 +01:00
Georg Brandl 4db2c257d6 Add .hgeol file and fix newlines in the 2.5 branch. 2011-03-05 15:02:28 +01:00
Eli Bendersky 680e6eb54f Merged revisions 88735 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r88735 | eli.bendersky | 2011-03-04 06:55:25 +0200 (Fri, 04 Mar 2011) | 2 lines

  Issue #11386: Fixed the exception thrown by bytearray.pop() for empty bytearrays
........
2011-03-04 06:14:56 +00:00
Antoine Pitrou 2262766de2 Merged revisions 88691 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r88691 | antoine.pitrou | 2011-03-01 01:41:10 +0100 (mar., 01 mars 2011) | 3 lines

  Endly, fix UnboundLocalError in telnetlib
........
2011-03-01 00:48:40 +00:00
Ezio Melotti 370d85cee4 Python 2 can encode/decode surrogates to utf-8. Add a test for this. 2011-02-28 01:42:29 +00:00
Antoine Pitrou 8ef3907044 Merged revisions 88671 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r88671 | antoine.pitrou | 2011-02-27 16:44:12 +0100 (dim., 27 févr. 2011) | 3 lines

  Follow up to r88664: non-blocking connect-ex() can return EWOULDBLOCK under Windows
........
2011-02-27 15:45:22 +00:00
Antoine Pitrou d3f6ea1d1e Merged revisions 88664 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r88664 | antoine.pitrou | 2011-02-27 00:24:06 +0100 (dim., 27 févr. 2011) | 4 lines

  Issue #11326: Add the missing connect_ex() implementation for SSL sockets,
  and make it work for non-blocking connects.
........
2011-02-26 23:35:27 +00:00
Antoine Pitrou 6439c00a6d Merged revisions 88610 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r88610 | antoine.pitrou | 2011-02-25 22:24:11 +0100 (ven., 25 févr. 2011) | 4 lines

  Issue #10956: Buffered I/O classes retry reading or writing after a signal
  has arrived and the handler returned successfully.
........
2011-02-25 21:35:47 +00:00
Giampaolo Rodolà 5217d3f9ca Merged revisions 88604 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r88604 | giampaolo.rodola | 2011-02-25 21:05:48 +0100 (ven, 25 feb 2011) | 1 line

  (issue 11214) - fix asyncore.strerror test failure on AIX
........
2011-02-25 20:07:51 +00:00
Georg Brandl 28dadd988b Merged revisions 87050,87101,87146,87156,87172,87175,87371,87378,87522-87524,87526,87530-87535 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r87050 | georg.brandl | 2010-12-04 18:09:30 +0100 (Sa, 04 Dez 2010) | 1 line

  Fix typo.
........
  r87101 | georg.brandl | 2010-12-06 23:02:48 +0100 (Mo, 06 Dez 2010) | 1 line

  Remove visible XXX comments.
........
  r87146 | georg.brandl | 2010-12-09 19:08:43 +0100 (Do, 09 Dez 2010) | 1 line

  Fix "seperate".
........
  r87156 | georg.brandl | 2010-12-10 11:01:44 +0100 (Fr, 10 Dez 2010) | 1 line

  #10668: fix wrong call of __init__.
........
  r87172 | georg.brandl | 2010-12-11 20:10:30 +0100 (Sa, 11 Dez 2010) | 1 line

  Avoid AttributeError(_closed) when a TemporaryDirectory is deallocated whose mkdtemp call failed.
........
  r87175 | georg.brandl | 2010-12-11 23:19:34 +0100 (Sa, 11 Dez 2010) | 1 line

  Fix markup.
........
  r87371 | georg.brandl | 2010-12-18 17:21:58 +0100 (Sa, 18 Dez 2010) | 1 line

  Fix typo.
........
  r87378 | georg.brandl | 2010-12-18 18:51:28 +0100 (Sa, 18 Dez 2010) | 1 line

  #10723: add missing builtin exceptions.
........
  r87522 | georg.brandl | 2010-12-28 10:16:12 +0100 (Di, 28 Dez 2010) | 1 line

  Replace sys.maxint mention by sys.maxsize.
........
  r87523 | georg.brandl | 2010-12-28 10:18:24 +0100 (Di, 28 Dez 2010) | 1 line

  Remove confusing paragraph -- this is relevant only to advanced users anyway and does not belong into the tutorial.
........
  r87524 | georg.brandl | 2010-12-28 10:29:19 +0100 (Di, 28 Dez 2010) | 1 line

  Fix advice: call PyType_Ready to fill in ob_type of custom types.
........
  r87526 | georg.brandl | 2010-12-28 11:38:33 +0100 (Di, 28 Dez 2010) | 1 line

  #10777: fix iteration over dict keys while mutating the dict.
........
  r87530 | georg.brandl | 2010-12-28 12:06:07 +0100 (Di, 28 Dez 2010) | 1 line

  #10767: update README in crashers; not all may have a bug entry and/or be fixed.
........
  r87531 | georg.brandl | 2010-12-28 12:08:17 +0100 (Di, 28 Dez 2010) | 1 line

  #10742: document readonly attribute of memoryviews.
........
  r87532 | georg.brandl | 2010-12-28 12:15:49 +0100 (Di, 28 Dez 2010) | 1 line

  #10781: clarify that *encoding* is not a parameter for Node objects in general.
........
  r87533 | georg.brandl | 2010-12-28 12:38:12 +0100 (Di, 28 Dez 2010) | 1 line

  Remove history; adapt a bit more to reST, since this will once be part of the dev guide.
........
  r87534 | georg.brandl | 2010-12-28 12:48:53 +0100 (Di, 28 Dez 2010) | 1 line

  Rewrap.
........
  r87535 | georg.brandl | 2010-12-28 12:49:41 +0100 (Di, 28 Dez 2010) | 1 line

  #10739: document that on Windows, socket.makefile() does not make a file that has a true file descriptor usable where such a thing is expected.
........
2011-02-25 10:50:32 +00:00
Georg Brandl 52f839540c Merged revisions 86881,86887,86913-86915,86933,86943,86960,86964,86974,86980,86996,87008 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86881 | georg.brandl | 2010-11-30 08:43:28 +0100 (Di, 30 Nov 2010) | 1 line

  #10584: fix bad links.
........
  r86887 | georg.brandl | 2010-11-30 15:57:54 +0100 (Di, 30 Nov 2010) | 1 line

  Fix typo.
........
  r86913 | georg.brandl | 2010-12-01 16:32:43 +0100 (Mi, 01 Dez 2010) | 1 line

  Add missing word, and add a better reference to the actual function.
........
  r86914 | georg.brandl | 2010-12-01 16:36:33 +0100 (Mi, 01 Dez 2010) | 1 line

  #10594: fix parameter names in PyList API docs.
........
  r86915 | georg.brandl | 2010-12-01 16:44:25 +0100 (Mi, 01 Dez 2010) | 1 line

  Fix some markup and style in the unittest docs.
........
  r86933 | georg.brandl | 2010-12-02 19:02:01 +0100 (Do, 02 Dez 2010) | 1 line

  #10597: fix Py_SetPythonHome docs by pointing to where the meaning of PYTHONHOME is already documented.
........
  r86943 | georg.brandl | 2010-12-02 23:35:25 +0100 (Do, 02 Dez 2010) | 1 line

  Re-add accidentally removed line.
........
  r86960 | georg.brandl | 2010-12-03 08:55:44 +0100 (Fr, 03 Dez 2010) | 1 line

  #10360: catch TypeError in WeakSet.__contains__, just like WeakKeyDictionary does.
........
  r86964 | georg.brandl | 2010-12-03 10:58:38 +0100 (Fr, 03 Dez 2010) | 1 line

  #10549: fix interface of docclass() for text documenter.
........
  r86974 | georg.brandl | 2010-12-03 16:30:09 +0100 (Fr, 03 Dez 2010) | 1 line

  Markup consistency fixes.
........
  r86980 | georg.brandl | 2010-12-03 18:19:27 +0100 (Fr, 03 Dez 2010) | 1 line

  Fix punctuation.
........
  r86996 | georg.brandl | 2010-12-03 20:56:42 +0100 (Fr, 03 Dez 2010) | 1 line

  Fix indentation.
........
  r87008 | georg.brandl | 2010-12-04 10:04:04 +0100 (Sa, 04 Dez 2010) | 1 line

  Fix typo.
........
2011-02-25 10:39:23 +00:00
Antoine Pitrou f4d2b3dc10 Merged revisions 88486 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r88486 | antoine.pitrou | 2011-02-22 00:41:12 +0100 (mar., 22 févr. 2011) | 5 lines

  Issue #4681: Allow mmap() to work on file sizes and offsets larger than
  4GB, even on 32-bit builds.  Initial patch by Ross Lagerwall, adapted for
  32-bit Windows.
........
2011-02-21 23:59:20 +00:00
Alexander Belopolsky f9ad7d476a Merged revisions 87921 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r87921 | alexander.belopolsky | 2011-01-10 21:22:16 -0500 (Mon, 10 Jan 2011) | 1 line

  This should fix mktime test on Windows
........
2011-02-15 16:01:11 +00:00
Alexander Belopolsky 6233b36d14 Merged revisions 87919 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r87919 | alexander.belopolsky | 2011-01-10 20:21:25 -0500 (Mon, 10 Jan 2011) | 4 lines

  Issue #1726687: time.mktime() will now correctly compute value one
  second before epoch.  Original patch by Peter Wang, reported by Martin
  Blais.
........
2011-02-15 15:51:17 +00:00
R. David Murray 561b96f98c Merged revisions 86542,87136,87216,87221,87228,87256,87337-87338,87372,87516,87571,88164 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86542 | r.david.murray | 2010-11-19 22:48:58 -0500 (Fri, 19 Nov 2010) | 2 lines

  Make test class name unique so that both test classes run.
........
  r87136 | r.david.murray | 2010-12-08 17:53:00 -0500 (Wed, 08 Dec 2010) | 6 lines

  Have script_helper._assert_python strip refcount strings from stderr.

  This makes the output of the function and those that depend on it
  independent of whether or not they are being run under a debug
  build.
........
  r87216 | r.david.murray | 2010-12-13 17:50:30 -0500 (Mon, 13 Dec 2010) | 2 lines

  #10698: fix typo in example.
........
  r87221 | r.david.murray | 2010-12-13 19:55:46 -0500 (Mon, 13 Dec 2010) | 4 lines

  #10699: fix docstring for tzset: it does not take a parameter

  Thanks to Garrett Cooper for the fix.
........
  r87228 | r.david.murray | 2010-12-13 21:25:43 -0500 (Mon, 13 Dec 2010) | 2 lines

  Turn on regrtest -W (rerun immediately) option for Windows, too.
........
  r87256 | r.david.murray | 2010-12-14 21:19:14 -0500 (Tue, 14 Dec 2010) | 2 lines

  #10705: document what the values of debuglevel are and mean.
........
  r87337 | r.david.murray | 2010-12-17 11:11:40 -0500 (Fri, 17 Dec 2010) | 2 lines

  #10559: provide instructions for accessing sys.argv when first mentioned.
........
  r87338 | r.david.murray | 2010-12-17 11:29:07 -0500 (Fri, 17 Dec 2010) | 2 lines

  #10454: clarify the compileall docs and help messages.
  [changes to compileall.py were not backported, only the doc changes]
........
  r87372 | r.david.murray | 2010-12-18 11:39:06 -0500 (Sat, 18 Dec 2010) | 2 lines

  #10728: the default for printing help is sys.stdout, not stderr.
........
  r87516 | r.david.murray | 2010-12-27 15:09:32 -0500 (Mon, 27 Dec 2010) | 5 lines

  #7056: runtest and runtest_inner don't use testdir, so drop it from their sigs

  I've only tested regular runs and -j runs.  If I've broken anything
  else I'm sure I'll hear about it sooner or later.
........
  r87571 | r.david.murray | 2010-12-29 14:06:48 -0500 (Wed, 29 Dec 2010) | 2 lines

  Fix same typo in docs.
........
  r88164 | r.david.murray | 2011-01-24 14:34:58 -0500 (Mon, 24 Jan 2011) | 12 lines

  #10960: fix 'stat' links, link to lstat from stat, general tidy of stat doc.

  Original patch by Michal Nowikowski, with some additions and wording
  fixes by me.

  I changed the wording from 'Performs a stat system call' to 'Performs
  the equivalent of a stat system call', since on Windows there are no
  stat/lstat system calls involved.  I also extended Michal's breakout
  of the attributes into a list to the other paragraphs, and rearranged
  the order of the paragraphs in the 'stat' docs to make it flow
  better and put it in what I think is a more logical/useful order.
........
2011-02-11 17:25:54 +00:00
Éric Araujo 54274ad96a Merged revisions 86236,86240,86332,86340,87271,87273,87447 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

To comply with the 2.x doc style, the methods in trace.rst use brackets around
optional arguments.  The rest is a mostly straight merge, modulo support changed
to test_support and use of the old super call style in test_tuple.

........
  r86236 | eric.araujo | 2010-11-06 03:44:43 +0100 (sam., 06 nov. 2010) | 2 lines

  Make sure each test can be run standalone (./python Lib/distutils/tests/x.py)
........
  r86240 | eric.araujo | 2010-11-06 05:11:59 +0100 (sam., 06 nov. 2010) | 2 lines

  Prevent ResourceWarnings in test_gettext
........
  r86332 | eric.araujo | 2010-11-08 19:15:17 +0100 (lun., 08 nov. 2010) | 4 lines

  Add missing NEWS entry for a fix committed by Senthil.

  All recent modifications to distutils should now be covered in NEWS.
........
  r86340 | eric.araujo | 2010-11-08 22:48:23 +0100 (lun., 08 nov. 2010) | 2 lines

  This was actually fixed for the previous alpha.
........
  r87271 | eric.araujo | 2010-12-15 20:09:58 +0100 (mer., 15 déc. 2010) | 2 lines

  Improve trace documentation (#9264).  Patch by Eli Bendersky.
........
  r87273 | eric.araujo | 2010-12-15 20:30:15 +0100 (mer., 15 déc. 2010) | 2 lines

  Use nested method directives, rewrap long lines, fix whitespace.
........
  r87447 | eric.araujo | 2010-12-23 20:13:05 +0100 (jeu., 23 déc. 2010) | 2 lines

  Fix typo in superclass method name
........
2011-02-03 00:12:18 +00:00
Éric Araujo 67843b3886 Fix typo: BadZipFile exists in 3.2+ only, not older versions. 2011-02-02 17:03:38 +00:00
Steven Bethard 7f41b88bb7 #10680: fix mutually exclusive arguments in argument groups. 2011-01-30 14:05:38 +00:00
Antoine Pitrou 812a3a1162 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:25 +00:00
Raymond Hettinger 57a8689b55 Issue 11004: Fix edge case for deque.count(). 2011-01-25 21:43:29 +00:00